commit: 6c96ff1ccd77f668e0bd4fa9083f237e824e8a65 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sat Nov 20 23:30:41 2021 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sat Nov 20 23:31:39 2021 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6c96ff1c
specs and config: the stages-musl config is not needed anymore, remove Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> releases/portage/stages-musl/package.mask/releng/gcc-musl-repo | 3 --- releases/portage/stages-musl/package.use/releng/libpcre | 5 ----- releases/portage/stages-musl/package.use/releng/no-filecaps | 7 ------- releases/specs/amd64/musl-hardened/stage1.spec | 2 +- releases/specs/amd64/musl-hardened/stage2.spec | 2 +- releases/specs/amd64/musl-hardened/stage3.spec | 2 +- releases/specs/amd64/musl/stage1.spec | 2 +- releases/specs/amd64/musl/stage2.spec | 2 +- releases/specs/amd64/musl/stage3.spec | 2 +- releases/specs/arm/armv7a-musl/stage1-hardfloat.spec | 2 +- releases/specs/arm/armv7a-musl/stage3-hardfloat.spec | 2 +- releases/specs/arm64/musl-hardened/stage1.spec | 2 +- releases/specs/arm64/musl-hardened/stage3.spec | 2 +- releases/specs/arm64/musl/stage1.spec | 2 +- releases/specs/arm64/musl/stage3.spec | 2 +- releases/specs/ppc/ppc32/stage1-musl-hardened-openrc.spec | 2 +- releases/specs/ppc/ppc32/stage3-musl-hardened-openrc.spec | 2 +- releases/specs/ppc/ppc64/stage1-musl-hardened-openrc.spec | 2 +- releases/specs/ppc/ppc64/stage3-musl-hardened-openrc.spec | 2 +- releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec | 2 +- releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec | 2 +- releases/specs/x86/musl/stage1.spec | 2 +- releases/specs/x86/musl/stage2.spec | 2 +- releases/specs/x86/musl/stage3.spec | 2 +- 24 files changed, 21 insertions(+), 36 deletions(-) diff --git a/releases/portage/stages-musl/package.mask/releng/gcc-musl-repo b/releases/portage/stages-musl/package.mask/releng/gcc-musl-repo deleted file mode 100644 index 3a1a423d..00000000 --- a/releases/portage/stages-musl/package.mask/releng/gcc-musl-repo +++ /dev/null @@ -1,3 +0,0 @@ -# we need gcc from musl repo that contains pure64 patches -# https://github.com/gentoo/musl/issues/351 -sys-devel/gcc::gentoo diff --git a/releases/portage/stages-musl/package.use/releng/libpcre b/releases/portage/stages-musl/package.use/releng/libpcre deleted file mode 100644 index 84d84b54..00000000 --- a/releases/portage/stages-musl/package.use/releng/libpcre +++ /dev/null @@ -1,5 +0,0 @@ -# required by sys-libs/libselinux-2.7 -dev-libs/libpcre static-libs - -# required by dev-vcs/git -dev-libs/libpcre2 jit diff --git a/releases/portage/stages-musl/package.use/releng/no-filecaps b/releases/portage/stages-musl/package.use/releng/no-filecaps deleted file mode 100644 index 901e5c36..00000000 --- a/releases/portage/stages-musl/package.use/releng/no-filecaps +++ /dev/null @@ -1,7 +0,0 @@ -# For stage building, we cannot be sure the final unpack destination will have -# xattr/fcaps support. To be safe, we build stages without filecaps, but allow -# filecaps to be turned back on @ next full world upgrade. The ebuilds using -# fcaps eclass will have more logic to safely fall back in case of missing -# support. - -*/* -filecaps diff --git a/releases/specs/amd64/musl-hardened/stage1.spec b/releases/specs/amd64/musl-hardened/stage1.spec index 0d69adb9..8b6aa9a5 100644 --- a/releases/specs/amd64/musl-hardened/stage1.spec +++ b/releases/specs/amd64/musl-hardened/stage1.spec @@ -6,7 +6,7 @@ profile: default/linux/amd64/17.0/musl/hardened snapshot: @TIMESTAMP@ source_subpath: musl-hardened/stage3-amd64-musl-hardened-latest chost: x86_64-gentoo-linux-musl -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_overlay: /root/musl portage_prefix: releng update_seed: yes diff --git a/releases/specs/amd64/musl-hardened/stage2.spec b/releases/specs/amd64/musl-hardened/stage2.spec index 0ca7f19a..0f4b5f88 100644 --- a/releases/specs/amd64/musl-hardened/stage2.spec +++ b/releases/specs/amd64/musl-hardened/stage2.spec @@ -6,7 +6,7 @@ profile: default/linux/amd64/17.0/musl/hardened snapshot: @TIMESTAMP@ source_subpath: musl-hardened/stage1-amd64-musl-hardened-@TIMESTAMP@ chost: x86_64-gentoo-linux-musl -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_overlay: /root/musl portage_prefix: releng compression_mode: pixz diff --git a/releases/specs/amd64/musl-hardened/stage3.spec b/releases/specs/amd64/musl-hardened/stage3.spec index 9d3ea034..b24f5050 100644 --- a/releases/specs/amd64/musl-hardened/stage3.spec +++ b/releases/specs/amd64/musl-hardened/stage3.spec @@ -5,7 +5,7 @@ rel_type: musl-hardened profile: default/linux/amd64/17.0/musl/hardened snapshot: @TIMESTAMP@ source_subpath: musl-hardened/stage2-amd64-musl-hardened-@TIMESTAMP@ -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_overlay: /root/musl portage_prefix: releng compression_mode: pixz diff --git a/releases/specs/amd64/musl/stage1.spec b/releases/specs/amd64/musl/stage1.spec index de027d3a..8d7d8e8a 100644 --- a/releases/specs/amd64/musl/stage1.spec +++ b/releases/specs/amd64/musl/stage1.spec @@ -6,7 +6,7 @@ profile: default/linux/amd64/17.0/musl snapshot: @TIMESTAMP@ source_subpath: musl/stage3-amd64-musl-latest chost: x86_64-gentoo-linux-musl -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_overlay: /root/musl portage_prefix: releng update_seed: yes diff --git a/releases/specs/amd64/musl/stage2.spec b/releases/specs/amd64/musl/stage2.spec index 7838f8c3..7e08de21 100644 --- a/releases/specs/amd64/musl/stage2.spec +++ b/releases/specs/amd64/musl/stage2.spec @@ -6,7 +6,7 @@ profile: default/linux/amd64/17.0/musl snapshot: @TIMESTAMP@ source_subpath: musl/stage1-amd64-musl-@TIMESTAMP@ chost: x86_64-gentoo-linux-musl -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_overlay: /root/musl portage_prefix: releng compression_mode: pixz diff --git a/releases/specs/amd64/musl/stage3.spec b/releases/specs/amd64/musl/stage3.spec index 9f444b32..c080ead5 100644 --- a/releases/specs/amd64/musl/stage3.spec +++ b/releases/specs/amd64/musl/stage3.spec @@ -5,7 +5,7 @@ rel_type: musl profile: default/linux/amd64/17.0/musl snapshot: @TIMESTAMP@ source_subpath: musl/stage2-amd64-musl-@TIMESTAMP@ -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_overlay: /root/musl portage_prefix: releng compression_mode: pixz diff --git a/releases/specs/arm/armv7a-musl/stage1-hardfloat.spec b/releases/specs/arm/armv7a-musl/stage1-hardfloat.spec index 9f237a42..49bb1d53 100644 --- a/releases/specs/arm/armv7a-musl/stage1-hardfloat.spec +++ b/releases/specs/arm/armv7a-musl/stage1-hardfloat.spec @@ -8,6 +8,6 @@ source_subpath: musl/stage3-armv7a_hardfp_musl-openrc-latest compression_mode: pixz update_seed: yes update_seed_command: -uDN @world -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng repos: /root/musl diff --git a/releases/specs/arm/armv7a-musl/stage3-hardfloat.spec b/releases/specs/arm/armv7a-musl/stage3-hardfloat.spec index c8d7c9a5..3f037948 100644 --- a/releases/specs/arm/armv7a-musl/stage3-hardfloat.spec +++ b/releases/specs/arm/armv7a-musl/stage3-hardfloat.spec @@ -6,6 +6,6 @@ profile: default/linux/arm/17.0/musl/armv7a snapshot: @TIMESTAMP@ source_subpath: musl/stage1-armv7a_hardfp_musl-openrc-@TIMESTAMP@ compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng repos: /root/musl diff --git a/releases/specs/arm64/musl-hardened/stage1.spec b/releases/specs/arm64/musl-hardened/stage1.spec index 1e8e1b02..909ad767 100644 --- a/releases/specs/arm64/musl-hardened/stage1.spec +++ b/releases/specs/arm64/musl-hardened/stage1.spec @@ -8,7 +8,7 @@ source_subpath: musl-hardened/stage3-arm64-musl-hardened-latest compression_mode: pixz update_seed: yes update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages repos: /root/musl portage_prefix: releng chost: aarch64-gentoo-linux-musl diff --git a/releases/specs/arm64/musl-hardened/stage3.spec b/releases/specs/arm64/musl-hardened/stage3.spec index 3b605aae..b84fc8b1 100644 --- a/releases/specs/arm64/musl-hardened/stage3.spec +++ b/releases/specs/arm64/musl-hardened/stage3.spec @@ -6,6 +6,6 @@ profile: default/linux/arm64/17.0/musl/hardened snapshot: @TIMESTAMP@ source_subpath: musl-hardened/stage1-arm64-musl-hardened-@TIMESTAMP@ compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages repos: /root/musl portage_prefix: releng diff --git a/releases/specs/arm64/musl/stage1.spec b/releases/specs/arm64/musl/stage1.spec index f9b15dc1..764b192f 100644 --- a/releases/specs/arm64/musl/stage1.spec +++ b/releases/specs/arm64/musl/stage1.spec @@ -8,7 +8,7 @@ source_subpath: musl/stage3-arm64-musl-latest compression_mode: pixz update_seed: yes update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages repos: /root/musl portage_prefix: releng chost: aarch64-gentoo-linux-musl diff --git a/releases/specs/arm64/musl/stage3.spec b/releases/specs/arm64/musl/stage3.spec index 2b284e67..26ee4df1 100644 --- a/releases/specs/arm64/musl/stage3.spec +++ b/releases/specs/arm64/musl/stage3.spec @@ -6,6 +6,6 @@ profile: default/linux/arm64/17.0/musl snapshot: @TIMESTAMP@ source_subpath: musl/stage1-arm64-musl-@TIMESTAMP@ compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages repos: /root/musl portage_prefix: releng diff --git a/releases/specs/ppc/ppc32/stage1-musl-hardened-openrc.spec b/releases/specs/ppc/ppc32/stage1-musl-hardened-openrc.spec index 902d6478..d776614c 100644 --- a/releases/specs/ppc/ppc32/stage1-musl-hardened-openrc.spec +++ b/releases/specs/ppc/ppc32/stage1-musl-hardened-openrc.spec @@ -9,6 +9,6 @@ source_subpath: musl-hardened/stage3-ppc-musl-hardened-openrc-latest compression_mode: pixz update_seed: yes update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12 -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng repos: /var/db/repos/musl diff --git a/releases/specs/ppc/ppc32/stage3-musl-hardened-openrc.spec b/releases/specs/ppc/ppc32/stage3-musl-hardened-openrc.spec index 69689472..74608a69 100644 --- a/releases/specs/ppc/ppc32/stage3-musl-hardened-openrc.spec +++ b/releases/specs/ppc/ppc32/stage3-musl-hardened-openrc.spec @@ -6,6 +6,6 @@ profile: default/linux/ppc/17.0/musl/hardened snapshot: @TIMESTAMP@ source_subpath: musl-hardened/stage1-ppc-musl-hardened-openrc-@TIMESTAMP@ compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng repos: /var/db/repos/musl diff --git a/releases/specs/ppc/ppc64/stage1-musl-hardened-openrc.spec b/releases/specs/ppc/ppc64/stage1-musl-hardened-openrc.spec index c93a9f0a..4469af68 100644 --- a/releases/specs/ppc/ppc64/stage1-musl-hardened-openrc.spec +++ b/releases/specs/ppc/ppc64/stage1-musl-hardened-openrc.spec @@ -9,6 +9,6 @@ chost: powerpc64-gentoo-linux-musl compression_mode: pixz update_seed: yes update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12 -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng repos: /var/db/repos/musl diff --git a/releases/specs/ppc/ppc64/stage3-musl-hardened-openrc.spec b/releases/specs/ppc/ppc64/stage3-musl-hardened-openrc.spec index 720e7688..1dcb905e 100644 --- a/releases/specs/ppc/ppc64/stage3-musl-hardened-openrc.spec +++ b/releases/specs/ppc/ppc64/stage3-musl-hardened-openrc.spec @@ -6,6 +6,6 @@ profile: default/linux/ppc64/17.0/musl/hardened snapshot: @TIMESTAMP@ source_subpath: musl-hardened/stage1-ppc64-musl-hardened-openrc-@TIMESTAMP@ compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng repos: /var/db/repos/musl diff --git a/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec index 1857fb22..05f60976 100644 --- a/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec +++ b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec @@ -9,6 +9,6 @@ chost: powerpc64le-gentoo-linux-musl compression_mode: pixz update_seed: yes update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12 -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng repos: /var/db/repos/musl diff --git a/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec index 059a88b3..fa9577a8 100644 --- a/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec +++ b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec @@ -6,6 +6,6 @@ profile: default/linux/ppc64le/17.0/musl/hardened snapshot: @TIMESTAMP@ source_subpath: musl-hardened/stage1-ppc64le-musl-hardened-openrc-@TIMESTAMP@ compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng repos: /var/db/repos/musl diff --git a/releases/specs/x86/musl/stage1.spec b/releases/specs/x86/musl/stage1.spec index 5b37772a..4c1d34a1 100644 --- a/releases/specs/x86/musl/stage1.spec +++ b/releases/specs/x86/musl/stage1.spec @@ -6,7 +6,7 @@ profile: default/linux/x86/17.0/musl snapshot: @TIMESTAMP@ source_subpath: musl/stage3-i686-musl-latest chost: i686-gentoo-linux-musl -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_overlay: /root/musl portage_prefix: releng update_seed: yes diff --git a/releases/specs/x86/musl/stage2.spec b/releases/specs/x86/musl/stage2.spec index 261a598c..d4cc6cd5 100644 --- a/releases/specs/x86/musl/stage2.spec +++ b/releases/specs/x86/musl/stage2.spec @@ -6,7 +6,7 @@ profile: default/linux/x86/17.0/musl snapshot: @TIMESTAMP@ source_subpath: musl/stage1-i686-musl-@TIMESTAMP@ chost: i686-gentoo-linux-musl -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_overlay: /root/musl portage_prefix: releng compression_mode: pixz diff --git a/releases/specs/x86/musl/stage3.spec b/releases/specs/x86/musl/stage3.spec index 2e9c0e2b..36317686 100644 --- a/releases/specs/x86/musl/stage3.spec +++ b/releases/specs/x86/musl/stage3.spec @@ -5,7 +5,7 @@ rel_type: musl profile: default/linux/x86/17.0/musl snapshot: @TIMESTAMP@ source_subpath: musl/stage2-i686-musl-@TIMESTAMP@ -portage_confdir: @REPO_DIR@/releases/portage/stages-musl +portage_confdir: @REPO_DIR@/releases/portage/stages portage_overlay: /root/musl portage_prefix: releng compression_mode: pixz
