diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-08-09 01:47:26 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-08-09 01:47:26 +0000 |
| commit | f3aa1a9e56ea7a6355238f1e0799f6fd5d2ee8f6 (patch) | |
| tree | bf615b84a1f17d26fef60d8593acd6d3d2f32c2e /profiles | |
| parent | Version Bump. Added X USE flag thanks to JeR <jer@xs4all.nl> closes bug #99964 . (diff) | |
| download | gentoo-2-f3aa1a9e56ea7a6355238f1e0799f6fd5d2ee8f6.tar.gz gentoo-2-f3aa1a9e56ea7a6355238f1e0799f6fd5d2ee8f6.tar.bz2 gentoo-2-f3aa1a9e56ea7a6355238f1e0799f6fd5d2ee8f6.zip | |
When emerging glibc in stage5, we need to pull the same version currently installed otherwise we can end up with tls/no-tls related uglyness.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh b/profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh index 7e39188170d9..604a3d8a731d 100644 --- a/profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh +++ b/profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh,v 1.6 2005/07/20 19:53:40 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh,v 1.7 2005/08/09 01:47:26 eradicator Exp $ TMPDIR="$(portageq envvar PORTAGE_TMPDIR)" PORTDIR="$(portageq envvar PORTDIR)" @@ -212,7 +212,7 @@ if [[ ! -f step4 ]]; then fi if [[ ! -f step5 ]]; then - emerge -v --oneshot glibc || myDie "emerge glibc failed" + emerge -v --oneshot "=$(portageq match / sys-libs/glibc)" || myDie "emerge glibc failed" touch step5 fi |