Gentoo Archives: gentoo-catalyst

From: Guy Martin <gmsoft@g.o>
To: gentoo-catalyst@l.g.o
Subject: [gentoo-catalyst] [PATCH 07/11] Make use of _kernelopts for hppa.
Date: Wed, 05 Feb 2014 10:40:57
Message-Id: 1391596806-14955-8-git-send-email-gmsoft@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 00/11] Livecd updates for catalyst 3.0 by Guy Martin
1 Since hppa only support one command line for both 32 and 64bit kernel,
2 we merge both kernelopts in the same line.
3 This is useful for adding extra arguments like 'panic=30' directly in
4 the spec file.
5
6 ---
7 targets/support/bootloader-setup.sh | 9 ++++++++-
8 1 file changed, 8 insertions(+), 1 deletion(-)
9
10 diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
11 index 857ce6f..c56cc90 100755
12 --- a/targets/support/bootloader-setup.sh
13 +++ b/targets/support/bootloader-setup.sh
14 @@ -47,7 +47,14 @@ case ${clst_hostarch} in
15 # Make sure we strip the extension to the kernel to allow palo to choose
16 boot_kernel_common_name=${first/%32/}
17 boot_kernel_common_name=${boot_kernel_common_name/%64/}
18 - echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz root=/dev/ram0 init=/linuxrc cdroot ${cmdline_opts}" >> ${icfg}
19 +
20 + for x in ${clst_boot_kernel}
21 + do
22 + eval kopts=\$clst_boot_kernel_${x}_kernelopts
23 + my_kopts="${my_kopts} ${kopts}"
24 + done
25 +
26 + echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz ${default_append_line} ${my_kopts}" >> ${icfg}
27 echo "--bootloader=boot/iplboot" >> ${icfg}
28 echo "--ramdisk=boot/${first}.igz" >> ${icfg}
29 for x in ${clst_boot_kernel}
30 --
31 1.8.3.2