Change into initramfs-firmware-temp/ instead of initramfs-firmware-temp/lib/firmware...

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

diff --git a/ChangeLog b/ChangeLog
index 2f3290eebce28c79c4633cc43a236f40ab759f00..6474f04bda33926160185f9df427b48d9746c1e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
+  Change into initramfs-firmware-temp/ instead of
+  initramfs-firmware-temp/lib/firmware/ before doing cpio
+
   12 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc,
   genkernel:
   Added a small debug statement to generic/linuxrc so we know when we're

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 761f0fad3b7fa48bc6fb70b7eb42b6ca1f0806a2..0cb7f809e653bcc3b6cec2e94ee97d84537c3f37 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -261,7 +261,7 @@ append_firmware() {
        then
                rm -r "${TEMP}/initramfs-firmware-temp/"
        fi
-       mkdir -p "${TEMP}/initramfs-firmware-temp/lib/firmware"
+       mkdir -p "${TEMP}/initramfs-firmware-temp"
        cd "${TEMP}/initramfs-firmware-temp/lib/firmware"
        if [ -n "${FIRMWARE_FILES}" ]
        then