From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AE9D4138E20 for ; Wed, 19 Feb 2014 17:47:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA268E0B97; Wed, 19 Feb 2014 17:47:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05221E0B94 for ; Wed, 19 Feb 2014 17:47:51 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FF5133F8A8 for ; Wed, 19 Feb 2014 17:47:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 54829188CC for ; Wed, 19 Feb 2014 17:47:48 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1392831626.b3892c57e1fbfb6b7a4224631aeb5320dfcad822.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:3.0 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/bootloader-setup.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: b3892c57e1fbfb6b7a4224631aeb5320dfcad822 X-VCS-Branch: 3.0 Date: Wed, 19 Feb 2014 17:47:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9a3eb743-0db4-4732-a480-f5be7c54f972 X-Archives-Hash: fa1616bc878b9c3f4886650ef7717f24 commit: b3892c57e1fbfb6b7a4224631aeb5320dfcad822 Author: Guy Martin gentoo org> AuthorDate: Wed Feb 5 10:40:02 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Wed Feb 19 17:40:26 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=b3892c57 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}