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 B26801391DB for ; Mon, 24 Mar 2014 16:08:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6538AE0AFD; Mon, 24 Mar 2014 16:08:06 +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 D35E2E0ACF for ; Mon, 24 Mar 2014 16:08:04 +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 E161E33FB4A for ; Mon, 24 Mar 2014 16:08:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id E4A57188FC for ; Mon, 24 Mar 2014 16:08:01 +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: <1395677228.dc712f84a63947636c97cd90fa55799da74767ef.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:2.X 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: dc712f84a63947636c97cd90fa55799da74767ef X-VCS-Branch: 2.X Date: Mon, 24 Mar 2014 16:08:01 +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: 91af0a60-5e02-4fef-b418-f4f7330cc758 X-Archives-Hash: 656ed35509ed1879b6e89c6419e43f04 commit: dc712f84a63947636c97cd90fa55799da74767ef Author: Guy Martin gentoo org> AuthorDate: Wed Feb 5 10:40:05 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Mon Mar 24 16:07:08 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=dc712f84 Use the system's iplboot to be sure it matches palo's version. For hppa, cdtar is a bad idea because the iplboot version in the tar file might not match palo's version. --- targets/support/bootloader-setup.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index a9c9e53..f3e0e62 100644 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -41,6 +41,8 @@ case ${clst_hostarch} in ;; hppa) # NO SOFTLEVEL SUPPORT YET + mkdir -p $1/boot + icfg=$1/boot/palo.conf kmsg=$1/boot/kernels.msg hmsg=$1/boot/help.msg @@ -54,6 +56,9 @@ case ${clst_hostarch} in my_kopts="${my_kopts} ${kopts}" done + # copy the bootloader for the final image + cp /usr/share/palo/iplboot $1/boot/ + 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}