[gentoo-commits] proj/portage:master commit in: cnf/, /

[gentoo-commits] proj/portage:master commit in: cnf/, /

[Sam James]

commit:     8b9bd1288793d81310fc29e806076ea0b48f276c
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 09:48:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 01:47:32 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=8b9bd128

cnf: add arch-specific configuration example for loong

This is partially based on the riscv text.

Bug: https://bugs.gentoo.org/884135
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
Closes: https://github.com/gentoo/portage/pull/956
Signed-off-by: Sam James <sam <AT> gentoo.org>

 NEWS                             |  2 +-
 cnf/make.conf.example.loong.diff | 56 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 8f4983e06..2fd09bbaa 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ portage-3.0.42 (UNRELEASED)
 --------------
 
 Features:
-* TODO
+* cnf: make.conf.example.loong: add for the loong arch (bug #884135).
 
 Bug fixes:
 * glsa: Abort if a GLSA's arch list doesn't match the expected format (bug #882797).

diff --git a/cnf/make.conf.example.loong.diff b/cnf/make.conf.example.loong.diff
new file mode 100644
index 000000000..7df06b172
--- /dev/null
+++ b/cnf/make.conf.example.loong.diff
@@ -0,0 +1,56 @@
+--- make.conf.example
++++ make.conf.example
+@@ -22,6 +22,13 @@
+ # Example:
+ #USE="X gtk gnome -alsa"
+ 
++# Host Setting
++# ===========
++#
++# All LoongArch64 systems built with the LP64D ABI, which is the default,
++# should use this host setting:
++CHOST="loongarch64-unknown-linux-gnu"
++
+ # Host and optimization settings
+ # ==============================
+ #
+@@ -39,9 +46,29 @@
+ # -frecord-gcc-switches, since otherwise the check could result in false
+ # positive results.
+ #
+-# Please refer to the GCC manual for a list of possible values.
++# -march=<cpu-model> tells the compiler to take full advantage of the ABI and
++# instructions available on a certain LoongArch CPU model (none defined at the
++# present), micro-architecture (e.g. LA464), or generic ISA level (e.g.
++# loongarch64 = as defined in the LoongArch ISA manual v1.00). This will
++# produce code which may not run on other LoongArch CPUs supporting different
++# ISA levels or modules.
++#
++# -mtune=<cpu-model> results in code optimised for a specific CPU
++# model, micro-architecture (e.g. LA464) or generic ISA level, without
++# breaking compatibility with other LoongArch CPUs supporting the same ISA.
++#
++# -mabi=<abi-string> specifies the ABI, i.e. the integer and floating-point
++# calling convention to use. Care should be taken while setting both -march
++# and -mabi, as some calling conventions are impossible to implement on some
++# ISAs.
++#
++# Please refer to the section "LoongArch Options" of the GCC manual and/or the
++# 《龙芯架构工具链约定》/ "LoongArch Toolchain Conventions" document for a
++# list of possible values for these options.
+ #
++# Decent examples:
+ #CFLAGS="-O2 -pipe"
++#CFLAGS="-march=la464 -mtune=la464 -O2 -pipe"
+ #
+ # If you set a CFLAGS above, then this line will set your default C++ flags to
+ # the same settings.
+@@ -76,7 +103,7 @@
+ # DO NOT PUT ANYTHING BUT YOUR SPECIFIC ~ARCHITECTURE IN THE LIST.
+ # IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS.
+ #
+-#ACCEPT_KEYWORDS="~arch"
++#ACCEPT_KEYWORDS="~loong"
+ 
+ # ACCEPT_LICENSE is used to mask packages based on licensing restrictions.
+ # It may contain both license and group names, where group names are

[gentoo-commits] proj/portage:master commit in: cnf/, /

[Sam James]

commit:     3bc7bfef51d88fd716e882d3931f2873e3493e01
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  1 18:14:57 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 07:18:44 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=3bc7bfef

make.globals: default-on FEATURES=pkgdir-index-trusted

Commit fbbe0cfe29020313ae44fb2a6afa87c2951ae028 indicates that the rationale for having
this disabled is to tolerate manual additions/removals of binpkgs in the PKGDIR.

I don't think there are many people doing this, so it should be safe to enable
this by default for quicker operations with PKGDIR.

[sam: This is only used for local operations, we don't reindex remote indexes,
so there's no issue with not having indexes be signed (although we do plan
on doing that at some point).]

Bug: https://bugs.gentoo.org/889300
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
Closes: https://github.com/gentoo/portage/pull/970
Signed-off-by: Sam James <sam <AT> gentoo.org>

 NEWS             | 5 +++++
 cnf/make.globals | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 2e2246a611..2e88b894b8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 portage-3.0.52 (UNRELEASED)
 --------------
 
+Breaking changes:
+* FEATURES=pkgdir-index-trusted is now on by default. This improves performance
+  with binpkgs, but does require that users run `emaint binhost --fix` if they
+  manually add or remove binpkgs from their PKGDIR (bug #889300).
+
 Features:
 * bintree: Add new API member (invalid_paths) to allow gentoolkit to later
   clean up invalid binpkgs (bug #900224).

diff --git a/cnf/make.globals b/cnf/make.globals
index bfefcc5235..86e9b5b744 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -78,7 +78,7 @@ FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs
           binpkg-multi-instance buildpkg-live
           config-protect-if-modified distlocks ebuild-locks
           fixlafiles ipc-sandbox merge-sync multilib-strict
-          network-sandbox news parallel-fetch pid-sandbox
+          network-sandbox news parallel-fetch pkgdir-index-trusted pid-sandbox
           preserve-libs protect-owned qa-unresolved-soname-deps
           sandbox sfperms strict
           unknown-features-warn unmerge-logs unmerge-orphans userfetch

[gentoo-commits] proj/portage:master commit in: cnf/, /

[Sam James]

commit:     914d21b02b2b9bc5c8f32284e069685ba62432fd
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sun Oct 29 21:22:44 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 07:26:32 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=914d21b0

cnf: add arch-specific configuration example for arc

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 NEWS                           |  6 ++++++
 cnf/make.conf.example.arc.diff | 46 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/NEWS b/NEWS
index 0bb525a629..220a0f4f7e 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,12 @@ Release notes take the form of the following optional categories:
 * Bug fixes
 * Cleanups
 
+portage-3.0.62 (UNRELEASED)
+--------------
+
+Features:
+* cnf: make.conf.example.arc: add for the arc arch.
+
 portage-3.0.61 (2024-01-05)
 --------------
 

diff --git a/cnf/make.conf.example.arc.diff b/cnf/make.conf.example.arc.diff
new file mode 100644
index 0000000000..4775cb3634
--- /dev/null
+++ b/cnf/make.conf.example.arc.diff
@@ -0,0 +1,46 @@
+--- make.conf.example
++++ make.conf.example
+@@ -22,6 +22,15 @@
+ # Example:
+ #USE="X gtk gnome -alsa"
+ 
++# Host Setting
++# ============
++#
++# 32-bit ARC systems should use this host setting:
++CHOST="arc-snps-linux-gnu"
++
++# 64-bit ARCv3 and above systems may use this host setting:
++#CHOST="arc64-snps-linux-gnu"
++
+ # Host and optimization settings
+ # ==============================
+ #
+@@ -39,7 +48,17 @@
+ # -frecord-gcc-switches, since otherwise the check could result in false
+ # positive results.
+ #
+-# Please refer to the GCC manual for a list of possible values.
++# -mcpu=<cpu-type> compiles code that runs exclusively on a particular CPU.
++#
++# -mtune=<cpu-series> compiles code that is optimized for a particular CPU, but
++# will run on the CPU specified in -mcpu, or all ARC CPUs if -mcpu= is not
++# specified.
++#
++# -mfpu=<fpu> specifies the capabilities of the FPU to generate floating-point
++# instructions for.
++#
++# Please refer to the "ARC Options" section of the GCC manual for a list of
++# possible CPU and FPU values.
+ #
+ #CFLAGS="-O2 -pipe"
+ #
+@@ -76,7 +95,7 @@
+ # DO NOT PUT ANYTHING BUT YOUR SPECIFIC ~ARCHITECTURE IN THE LIST.
+ # IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS.
+ #
+-#ACCEPT_KEYWORDS="~arch"
++#ACCEPT_KEYWORDS="~arc"
+ 
+ # ACCEPT_LICENSE is used to mask packages based on licensing restrictions.
+ # It may contain both license and group names, where group names are

[gentoo-commits] proj/portage:master commit in: cnf/, /

[Zac Medico]

commit:     32e4a588cfd9548a28c74476d586a6b66b15bace
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  8 05:04:10 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 05:04:10 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=32e4a588

meson.build: Install dist-info METADATA

Install dist-info METADATA for pip to resolve dependencies:

    # pip freeze | grep portage
    portage==3.0.63

Suggested-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Bug: https://bugs.gentoo.org/920330
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 cnf/METADATA |  3 +++
 meson.build  | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/cnf/METADATA b/cnf/METADATA
new file mode 100644
index 0000000000..57060b0856
--- /dev/null
+++ b/cnf/METADATA
@@ -0,0 +1,3 @@
+Metadata-Version: 2.1
+Name: portage
+Version: @VERSION@

diff --git a/meson.build b/meson.build
index e826f6ffad..b06e1f4881 100644
--- a/meson.build
+++ b/meson.build
@@ -97,6 +97,20 @@ if native_extensions
     subdir('src')
 endif
 
+if system_wide
+	METADATA = configure_file(
+		input : 'cnf/METADATA',
+		output : 'METADATA',
+		configuration : conf_data
+	)
+	install_data(
+		[
+			METADATA
+		],
+		install_dir : py.get_install_dir() / 'portage-@0@.dist-info'.format(conf_data.get('VERSION'))
+	)
+endif
+
 test(
     'pytest',
     py,

[gentoo-commits] proj/portage:master commit in: cnf/, /

[Sam James]

commit:     47cb029accbeadf092beecfb2cc5ea7d4c2b275d
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 19:54:16 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 09:06:08 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=47cb029a

make.globals: add bcachefs_effective.* and bcachefs.* to PORTAGE_XATTR_EXCLUDE

Just like btrfs the bcachefs filesystem makes heaviy use of xattrs.

In my case

emerge --config gentoo-kernel

failed with

install-xattr: setxattr() failed: Operation not supported

A strace revealed

setxattr("/boot/efi/8410476acd4b1e12c678fc815c18f551/6.9.5-gentoo-dist/linux",
"bcachefs_effective.background_co"..., "zstd", 4, 0) = -1 EOPNOTSUPP (Operation not supported)

and indeed, the source file to the install operation was under
/usr/src which had background compression enabled. As a result,
install-xattr tried to copy the attribute over to the destination file
and failed.

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Closes: https://github.com/gentoo/portage/pull/1346
Signed-off-by: Sam James <sam <AT> gentoo.org>

 NEWS             | 2 ++
 cnf/make.globals | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 53ba9f5fb1..e8ba29df68 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,8 @@ Bug fixes:
   working ebuilds. Future EAPIs will need to adjust the logic
   added by this change. See bug #907061.
 
+* make.globals: add bcachefs_effective.* and bcachefs.* to PORTAGE_XATTR_EXCLUDE
+
 * vartree, movefile: Warn when rewriting a symlink (bug #934514).
 
 * repository: config: Allow a repository to be configured using one of its

diff --git a/cnf/make.globals b/cnf/make.globals
index 2bb7a65593..33e99e9ec3 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -159,7 +159,8 @@ PORTAGE_TRUST_HELPER="/usr/bin/getuto"
 # system.nfs4_acl attributes are irrelevant, see bug #475496.
 # user.* attributes are not supported on tmpfs (bug 640290), but
 # user.pax.* is supported with the patch from bug 470644.
-PORTAGE_XATTR_EXCLUDE="btrfs.* security.evm security.ima
+PORTAGE_XATTR_EXCLUDE="bcachefs.* bcachefs_effective.*
+	btrfs.* security.evm security.ima
 	security.selinux system.nfs4_acl user.apache_handler
 	user.Beagle.* user.dublincore.* user.mime_encoding user.xdg.*"