From: Guy Martin <gmsoft@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: [gentoo-catalyst] [PATCH 07/11] Make use of _kernelopts for hppa.
Date: Wed, 5 Feb 2014 11:40:02 +0100 [thread overview]
Message-ID: <1391596806-14955-8-git-send-email-gmsoft@gentoo.org> (raw)
In-Reply-To: <1391596806-14955-1-git-send-email-gmsoft@gentoo.org>
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.
---
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..c56cc90 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}
--
1.8.3.2
next prev parent reply other threads:[~2014-02-05 10:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-05 10:39 [gentoo-catalyst] [PATCH 00/11] Livecd updates for catalyst 3.0 Guy Martin
2014-02-05 10:39 ` [gentoo-catalyst] [PATCH 01/11] update-modules doesn't exists anymore Guy Martin
2014-02-05 10:39 ` [gentoo-catalyst] [PATCH 02/11] depscan.sh " Guy Martin
2014-02-05 10:39 ` [gentoo-catalyst] [PATCH 03/11] /etc/conf.d/rc " Guy Martin
2014-02-05 10:39 ` [gentoo-catalyst] [PATCH 04/11] Fix merging kernel without kerncache enabled Guy Martin
2014-02-05 10:40 ` [gentoo-catalyst] [PATCH 05/11] Rename System.map in a way that it won't be matched if multiple kernel are used Guy Martin
2014-02-05 10:40 ` [gentoo-catalyst] [PATCH 06/11] Allow kernelopts as a valid value for kernels Guy Martin
2014-02-05 10:40 ` Guy Martin [this message]
2014-02-05 10:40 ` [gentoo-catalyst] [PATCH 08/11] Fix and improve kernel build when kerncache is enabled Guy Martin
2014-02-05 10:40 ` [gentoo-catalyst] [PATCH 09/11] Don't make cdtar mandatory Guy Martin
2014-02-05 10:40 ` [gentoo-catalyst] [PATCH 10/11] Use the system's iplboot to be sure it matches palo's version Guy Martin
2014-02-05 10:40 ` [gentoo-catalyst] [PATCH 11/11] Remove unused hppa cdtar Guy Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1391596806-14955-8-git-send-email-gmsoft@gentoo.org \
--to=gmsoft@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox