Fixed device-mapper/man removal for bug #196087, fixed mdadm.conf copying, and fixed...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@550 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 11411d0deeaf131e82704c02bce1d1854d73e02c..c093ce427f04dac63a7efb4f30d705003bb9f309 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh,
+  gen_initramfs.sh, genkernel:
+  Fixed device-mapper/man removal for bug #196087, fixed mdadm.conf copying,
+  and fixed syntax error for bug #197582. This is genkernel-3.4.9_pre5.
+
   30 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   -pkg/suspend-0.5-Makefile.patch, -pkg/busybox-1.1.3+gentoo.tar.bz2,
   -pkg/devfsd-1.3.25-dietlibc.patch,

diff --git a/gen_compile.sh b/gen_compile.sh
index 3fbb34f977c7646d4dadc11f38c8178898c2c342..70a2c79821c9d4a016dc33bc788677cc364eb7cc 100644 (file)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -608,7 +608,7 @@ compile_device_mapper() {
                compile_generic 'install' utils
                print_info 1 '        >> Copying to cache...'
                cd "${TEMP}"
-               rm -r "${TEMP}/device-mapper/man" ||
+               rm -rf "${TEMP}/device-mapper/man" ||
                        gen_die 'Could not remove manual pages!'
                strip "${TEMP}/device-mapper/sbin/dmsetup" ||
                        gen_die 'Could not strip dmsetup binary!'

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index fe858d6742f61aac40928d1e0fb69009054fc50f..8790cd98c90e37333f74bb5132f7050e83495c91 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -235,8 +235,8 @@ append_mdadm(){
        mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/"
        if [ "${MDADM}" -eq '1' ]
        then
-               cp -a /etc/mdadm.conf "${TEMP}/initramfs-udev-temp/etc" \
-                       || gen_die "Could not copy mdadm.conf!"; }
+               cp -a /etc/mdadm.conf "${TEMP}/initramfs-mdadm-temp/etc" \
+                       || gen_die "Could not copy mdadm.conf!"
        fi
        cd "${TEMP}/initramfs-mdadm-temp/"
        find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"

diff --git a/genkernel b/genkernel
index 1641cc4ddc78475362f797ec4a70b6a55cc213ce..a9cc7cb8517b9c9d938c0e8879575e637dcbc8d9 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.4.9_pre4'
+GK_V='3.4.9_pre5'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.
@@ -27,9 +27,8 @@ parse_opt() {
 case "$*" in
        --config=*)
                CMD_GK_CONFIG=`parse_opt "$*"`
-               ;;
-       esac
-}
+       ;;
+esac
 
 source ${CMD_GK_CONFIG:-/etc/genkernel.conf} || small_die "Could not read /etc/genkernel.conf"