From 8f6e9c62a02e4ad33965c5217e91b4824988a772 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 13 Mar 2008 00:41:16 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1372 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 15 +++++++++---- catalyst | 2 +- .../livecd-stage2/livecd-stage2-controller.sh | 21 ++++++++++++------- targets/stage1/stage1-controller.sh | 6 +++--- 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index dae3f24d..47d2e9dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 13 Mar 2008; Chris Gianelloni 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 targets/support/kmerge.sh: We should be using --newuse when merging our packages in callback. @@ -13,15 +20,15 @@ 11 Mar 2008; Andrew Gaffney 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 targets/grp/grp-chroot.sh: - Call setup_myemergeopts after changing clst_FETCH + Call setup_myemergeopts after changing clst_FETCH. 10 Mar 2008; Andrew Gaffney targets/netboot2/netboot2-pkg.sh: - Remove a bit of unnecessary code + Remove a bit of unnecessary code. 10 Mar 2008; Chris Gianelloni modules/generic_stage_target.py, targets/grp/grp-chroot.sh, @@ -32,7 +39,7 @@ 10 Mar 2008; Andrew Gaffney 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 modules/generic_stage_target.py: diff --git a/catalyst b/catalyst index 75090dcd..0b97f487 100755 --- a/catalyst +++ b/catalyst @@ -8,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__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 e9c9c818..0185b18a 100755 --- 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 0ecad29f..56258772 100755 --- 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 -- 2.26.2