summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2005-07-26 22:07:50 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2005-07-26 22:07:50 +0000
commit95ed7fd678b23ce2ea917b7028c72fd424c6dd74 (patch)
tree0f31f00f1eae8beca00dc3ac7cd9cca933e3290a
parentAdded removal of all locales except en_US from all official Gentoo release me... (diff)
downloadgentoo-95ed7fd678b23ce2ea917b7028c72fd424c6dd74.tar.gz
gentoo-95ed7fd678b23ce2ea917b7028c72fd424c6dd74.tar.bz2
gentoo-95ed7fd678b23ce2ea917b7028c72fd424c6dd74.zip
Updated locale removal to only run on gentoo-release-universal, gentoo-release-minimal, and gentoo-gamecd targets, as it breaks the full LiveCD build otherwise.
-rw-r--r--src/catalyst/ChangeLog8
-rw-r--r--src/catalyst/livecd/runscript-support/livecdfs-update.sh4
2 files changed, 9 insertions, 3 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog
index 787689bbdd..6a7b97e9ee 100644
--- a/src/catalyst/ChangeLog
+++ b/src/catalyst/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gentoo/src/catalyst
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.117 2005/07/26 13:29:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.118 2005/07/26 22:07:50 wolf31o2 Exp $
+
+ 26 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+ livecd/runscript-support/livecdfs-update.sh:
+ Updated locale removal to only run on gentoo-release-universal,
+ gentoo-release-minimal, and gentoo-gamecd targets, as it breaks the full
+ LiveCD build otherwise.
26 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
livecd/runscript-support/livecdfs-update.sh:
diff --git a/src/catalyst/livecd/runscript-support/livecdfs-update.sh b/src/catalyst/livecd/runscript-support/livecdfs-update.sh
index 7ed73b519d..7f5ca4aba0 100644
--- a/src/catalyst/livecd/runscript-support/livecdfs-update.sh
+++ b/src/catalyst/livecd/runscript-support/livecdfs-update.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/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.35.2.22 2005/07/26 13:29:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.35.2.23 2005/07/26 22:07:50 wolf31o2 Exp $
/usr/sbin/env-update
source /etc/profile
@@ -221,7 +221,7 @@ fi
# Clear out locales
case ${clst_livecd_type} in
- gentoo-*)
+ gentoo-release-minimal|gentoo-release-universal|gentoo-gamecd)
rm -rf /usr/lib/locale/{a,b,c,d,e{l,n_{A,B,C,D,G,H,I,N,P,S,US.,Z},s,t,u},f,g,h,i,j,k,l,m,n,o,p,r,s,t,u,v,w,x,y,z}*
;;
esac