Cleanup the clean section for stage1 and add an updated clean section for livecd...

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

diff --git a/ChangeLog b/ChangeLog
index dae3f24dcda5688cf12958022cea9232cd98ae0e..47d2e9dd32400dd7eadc34a0bc9a451ddee801c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  13 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/livecd-stage2/livecd-stage2-controller.sh,
+  targets/stage1/stage1-controller.sh:
+  Cleanup the clean section for stage1 and add an updated clean section for
+  livecd-stage2 when we're a minimal, universal, or game CD. This is
+  2.0.6_pre14 for testing.
+
   11 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/kmerge.sh:
   We should be using --newuse when merging our packages in callback.
@@ -13,15 +20,15 @@
   11 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst_support.py, modules/generic_stage_target.py,
   modules/grp_target.py:
-  Apply additional patches from bug 207862 for CONTENTS generation
+  Apply additional patches from bug #207862 for CONTENTS generation.
 
   10 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/grp/grp-chroot.sh:
-  Call setup_myemergeopts after changing clst_FETCH
+  Call setup_myemergeopts after changing clst_FETCH.
 
   10 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/netboot2/netboot2-pkg.sh:
-  Remove a bit of unnecessary code
+  Remove a bit of unnecessary code.
 
   10 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py, targets/grp/grp-chroot.sh,
@@ -32,7 +39,7 @@
 
   10 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/chroot-functions.sh:
-  Don't set --usepkg and --buildpkg when fetching
+  Don't set --usepkg and --buildpkg when fetching.
 
   07 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/catalyst b/catalyst
index 75090dcd36e8344100fdcc2b34f56ca3b2c86c96..0b97f487295b4119c4141199bf582425ae0e52bb 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6_pre13"
+__version__="2.0.6_pre14"
 
 conf_values={}
 

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index e9c9c8186f83ed4567835e43f025efb464968a94..0185b18a9f59867c40ae04c3e33a7a333ac2fd9b 100755 (executable)
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -94,13 +94,20 @@ case $1 in
                exec_in_chroot ${clst_fsscript}
                ;;
        clean)
-               for x in lib lib32 lib64
-               do
-                       if [ -d "${clst_chroot_path}/usr/${x}" ]
-                       then
-                               find "${clst_chroot_path}/usr/${x}" -iname "*.pyc" -exec rm -f {} \;
-                       fi
-               done
+               if [ "${clst_livecd_type}" = "gentoo-gamecd" ] \
+               || [ "${clst_livecd_type}" = "gentoo-release-minimal" ] \
+               || [ "${clst_livecd_type}" = "gentoo-release-universal" ]
+               then
+                       # Clean out man, info and doc files
+                       rm -rf usr/share/{man,doc,info}/*
+                       # Zap all .pyc and .pyo files
+                       find / -iname "*.py[co]" -exec rm -f {} \;
+               fi
+               # Cleanup all .a files except libgcc.a, *_nonshared.a and
+               # /usr/lib/portage/bin/*.a
+               find / -type f -iname "*.a" | grep -v 'libgcc.a' | \
+                       grep -v 'nonshared.a' | grep -v '/usr/lib/portage/bin/' | \
+                       grep -v 'libgcc_eh.a' | xargs rm -f
                ;;
        bootloader)
                shift

diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 0ecad29f19f54a89bcdfc807c776f583490b22e0..56258772c87d96f7d916a6695aaf33bb3398aa47 100755 (executable)
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -31,9 +31,9 @@ case $1 in
                find . -iname "*.py[co]" -exec rm -f {} \;
                # Cleanup all .a files except libgcc.a, *_nonshared.a and
                # /usr/lib/portage/bin/*.a
-               find . -type f -iname "*.a" | grep -v 'libgcc.a' | grep -v 'nonshared.a' \
-                       | grep -v '/usr/lib/portage/bin/' | grep -v 'libgcc_eh.a' | xargs \
-                       rm -f
+               find . -type f -iname "*.a" | grep -v 'libgcc.a' | \
+                       grep -v 'nonshared.a' | grep -v '/usr/lib/portage/bin/' | \
+                       grep -v 'libgcc_eh.a' | xargs rm -f
        ;;
        *)
                exit 1