From 943ce2047b452a972d087d778c2a5488bac2ae71 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 1 Nov 2007 00:46:55 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@550 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 5 +++++ gen_compile.sh | 2 +- gen_initramfs.sh | 4 ++-- genkernel | 7 +++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11411d0..c093ce4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 01 Nov 2007; Chris Gianelloni 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 -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 3fbb34f..70a2c79 100644 --- 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 fe858d6..8790cd9 100644 --- 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 1641cc4..a9cc7cb 100755 --- 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" -- 2.26.2