From 1106e240a1cad59a4b2bb3da5cd84f462d2c7ec7 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 9 Dec 2022 11:52:18 +0100 Subject: [PATCH] sys-apps/portage: Move to portage-stable --- .../coreos-overlay/sys-apps/portage/Manifest | 2 - .../coreos-overlay/sys-apps/portage/README.md | 9 - ...ry-config.py-add-disabled-attribute-.patch | 52 ---- ...vironment-Filter-EROOT-for-all-EAPIs.patch | 38 --- ...slot-rebuilds-happen-in-the-correct-.patch | 35 --- .../sys-apps/portage/files/README.RESCUE | 2 - .../portage/files/portage-ccache.conf | 2 - .../sys-apps/portage/metadata.xml | 33 -- .../sys-apps/portage/portage-3.0.28-r2.ebuild | 284 ------------------ 9 files changed, 457 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/portage/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/portage/README.md delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/0001-portage-repository-config.py-add-disabled-attribute-.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/0002-environment-Filter-EROOT-for-all-EAPIs.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/0003-depgraph-ensure-slot-rebuilds-happen-in-the-correct-.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/README.RESCUE delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-ccache.conf delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/portage/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-3.0.28-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/Manifest deleted file mode 100644 index 05b0f92a64..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST portage-3.0.28-setuptools-install-depr.patch 1191 BLAKE2B 1601b8943be27fbebea8bfc5e927e9ba6c5e18b6b76a89f8b2b8525595f4693fe014d0bfd936b513a5d03524aba64797ef1bb1e85b0965426a6f36b6c9e9e07c SHA512 bb06c3f705e4a3e6fcc170fe36aa522184c573ef6e05dea3678ff9158472722d1b68fc480b89f4656786e024be6c5f6f656c386aeda467744bf8e9acdb6ffef5 -DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 8d9e3af04acd9bb5fdb3cff5b928abbf707db13f6c25afdac4399ea47adb67b2621ebb733927b4f9386e3f285fa7daac0423ae3fb0509a9df747b41c82865313 SHA512 148484b0384672116f2f2187eaddb56f646548324cd5f6c8e187a02bc965fb2bea6632214aed9b40c615acb89eb6124ab831ad85c59bac9a416b02a07506669b diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/README.md b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/README.md deleted file mode 100644 index 66fc2ca13e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/README.md +++ /dev/null @@ -1,9 +0,0 @@ -This is a fork of Gentoo's sys-apps/portage package. We make the -following changes: - -- Apply some patches that weren't yet merged by upstream. - -- Disable rsync_verify USE flag to avoid pulling more dependencies. - -- Overwrite the `cnf/repos.conf` file, so we do not use the gentoo - repo. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/0001-portage-repository-config.py-add-disabled-attribute-.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/0001-portage-repository-config.py-add-disabled-attribute-.patch deleted file mode 100644 index fca3879bc9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/0001-portage-repository-config.py-add-disabled-attribute-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c6cfe7c55f54504aa50bc6daca31aefde0d24264 Mon Sep 17 00:00:00 2001 -From: Alex Crawford -Date: Tue, 27 Oct 2020 19:43:48 +0100 -Subject: [PATCH 1/3] portage/repository/config.py: add disabled attribute to - repos.conf - -This flag allows a repos.conf file to disable a previously-defined repository. - -https://bugs.gentoo.org/507284 ---- - lib/portage/repository/config.py | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/lib/portage/repository/config.py b/lib/portage/repository/config.py -index 0b591d9..7b7f7a1 100644 ---- a/lib/portage/repository/config.py -+++ b/lib/portage/repository/config.py -@@ -113,6 +113,7 @@ class RepoConfig: - "clone_depth", - "create_manifest", - "disable_manifest", -+ "disabled", - "eapi", - "eclass_db", - "eclass_locations", -@@ -318,6 +319,11 @@ class RepoConfig: - location = None - self.location = location - -+ disabled = repo_opts.get('disabled') -+ if disabled is not None: -+ disabled = disabled.strip().lower() == 'true' -+ self.disabled = disabled or False -+ - missing = True - self.name = name - if self.location is not None: -@@ -845,7 +851,10 @@ class RepoConfigLoader: - # Do this before expanding aliases, so that location_map and - # treemap consistently map unaliased names whenever available. - for repo_name, repo in list(prepos.items()): -- if repo.location is None: -+ if repo.disabled: -+ del prepos[repo_name] -+ continue -+ elif repo.location is None: - if repo_name != "DEFAULT": - # Skip this warning for repoman (bug #474578). - if settings.local_config and paths: --- -2.32.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/0002-environment-Filter-EROOT-for-all-EAPIs.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/0002-environment-Filter-EROOT-for-all-EAPIs.patch deleted file mode 100644 index a6f04ed68f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/0002-environment-Filter-EROOT-for-all-EAPIs.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a6c80be38b1492d16a3b721564dea5a2ac4106c5 Mon Sep 17 00:00:00 2001 -From: Michael Marineau -Date: Tue, 27 Oct 2020 19:47:20 +0100 -Subject: [PATCH 2/3] environment: Filter EROOT for all EAPIs - -This variable is often defined in older EAPIs with "${EROOT:=$ROOT}" -but it should never be preserved since ROOT may change. Bug #490014 - -https://bugs.gentoo.org/490014 ---- - bin/phase-functions.sh | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh -index d322199..dc6bf62 100644 ---- a/bin/phase-functions.sh -+++ b/bin/phase-functions.sh -@@ -107,10 +107,14 @@ __filter_readonly_variables() { - if ___eapi_has_BROOT; then - filtered_vars+=" BROOT" - fi -- # Don't filter/interfere with prefix variables unless they are -- # supported by the current EAPI. -+ -+ # Always filter EROOT to ensure it is redefined based on ROOT -+ filtered_vars+=" EROOT" -+ -+ # Don't filter/interfere with the other prefix variables unless -+ # they are supported by the current EAPI. - if ___eapi_has_prefix_variables; then -- filtered_vars+=" ED EPREFIX EROOT" -+ filtered_vars+=" ED EPREFIX" - if ___eapi_has_SYSROOT; then - filtered_vars+=" ESYSROOT" - fi --- -2.32.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/0003-depgraph-ensure-slot-rebuilds-happen-in-the-correct-.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/0003-depgraph-ensure-slot-rebuilds-happen-in-the-correct-.patch deleted file mode 100644 index f1e7e3a351..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/0003-depgraph-ensure-slot-rebuilds-happen-in-the-correct-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0d6b2b32bd9fe1399d338c90eccbf6d3f7c4a6cb Mon Sep 17 00:00:00 2001 -From: Michael Marineau -Date: Tue, 27 Oct 2020 19:50:07 +0100 -Subject: [PATCH 3/3] depgraph: ensure slot rebuilds happen in the correct root - -https://bugs.gentoo.org/520112 ---- - lib/_emerge/depgraph.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py -index 22d0be1..67e096a 100644 ---- a/lib/_emerge/depgraph.py -+++ b/lib/_emerge/depgraph.py -@@ -5007,13 +5007,13 @@ class depgraph: - a favorite list.""" - debug = "--debug" in self._frozen_config.myopts - onlydeps = "--onlydeps" in self._frozen_config.myopts -- myroot = self._frozen_config.target_root -- pkgsettings = self._frozen_config.pkgsettings[myroot] -- pprovideddict = pkgsettings.pprovideddict -- virtuals = pkgsettings.getvirtuals() - args = self._dynamic_config._initial_arg_list[:] - - for arg in self._expand_set_args(args, add_to_digraph=True): -+ myroot = arg.root_config.root -+ pkgsettings = self._frozen_config.pkgsettings[myroot] -+ pprovideddict = pkgsettings.pprovideddict -+ virtuals = pkgsettings.getvirtuals() - for atom in sorted(arg.pset.getAtoms()): - self._spinner_update() - dep = Dependency(atom=atom, onlydeps=onlydeps, root=myroot, parent=arg) --- -2.32.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/README.RESCUE b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/README.RESCUE deleted file mode 100644 index e8f3932ac2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/README.RESCUE +++ /dev/null @@ -1,2 +0,0 @@ -Please see https://wiki.gentoo.org/wiki/Project:Portage/Fixing_broken_portage -for a recovery guide for a broken portage installation. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-ccache.conf b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-ccache.conf deleted file mode 100644 index 37857fde31..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-ccache.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Prevent ccache files from being cleaned -x /var/tmp/ccache diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/metadata.xml deleted file mode 100644 index 58ed367a28..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/metadata.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - mailto:dev-portage@gentoo.org - https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES - https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage - cpe:/a:gentoo:portage - - - dev-portage@gentoo.org - - - Build html API documentation with sphinx-apidoc. - Enable features required for Gentoo ebuild development. - Use inter-process communication between portage and - running ebuilds. - - - Compiles native "C" extensions (speedups, instead of using python - backup code). Currently includes libc-locales. - This should only be temporarily disabled for some bootstrapping - operations. Cross-compilation is not supported. - - - Enable full-tree cryptographic verification of Gentoo repository - rsync checkouts using app-portage/gemato. - - Preserve extended attributes (filesystem-stored metadata) - when installing files. Usually only required for hardened systems. - - - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-3.0.28-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-3.0.28-r2.ebuild deleted file mode 100644 index 5f1998b275..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-3.0.28-r2.ebuild +++ /dev/null @@ -1,284 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Flatcar: Based on portage-3.0.28-r1.ebuild from commit -# dd2855193d31d04b6dc25d7fddf381c6d61c0080 in Gentoo repo (see -# https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/portage/portage-3.0.28-r1.ebuild?id=dd2855193d31d04b6dc25d7fddf381c6d61c0080). - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{8..10} ) -PYTHON_REQ_USE='bzip2(+),threads(+)' -TMPFILES_OPTIONAL=1 - -inherit distutils-r1 linux-info tmpfiles prefix - -DESCRIPTION="The package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" -SRC_URI=" - https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2 - https://gitweb.gentoo.org/proj/portage.git/patch/?id=c309328c4e1f6254251d31149ee47b4266d4d70f - -> ${P}-setuptools-install-depr.patch" - -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions rsync-verify selinux test xattr" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-arch/xz-utils - test? ( dev-vcs/git )" -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - apidoc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-epytext[${PYTHON_USEDEP}] - )" -# Require sandbox-2.2 for bug #288863. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -# app-portage/gemato goes without PYTHON_USEDEP since we're calling -# the executable. -RDEPEND=" - acct-user/portage - app-arch/zstd - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/findutils-4.4 - !build? ( - >=sys-apps/sed-4.0.5 - >=app-shells/bash-5.0:0[readline] - >=app-admin/eselect-1.2 - rsync-verify? ( - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] - >=app-crypt/openpgp-keys-gentoo-release-20180706 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - ) - ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - kernel_linux? ( sys-apps/util-linux ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - ) ) - ! cnf/repos.conf - - sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die - - if use gentoo-dev; then - einfo "Disabling --dynamic-deps by default for gentoo-dev..." - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ - -i lib/_emerge/create_depgraph_params.py || \ - die "failed to patch create_depgraph_params.py" - - einfo "Enabling additional FEATURES for gentoo-dev..." - echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \ - >> cnf/make.globals || die - fi - - if use native-extensions; then - printf "[build_ext]\nportage_ext_modules=true\n" >> \ - setup.cfg || die - fi - - if ! use ipc ; then - einfo "Disabling ipc..." - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i lib/_emerge/AbstractEbuildProcess.py || \ - die "failed to patch AbstractEbuildProcess.py" - fi - - if use xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - if use build || ! use rsync-verify; then - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ - -e '/^sync-webrsync-verify-signature/s|yes|no|' \ - -i cnf/repos.conf || die "sed failed" - fi - - if [[ -n ${EPREFIX} ]] ; then - einfo "Setting portage.const.EPREFIX ..." - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ - -w "/_BINARY/" lib/portage/const.py - - einfo "Prefixing shebangs ..." - > "${T}/shebangs" || die - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then - echo "${REPLY}" >> "${T}/shebangs" || die - fi - done < <(find . -type f -executable ! -name etc-update -print0) - - if [[ -s ${T}/shebangs ]]; then - xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" - fi - - einfo "Adjusting make.globals, repos.conf and etc-update ..." - hprefixify cnf/{make.globals,repos.conf} bin/etc-update - - if use prefix-guest ; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi - - einfo "Adding FEATURES=force-prefix to make.globals ..." - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - cd "${S}/cnf" || die - if [ -f "make.conf.example.${ARCH}".diff ]; then - patch make.conf.example "make.conf.example.${ARCH}".diff || \ - die "Failed to patch make.conf.example" - else - eerror "" - eerror "Portage does not have an arch-specific configuration for this arch." - eerror "Please notify the arch maintainer about this issue. Using generic." - eerror "" - fi -} - -python_compile_all() { - local targets=() - use doc && targets+=( docbook ) - use apidoc && targets+=( apidoc ) - - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi -} - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -python_install_all() { - distutils-r1_python_install_all - - local targets=() - use doc && targets+=( - install_docbook - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - use apidoc && targets+=( - install_apidoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - dotmpfiles "${FILESDIR}"/portage-ccache.conf - - # Due to distutils/python-exec limitations - # these must be installed to /usr/bin. - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - einfo "Moving admin scripts to the correct directory" - dodir /usr/sbin - for target in ${sbin_relocations}; do - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" - done -} - -pkg_preinst() { - python_setup - local sitedir=$(python_get_sitedir) - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" - env -u DISTDIR \ - -u PORTAGE_OVERRIDE_EPREFIX \ - -u PORTAGE_REPOSITORIES \ - -u PORTDIR \ - -u PORTDIR_OVERLAY \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.default_locations || die - - env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die - - env -u FEATURES -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.3.77"; then - elog "The emerge --autounmask option is now disabled by default, except for" - elog "portions of behavior which are controlled by the --autounmask-use and" - elog "--autounmask-license options. For backward compatibility, previous" - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." - elog "Users can get the old behavior simply by adding --autounmask to the" - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" - elog "change, see https://bugs.gentoo.org/658648." - fi -}