| 1 |
Author: agaffney |
| 2 |
Date: 2008-03-10 17:24:48 +0000 (Mon, 10 Mar 2008) |
| 3 |
New Revision: 613 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/gen_cmdline.sh |
| 8 |
trunk/gen_determineargs.sh |
| 9 |
trunk/gen_initramfs.sh |
| 10 |
trunk/genkernel.conf |
| 11 |
Log: |
| 12 |
Add support for --firmware-files option to make robbat2 happy |
| 13 |
|
| 14 |
Modified: trunk/ChangeLog |
| 15 |
=================================================================== |
| 16 |
--- trunk/ChangeLog 2008-03-10 00:38:49 UTC (rev 612) |
| 17 |
+++ trunk/ChangeLog 2008-03-10 17:24:48 UTC (rev 613) |
| 18 |
@@ -4,6 +4,10 @@ |
| 19 |
|
| 20 |
10 Mar 2008; Andrew Gaffney <agaffney@g.o> gen_cmdline.sh, |
| 21 |
gen_determineargs.sh, gen_initramfs.sh, genkernel.conf: |
| 22 |
+ Add support for --firmware-files option to make robbat2 happy |
| 23 |
+ |
| 24 |
+ 10 Mar 2008; Andrew Gaffney <agaffney@g.o> gen_cmdline.sh, |
| 25 |
+ gen_determineargs.sh, gen_initramfs.sh, genkernel.conf: |
| 26 |
Add support for --firmware and --firmware-dir options to include firmware in |
| 27 |
the initramfs |
| 28 |
|
| 29 |
|
| 30 |
Modified: trunk/gen_cmdline.sh |
| 31 |
=================================================================== |
| 32 |
--- trunk/gen_cmdline.sh 2008-03-10 00:38:49 UTC (rev 612) |
| 33 |
+++ trunk/gen_cmdline.sh 2008-03-10 17:24:48 UTC (rev 613) |
| 34 |
@@ -122,6 +122,10 @@ |
| 35 |
echo " --firmware-dir=<dir>" |
| 36 |
echo " Specify directory to copy firmware from (defaults" |
| 37 |
echo " to /lib/firmware)" |
| 38 |
+ echo " --firmware-files=<files>" |
| 39 |
+ echo " Specifies specific firmware files to copy. This" |
| 40 |
+ echo " overrides --firmware-dir. For multiple files," |
| 41 |
+ echo " separate the filenames with a comma" |
| 42 |
} |
| 43 |
|
| 44 |
usage() { |
| 45 |
@@ -490,6 +494,11 @@ |
| 46 |
CMD_FIRMWARE=1 |
| 47 |
print_info 2 "CMD_FIRMWARE_DIR: ${CMD_FIRMWARE_DIR}" |
| 48 |
;; |
| 49 |
+ --firmware-files=*) |
| 50 |
+ CMD_FIRMWARE_FILES=`parse_opt "$*"` |
| 51 |
+ CMD_FIRMWARE=1 |
| 52 |
+ print_info 2 "CMD_FIRMWARE_FILES: ${CMD_FIRMWARE_FILES}" |
| 53 |
+ ;; |
| 54 |
all) |
| 55 |
BUILD_KERNEL=1 |
| 56 |
BUILD_MODULES=1 |
| 57 |
|
| 58 |
Modified: trunk/gen_determineargs.sh |
| 59 |
=================================================================== |
| 60 |
--- trunk/gen_determineargs.sh 2008-03-10 00:38:49 UTC (rev 612) |
| 61 |
+++ trunk/gen_determineargs.sh 2008-03-10 17:24:48 UTC (rev 613) |
| 62 |
@@ -116,6 +116,7 @@ |
| 63 |
set_config_with_override 1 MDADM CMD_MDADM |
| 64 |
set_config_with_override 1 FIRMWARE CMD_FIRMWARE |
| 65 |
set_config_with_override 2 FIRMWARE_DIR CMD_FIRMWARE_DIR "/lib/firmware" |
| 66 |
+ set_config_with_override 2 FIRMWARE_FILES CMD_FIRMWARE_FILES |
| 67 |
|
| 68 |
BOOTDIR=`arch_replace "${BOOTDIR}"` |
| 69 |
BOOTDIR=${BOOTDIR%/} # Remove any trailing slash |
| 70 |
|
| 71 |
Modified: trunk/gen_initramfs.sh |
| 72 |
=================================================================== |
| 73 |
--- trunk/gen_initramfs.sh 2008-03-10 00:38:49 UTC (rev 612) |
| 74 |
+++ trunk/gen_initramfs.sh 2008-03-10 17:24:48 UTC (rev 613) |
| 75 |
@@ -253,7 +253,7 @@ |
| 76 |
} |
| 77 |
|
| 78 |
append_firmware() { |
| 79 |
- if [ ! -d "${FIRMWARE_DIR}" ] |
| 80 |
+ if [ -z "${FIRMWARE_FILES}" -a ! -d "${FIRMWARE_DIR}" ] |
| 81 |
then |
| 82 |
gen_die "specified firmware directory (${FIRMWARE_DIR}) does not exist" |
| 83 |
fi |
| 84 |
@@ -262,7 +262,18 @@ |
| 85 |
rm -r "${TEMP}/initramfs-firmware-temp/" |
| 86 |
fi |
| 87 |
mkdir -p "${TEMP}/initramfs-firmware-temp/lib/firmware" |
| 88 |
- cp -a "${FIRMWARE_DIR}/*" ${TEMP}/initramfs-firmware-temp/lib/firmware/ |
| 89 |
+ if [ -n "${FIRMWARE_FILES}" ] |
| 90 |
+ then |
| 91 |
+ OLD_IFS=$IFS |
| 92 |
+ IFS="," |
| 93 |
+ for i in ${FIRMWARE_FILES} |
| 94 |
+ do |
| 95 |
+ cp -a "${i}" ${TEMP}/initramfs-firmware-temp/lib/firmware/ |
| 96 |
+ done |
| 97 |
+ IFS=$OLD_IFS |
| 98 |
+ else |
| 99 |
+ cp -a "${FIRMWARE_DIR}/*" ${TEMP}/initramfs-firmware-temp/lib/firmware/ |
| 100 |
+ fi |
| 101 |
find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ |
| 102 |
|| gen_die "appending firmware to cpio" |
| 103 |
rm -r "${TEMP}/initramfs-firmware-temp/" |
| 104 |
|
| 105 |
Modified: trunk/genkernel.conf |
| 106 |
=================================================================== |
| 107 |
--- trunk/genkernel.conf 2008-03-10 00:38:49 UTC (rev 612) |
| 108 |
+++ trunk/genkernel.conf 2008-03-10 17:24:48 UTC (rev 613) |
| 109 |
@@ -71,7 +71,10 @@ |
| 110 |
|
| 111 |
# Enable copying of firmware into initramfs |
| 112 |
# FIRMWARE="no" |
| 113 |
+# Specify directory to pull from |
| 114 |
# FIRMWARE_DIR="/lib/firmware" |
| 115 |
+# Specify specific firmware files to include. This overrides FIRMWARE_DIR |
| 116 |
+# FIRMWARE_FILES="" |
| 117 |
|
| 118 |
# =========Low Level Compile Settings========= |
| 119 |
# |
| 120 |
|
| 121 |
-- |
| 122 |
gentoo-commits@l.g.o mailing list |
Archives