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 475FF138A1F for ; Fri, 18 Apr 2014 16:52:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80EAFE0AFB; Fri, 18 Apr 2014 16:52:30 +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 0561EE0A9D for ; Fri, 18 Apr 2014 16:52:28 +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 33BAB34038E for ; Fri, 18 Apr 2014 16:52:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 7846B183D2 for ; Fri, 18 Apr 2014 16:52:25 +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: <1397839837.bc93b507122c7a9949b1349db44bee04b5c9f77b.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: bc93b507122c7a9949b1349db44bee04b5c9f77b X-VCS-Branch: 3.0 Date: Fri, 18 Apr 2014 16:52:25 +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: b8c4bb18-c349-4261-a1e2-8077da44e611 X-Archives-Hash: 21553889bc70433f89bfcfb7a2f36428 commit: bc93b507122c7a9949b1349db44bee04b5c9f77b Author: Guy Martin gentoo org> AuthorDate: Wed Feb 5 10:40:02 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Apr 18 16:50:37 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=bc93b507 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}