summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-08-21 04:28:00 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-08-21 04:28:00 +0000
commitcc2415e689d597da9c83e38d7abdb6495fe3428a (patch)
tree4d4498be8fdeb07fc9d771039726d870dd7d00b4 /profiles
parentForce builds of x86 glibc on amd64 to ignore /emul. (diff)
downloadhistorical-cc2415e689d597da9c83e38d7abdb6495fe3428a.tar.gz
historical-cc2415e689d597da9c83e38d7abdb6495fe3428a.tar.bz2
historical-cc2415e689d597da9c83e38d7abdb6495fe3428a.zip
Update script as we no longer need to force installing the same-version glibc.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh4
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 604a3d8a731d..a50a3f7cfc13 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.7 2005/08/09 01:47:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh,v 1.8 2005/08/21 04:28:00 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 "=$(portageq match / sys-libs/glibc)" || myDie "emerge glibc failed"
+ emerge -v --oneshot sys-libs/glibc || myDie "emerge glibc failed"
touch step5
fi