Gentoo Archives: gentoo-catalyst

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