Rearranged generation of /usr/livecd/systempkgs.txt for the LiveCD. Thanks to Andrew...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1075 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index feab87b9f3eaa0223fa98111aab378fe6e8223f1..659ad2c14cd0ed9a631ffac99760ff613c359cfa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.560 2006/02/07 22:29:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.561 2006/02/08 03:25:24 wolf31o2 Exp $
+
+  08 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/livecdfs-update.sh:
+  Rearranged generation of /usr/livecd/systempkgs.txt for the LiveCD. Thanks
+  to Andrew Gaffney for spotting this.
 
   07 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   targets/support/kmerge.sh:

diff --git a/catalyst b/catalyst
index a31d53a25164aa3f6ee242a60ff1c323f6f32117..6f5630765f74ba269bf0d3844f585594717ad794 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python -OO
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.140 2006/02/07 22:29:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.141 2006/02/08 03:25:24 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -11,7 +11,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc32"
+__version__="2.0_rc33"
 
 conf_values={}
 

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index ae7774e859d12fbc1fa976a0ab1d75ec72c33151..514a1aa135b4d18d5ebfad9836b01bc86c2d8df6 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/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/targets/support/livecdfs-update.sh,v 1.34 2006/02/07 18:20:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.35 2006/02/08 03:25:24 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -281,16 +281,17 @@ case ${clst_livecd_type} in
                                --type string --set /desktop/gnome/interface/font_name "Sans 9"
                fi
 
-               # This is my hack to reduce tmpfs usage
+               # This gives us our list of system packages for the installer
                mkdir -p /usr/livecd
+               USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -ep system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' > /usr/livecd/systempkgs.txt
+
+               # This is my hack to reduce tmpfs usage
                cp -r /usr/portage/profiles /usr/livecd
                cp -r /usr/portage/eclass /usr/livecd
                rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
                mv -f /etc/gconf /usr/livecd
                mv -f /var/db /usr/livecd
 
-               # This gives us our list of system packages for the installer
-               USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -ep system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' > /usr/livecd/systempkgs.txt
                # This gives us a proper cache for portage
                tar cjf /usr/livecd/metadata.tar.bz2 /var/cache/edb/dep/usr/portage
                ;;