From 52b1f2e74212f68245da5a88185bf1ee6ea1897f Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 20 Feb 2008 16:23:58 +0000 Subject: [PATCH] Fix up the sed for genkernel so it works on versions both before and after 3.4.10_pre2 and fixing a couple places where my sed for the . -> source change was a bit too aggressive. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1313 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 49 ++++++++++++++++----------- targets/support/pre-kmerge.sh | 15 +++++--- targets/tinderbox/tinderbox-chroot.sh | 8 ++--- 3 files changed, 43 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d1891ef..a3346dfc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,22 +1,29 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 20 Feb 2008; Chris Gianelloni + targets/support/pre-kmerge.sh, targets/tinderbox/tinderbox-chroot.sh: + Fix up the sed for genkernel so it works on versions both before and after + 3.4.10_pre2 and fixing a couple places where my sed for the . -> source + change was a bit too aggressive. + 20 Feb 2008; Andrew Gaffney targets/support/bootloader-setup.sh: - Change grub timeout to 15 seconds instead of 150 + Change grub timeout to 15 seconds instead of 150. 20 Feb 2008; Andrew Gaffney targets/support/pre-kmerge.sh: - Comment out sed on genkernel executable as it appears to do nothing these days + Comment out sed on genkernel executable as it appears to do nothing these + days. 20 Feb 2008; Andrew Gaffney targets/livecd-stage2/livecd-stage2-controller.sh: Only call find on libdirs that actually exist. Thanks to Kristoffer - in bug 210807 + in bug #210807. 20 Feb 2008; Andrew Gaffney modules/generic_stage_target.py: - Add warning about -* in foo/use in the spec + Add warning about -* in foo/use in the spec. 20 Feb 2008; Chris Gianelloni targets/embedded/embedded-chroot.sh, @@ -101,7 +108,7 @@ 13 Feb 2008; Andrew Gaffney modules/generic_stage_target.py: - Sort and de-dupe myusevars + Sort and de-dupe myusevars. 13 Feb 2008; Chris Gianelloni targets/stage1/stage1-chroot.sh: @@ -172,7 +179,7 @@ 07 Feb 2008; Andrew Gaffney targets/support/kmerge.sh: Make the --kerncache option to genkernel dependent on 'kerncache' being in - options, so that it can actually be turned off + options, so that it can actually be turned off. 07 Feb 2008; Chris Gianelloni arch/amd64.py, arch/mips.py: @@ -180,11 +187,11 @@ before it has been defined. 07 Feb 2008; Andrew Gaffney arch/powerpc.py: - Reorder arch/powerpc.py to make python happy + Reorder arch/powerpc.py to make python happy. 07 Feb 2008; Andrew Gaffney modules/snapshot_target.py: - Change .svn --include to an --exclude like it was supposed to be + Change .svn --include to an --exclude like it was supposed to be. 07 Feb 2008; Chris Gianelloni arch/mips.py, catalyst: @@ -228,7 +235,7 @@ modules/netboot2_target.py, targets/support/kmerge.sh: Add patch to enabled netboot2/linuxrc and automatically add path for initramfs overlay to genkernel commandline. Thanks to Justin Bronder - in bug #208106 + in bug #208106. 06 Feb 2008; Andrew Gaffney modules/netboot2_target.py: @@ -244,7 +251,7 @@ 03 Feb 2008; Andrew Gaffney targets/support/bootloader-setup.sh: - Add splashimage= line to grub.conf if /boot/grub/splash.xpm.gz exists + Add splashimage= line to grub.conf if /boot/grub/splash.xpm.gz exists. 02 Feb 2008; Chris Gianelloni examples/generic_stage_template.spec, examples/grp_template.spec, @@ -268,7 +275,7 @@ 02 Feb 2008; Andrew Gaffney targets/support/bootloader-setup.sh: - Add 'pager on' to grub.conf for bug 208531 + Add 'pager on' to grub.conf for bug #208531. 02 Feb 2008; Chris Gianelloni livecd/files/README.txt, livecd/files/x86-F6.msg: @@ -305,7 +312,7 @@ targets/livecd-stage2/livecd-stage2-controller.sh, targets/support/livecdfs-update.sh: We apparently still need profiles/eclass for building the stage3 from the - livecd with the installer. + LiveCD with the installer. 17 Nov 2007; Andrew Gaffney arch/mips.py: Apply patch for MIPS N32 support from Stuart Longland @@ -336,7 +343,7 @@ 11 Nov 2007; Andrew Gaffney modules/generic_stage_target.py: - Add an extra warning into the generated make.conf about changing the CHOST + Add an extra warning into the generated make.conf about changing the CHOST. 01 Nov 2007; Andrew Gaffney targets/support/livecdfs-update.sh: @@ -377,23 +384,24 @@ to go poking around if we need to touch anything in libdir. 11 Oct 2007; Andrew Gaffney catalyst: - print an error saying what target failed before the traceback + Print an error saying what target failed before the traceback. 25 Sep 2007; Andrew Gaffney modules/catalyst_support.py: - when parsing make.conf, first try pkgcore's + When parsing make.conf, first try pkgcore's snakeoil.fileutils.read_bash_dict(), then portage's - portage_util.getconfig(), then the internal parse_makeconf() + portage_util.getconfig(), then the internal parse_makeconf(). 06 Sep 2007; Andrew Gaffney modules/catalyst_support.py: - raise an exception in parse_spec() if there's a duplicate key in the spec + Raise an exception in parse_spec() if there's a duplicate key in the spec. 06 Sep 2007; Andrew Gaffney examples/netboot_template.spec, examples/tinderbox_template.spec, modules/grp_target.py, modules/tinderbox_target.py: - remove redundant set_pkgcache_path() functions from tinderbox and grp modules - remove extra pkgcache_path and kerncache_path options from example specs + Remove redundant set_pkgcache_path() functions from tinderbox and grp + modules, and remove extra pkgcache_path and kerncache_path options from + example specs. 31 Aug 2007; Chris Gianelloni catalyst: This is catalyst 2.0.5_pre3 for testing the new stages code. @@ -420,7 +428,8 @@ 22 Aug 2007; Andrew Gaffney modules/generic_stage_target.py, modules/stage1_target.py, modules/stage2_target.py: - 'chost' option is only valid in stage 1/2 specs. have catalyst error otherwise + The 'chost' option is only valid in stage 1/2 specs. Have catalyst error + otherwise. 13 Aug 2007; Andrew Gaffney catalyst, modules/generic_stage_target.py, modules/netboot2_target.py: diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh index 71bda10c..b73e96a8 100755 --- a/targets/support/pre-kmerge.sh +++ b/targets/support/pre-kmerge.sh @@ -5,24 +5,29 @@ source /tmp/chroot-functions.sh case ${clst_target} in livecd*|stage4) run_emerge --oneshot genkernel - install -source /tmp/kerncache + install -d /tmp/kerncache # Setup case structure for livecd_type case ${clst_livecd_type} in gentoo-release-minimal | gentoo-release-universal) case ${clst_hostarch} in amd64|x86) -# sed -i 's/initramfs_data.cpio.gz /initramfs_data.cpio.gz -r 1024x768 /' /usr/share/genkernel/genkernel + if [ -x /usr/share/genkernel/genkernel ] + then + gk=/usr/share/genkernel/genkernel + else + gk=/usr/bin/genkernel + fi + sed -i 's/initramfs_data.cpio.gz /initramfs_data.cpio.gz -r 1024x768 /' ${gk} ;; esac ;; esac ;; - netboot2) run_emerge --oneshot genkernel - install -source /tmp/kerncache + install -d /tmp/kerncache # Set the netboot builddate/hostname in linuxrc and copy to proper arch # directory in genkernel @@ -36,7 +41,7 @@ case ${clst_target} in ${clst_merge_path} echo ">>> Copying busybox config ..." - cp -source /tmp/busy-config \ + cp -f /tmp/busy-config \ /usr/share/genkernel/${clst_hostarch}/busy-config ;; esac diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh index 9a0ea707..fb281125 100755 --- a/targets/tinderbox/tinderbox-chroot.sh +++ b/targets/tinderbox/tinderbox-chroot.sh @@ -24,17 +24,17 @@ do fi fi - mkdir -source /tmp/packages/$x + mkdir -p /tmp/packages/$x export PORT_LOGDIR="/tmp/packages/$x" run_emerge $x if [ "$?" != "0" ] then - echo "! $x" >source /tmp/tinderbox.log + echo "! $x" >> /tmp/tinderbox.log else - echo "$x" >source /tmp/tinderbox.log + echo "$x" >> /tmp/tinderbox.log fi echo "Syncing from original pristine tinderbox snapshot..." rsync -avx --delete --exclude "/root/*" --exclude "/tmp/" --exclude \ - "/usr/portage/source /tmp/rsync-bak/ / + "/usr/portage/" /tmp/rsync-bak/ / done -- 2.26.2