[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     4a0499ea2a49536f13e9f1a40c6571ec86e3f707
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:40:02 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=4a0499ea

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 a0bc5f5..a9c9e53 100644
--- 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}