[gentoo-commits] proj/catalyst:pending commit in: targets/support/

[Brian Dolbec]

commit:     d74ecf9effd6e5b3851ceccf3dadbef908260f2f
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:40:02 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d74ecf9e

Make use of _kernelopts for hppa.

Since hppa only support one command line for both 32 and 64bit kernel,
we merge both kernelopts in the same line.
This is useful for adding extra arguments like 'panic=30' directly in
the spec file.
Brian Dolbec: fix whitepace error.

 targets/support/bootloader-setup.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/targets/support/bootloader-setup.sh 
b/targets/support/bootloader-setup.sh
index 857ce6f..b76b5c4 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -47,7 +47,14 @@ case ${clst_hostarch} in
                # Make sure we strip the extension to the kernel to allow palo 
to choose
                boot_kernel_common_name=${first/%32/}
                boot_kernel_common_name=${boot_kernel_common_name/%64/}
-               echo "--commandline=0/${boot_kernel_common_name} 
initrd=${first}.igz root=/dev/ram0 init=/linuxrc cdroot ${cmdline_opts}" >> 
${icfg}
+
+               for x in ${clst_boot_kernel}
+               do
+                       eval kopts=\$clst_boot_kernel_${x}_kernelopts
+                       my_kopts="${my_kopts} ${kopts}"
+               done
+
+               echo "--commandline=0/${boot_kernel_common_name} 
initrd=${first}.igz ${default_append_line} ${my_kopts}" >> ${icfg}
                echo "--bootloader=boot/iplboot" >> ${icfg}
                echo "--ramdisk=boot/${first}.igz" >> ${icfg}
                for x in ${clst_boot_kernel}