Fix up the sed for genkernel so it works on versions both before and after 3.4.10_pre...

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

diff --git a/ChangeLog b/ChangeLog
index 6d1891ef5a4ebe33ae0fbdcb387947d6cc71aaba..a3346dfc1d6d8944c101fcb1fbe26c81d8a03428 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,22 +1,29 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  20 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  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 <agaffney@gentoo.org>
   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 <agaffney@gentoo.org>
   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 <agaffney@gentoo.org>
   targets/livecd-stage2/livecd-stage2-controller.sh:
   Only call find on libdirs that actually exist. Thanks to Kristoffer
-  <krek6597@student.uu.se> in bug 210807
+  <krek6597@student.uu.se> in bug #210807.
 
   20 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   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 <wolf31o2@gentoo.org>
   targets/embedded/embedded-chroot.sh,
@@ -101,7 +108,7 @@
 
   13 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   modules/generic_stage_target.py:
-  Sort and de-dupe myusevars
+  Sort and de-dupe myusevars.
 
   13 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/stage1-chroot.sh:
@@ -172,7 +179,7 @@
   07 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   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 <wolf31o2@gentoo.org> arch/amd64.py,
   arch/mips.py:
@@ -180,11 +187,11 @@
   before it has been defined.
 
   07 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> arch/powerpc.py:
-  Reorder arch/powerpc.py to make python happy
+  Reorder arch/powerpc.py to make python happy.
 
   07 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   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 <wolf31o2@gentoo.org> 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
-  <jsbronder@gentoo.org> in bug #208106
+  <jsbronder@gentoo.org> in bug #208106.
 
   06 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   modules/netboot2_target.py:
@@ -244,7 +251,7 @@
 
   03 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   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 <wolf31o2@gentoo.org>
   examples/generic_stage_template.spec, examples/grp_template.spec,
@@ -268,7 +275,7 @@
 
   02 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   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 <wolf31o2@gentoo.org>
   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 <agaffney@gentoo.org> arch/mips.py:
   Apply patch for MIPS N32 support from Stuart Longland <redhatter@gentoo.org>
@@ -336,7 +343,7 @@
 
   11 Nov 2007; Andrew Gaffney <agaffney@gentoo.org>
   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 <agaffney@gentoo.org>
   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 <agaffney@gentoo.org> 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 <agaffney@gentoo.org>
   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 <agaffney@gentoo.org>
   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 <agaffney@gentoo.org>
   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 <wolf31o2@gentoo.org> catalyst:
   This is catalyst 2.0.5_pre3 for testing the new stages code.
@@ -420,7 +428,8 @@
   22 Aug 2007; Andrew Gaffney <agaffney@gentoo.org>
   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 <agaffney@gentoo.org> 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 71bda10cca04fefde6a94171d4774ae0cfaf89a6..b73e96a8671456c672f898eed7ea3ca62ffa86fc 100755 (executable)
--- 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 9a0ea7071a3bbb94bcea3b3d7683c97781f43593..fb281125ef478daabcd29375b221fc0cbfc7eb20 100755 (executable)
--- 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