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 9B934138A1F for ; Fri, 18 Apr 2014 16:52:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7F1BE0B07; 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 14DE6E0AFF for ; Fri, 18 Apr 2014 16:52:29 +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 4DA1634039B 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 CC7BC181AA 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.9f6593588d095729fc54829fa8dce74633e4ed8d.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: 9f6593588d095729fc54829fa8dce74633e4ed8d 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: 05f53428-505b-44c7-9380-9d4022657fef X-Archives-Hash: 45b88d388cc827e94308b638a67fed34 commit: 9f6593588d095729fc54829fa8dce74633e4ed8d Author: Guy Martin gentoo org> AuthorDate: Wed Feb 5 10:40:05 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=9f659358 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 b76b5c4..d9e2620 100755 --- 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}