From a76d1b3f1bb890f830dd3ae18c075cf1c5b8ed96 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 12 Nov 2024 17:45:23 +0000 Subject: [PATCH 1/3] Drop all instances of ineffective --root-deps=rdeps option This option became ineffective with EAPI 7 and all trace of older EAPIs has now gone. Signed-off-by: James Le Cuirot --- build_dev_binpkgs | 4 ++-- build_library/build_image_util.sh | 4 ++-- build_library/prefix_util.sh | 2 +- build_library/toolchain_util.sh | 2 +- build_library/vm_image_util.sh | 2 +- build_sysext | 3 +-- setup_board | 3 +-- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/build_dev_binpkgs b/build_dev_binpkgs index 37e0cc50bd2..8c64e3678b2 100755 --- a/build_dev_binpkgs +++ b/build_dev_binpkgs @@ -46,7 +46,7 @@ fi # -- function my_board_emerge() { - PORTAGE_CONFIGROOT="/build/${FLAGS_board}" SYSROOT="${SYSROOT:-/build/${FLAGS_board}}" ROOT="/build/${FLAGS_board}" sudo -E emerge --root-deps=rdeps "${@}" + PORTAGE_CONFIGROOT="/build/${FLAGS_board}" SYSROOT="${SYSROOT:-/build/${FLAGS_board}}" ROOT="/build/${FLAGS_board}" sudo -E emerge "${@}" } # -- @@ -56,7 +56,7 @@ trap 'rm -f "${pkg_build_list}" "${pkg_skipped_list}"' EXIT info "Collecting list of binpkgs to build" -my_board_emerge --pretend --root-deps=rdeps --emptytree ${@} \ +my_board_emerge --pretend --emptytree ${@} \ | grep '\[ebuild' \ | sed 's/^\[[^]]\+\] \([^ :]\+\)*:.*/\1/' \ | while read pkg; do diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh index 7712141c36a..01c0d0d0c81 100755 --- a/build_library/build_image_util.sh +++ b/build_library/build_image_util.sh @@ -184,7 +184,7 @@ emerge_to_image() { sudo -E ROOT="${root_fs_dir}" \ FEATURES="-ebuild-locks" \ PORTAGE_CONFIGROOT="${BUILD_DIR}"/configroot \ - emerge --root-deps=rdeps --usepkgonly --jobs="${NUM_JOBS}" --verbose "$@" + emerge --usepkgonly --jobs="${NUM_JOBS}" --verbose "$@" # Shortcut if this was just baselayout [[ "$*" == *sys-apps/baselayout ]] && return @@ -209,7 +209,7 @@ emerge_to_image_unchecked() { sudo -E ROOT="${root_fs_dir}" \ PORTAGE_CONFIGROOT="${BUILD_DIR}"/configroot \ - emerge --root-deps=rdeps --usepkgonly --jobs="${NUM_JOBS}" --verbose "$@" + emerge --usepkgonly --jobs="${NUM_JOBS}" --verbose "$@" # Shortcut if this was just baselayout [[ "$*" == *sys-apps/baselayout ]] && return diff --git a/build_library/prefix_util.sh b/build_library/prefix_util.sh index a3c3db8a4d1..4a945c8e05d 100644 --- a/build_library/prefix_util.sh +++ b/build_library/prefix_util.sh @@ -108,7 +108,7 @@ function create_make_conf() { final) filepath="${FINALROOT}${EPREFIX}/etc/portage/make.conf" dir="${FINALDIR}" - emerge_opts="--root-deps=rdeps --usepkgonly" + emerge_opts="--usepkgonly" ;; esac diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh index f5b53ff5ef7..cdab619339d 100644 --- a/build_library/toolchain_util.sh +++ b/build_library/toolchain_util.sh @@ -263,7 +263,7 @@ _get_dependency_list() { local IFS=$'| \t\n' PORTAGE_CONFIGROOT="$ROOT" emerge "$@" --pretend \ - --emptytree --root-deps=rdeps --onlydeps --quiet | \ + --emptytree --onlydeps --quiet | \ egrep "$ROOT" | sed -e 's/[^]]*\] \([^ :]*\).*/=\1/' | egrep -v "=($(echo "${pkgs[*]}"))-[0-9]" diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index dde1f533f40..11c7c746cdf 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -536,7 +536,7 @@ install_oem_package() { info "Installing ${oem_pkg} to OEM partition" USE="${oem_use}" emerge-${BOARD} \ --root="${oem_tmp}" --sysroot="${oem_tmp}" \ - --root-deps=rdeps --usepkgonly ${getbinpkg} \ + --usepkgonly ${getbinpkg} \ --verbose --jobs=2 "${oem_pkg}" sudo rsync -a "${oem_tmp}/oem/" "${VM_TMP_ROOT}/oem/" sudo rm -rf "${oem_tmp}" diff --git a/build_sysext b/build_sysext index 4fd7cd2bf51..ed053907325 100755 --- a/build_sysext +++ b/build_sysext @@ -225,7 +225,6 @@ for package; do --root="${BUILD_DIR}/install-root" \ --config-root="/build/${FLAGS_board}" \ --sysroot="/build/${FLAGS_board}" \ - --root-deps=rdeps \ --usepkgonly \ --getbinpkg \ --verbose \ @@ -256,7 +255,7 @@ ROOT="${BUILD_DIR}/install-root" PORTAGE_CONFIGROOT="${BUILD_DIR}/install-root" if [[ "${FLAGS_strip_binaries}" = "${FLAGS_TRUE}" ]]; then chost="$("portageq-${BOARD}" envvar CHOST)" strip="${chost}-strip" - + info "Stripping all non-stripped binaries in sysext using '${strip}'" # Find all non-stripped binaries, remove ':' from filepath, and strip 'em diff --git a/setup_board b/setup_board index bba9251ab7e..7b7fca72f55 100755 --- a/setup_board +++ b/setup_board @@ -295,8 +295,7 @@ ${EMAINT_WRAPPER} --fix moveinst ${EMAINT_WRAPPER} --fix world if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then - EMERGE_FLAGS=( --select --verbose --root-deps=rdeps ) - EMERGE_FLAGS+=( "--jobs=${NUM_JOBS}" ) + EMERGE_FLAGS=( --select --verbose "--jobs=${NUM_JOBS}" ) EMERGE_TOOLCHAIN_FLAGS=( "${EMERGE_FLAGS[@]}" ) if [[ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" && \ From ac9c3753b30910d3eb3203fb5e97197118cb39f9 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 12 Nov 2024 17:56:25 +0000 Subject: [PATCH 2/3] Drop --root-deps option from board emerge wrappers This option used to install build dependencies to ROOT instead of /. This never made much sense, so the option was rendered ineffective from EAPI 7. The number of ebuilds with older EAPIs has since dwindled to nothing. A recent Portage change has made this option now install build dependencies to ROOT as well as / because this can actually be useful and doesn't cause breakage. However, it does make us more prone to cyclic dependencies when initially populating the board roots. There is no reason for us to use this option though because its main purpose is to ensure the target environment has everything it needs to rebuild itself. Given that the option didn't do anything recently, we evidently don't even require this for the developer container. Signed-off-by: James Le Cuirot --- setup_board | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_board b/setup_board index 7b7fca72f55..83f784f018f 100755 --- a/setup_board +++ b/setup_board @@ -92,7 +92,7 @@ generate_all_wrappers() { info "Generating wrapper scripts" - for wrapper in 'emerge --root-deps' ebuild eclean equery portageq \ + for wrapper in emerge ebuild eclean equery portageq \ qcheck qfile qlist emaint glsa-check; do _generate_wrapper ${wrapper} done From 6cb21a37e1b363b8e1fb89a99f2a6658d965e58b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 11 Nov 2024 07:08:54 +0000 Subject: [PATCH 3/3] sys-apps/portage: Sync with Gentoo It's from Gentoo commit ba2693dfc0f0f5535e6371c4e4d19806109537c9. --- changelog/updates/2024-11-12-portage.md | 1 + .../portage-stable/sys-apps/portage/portage-3.0.66.1-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/updates/2024-11-12-portage.md diff --git a/changelog/updates/2024-11-12-portage.md b/changelog/updates/2024-11-12-portage.md new file mode 100644 index 00000000000..2b83088e9d7 --- /dev/null +++ b/changelog/updates/2024-11-12-portage.md @@ -0,0 +1 @@ +- SDK: portage ([3.0.66.1](https://github.com/gentoo/portage/blob/portage-3.0.66.1/NEWS#L9)) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.66.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.66.1-r1.ebuild index 9cedc14fc95..d3a02fcb418 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.66.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.66.1-r1.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="GPL-2"