| 1 |
commit: f1ba8d24da137ddcd0d0ba6c68d1f5e4b37635ef |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 22 23:55:44 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 22 23:56:39 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f1ba8d24 |
| 7 |
|
| 8 |
scripts/bootstrap-prefix.sh: mask glibc-2.34 due to bootstrapping issues |
| 9 |
|
| 10 |
Mask <sys-libs/glibc-2.34_p1 for now due to bootstrapping issues. Note that |
| 11 |
_p1 doesn't exist but I wanted to use _something_ to allow us to push |
| 12 |
glibc-2.34 to prefix users in future and _p1 is easier than guessing a revision. |
| 13 |
|
| 14 |
We rarely use _pN in ::gentoo. |
| 15 |
|
| 16 |
Bug: https://bugs.gentoo.org/824482 |
| 17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 18 |
|
| 19 |
scripts/bootstrap-prefix.sh | 12 ++++++++++++ |
| 20 |
1 file changed, 12 insertions(+) |
| 21 |
|
| 22 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 23 |
index ccbe9ef905..15ae679b95 100755 |
| 24 |
--- a/scripts/bootstrap-prefix.sh |
| 25 |
+++ b/scripts/bootstrap-prefix.sh |
| 26 |
@@ -494,6 +494,18 @@ bootstrap_setup() { |
| 27 |
>=sys-devel/gcc-11 |
| 28 |
EOF |
| 29 |
|
| 30 |
+ # bug #824482 avoid glibc-2.34 |
| 31 |
+ if is-rap; then |
| 32 |
+ if ! [ -d "${ROOT}"/etc/portage/package.mask ]; then |
| 33 |
+ mkdir "${ROOT}"/etc/portage/package.mask |
| 34 |
+ fi |
| 35 |
+ cat >> "${ROOT}"/etc/portage/package.mask/glibc <<-EOF |
| 36 |
+ # Temporary mask for newer glibc until bootstrapping issues are fixed. |
| 37 |
+ # bug #824482: Avoid glibc-2.34 for now. |
| 38 |
+ <sys-libs/glibc-2.34_p1 |
| 39 |
+ EOF |
| 40 |
+ fi |
| 41 |
+ |
| 42 |
# Use package.use to disable in the portage tree to be shared between |
| 43 |
# stage2 and stage3. The hack will be undone during tree sync in stage3. |
| 44 |
cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF |
Archives