From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-801732-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 89574138CD0
for <garchives@archives.gentoo.org>; Thu, 21 May 2015 23:53:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B7E1BE091F;
Thu, 21 May 2015 23:53:40 +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 374A9E0921
for <gentoo-commits@lists.gentoo.org>; Thu, 21 May 2015 23:53:35 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 8AD6934101C
for <gentoo-commits@lists.gentoo.org>; Thu, 21 May 2015 23:53:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D9D4BA05
for <gentoo-commits@lists.gentoo.org>; Thu, 21 May 2015 23:53:30 +0000 (UTC)
From: "Brian Dolbec" <dolsen@gentoo.org>
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" <dolsen@gentoo.org>
Message-ID: <1425002584.61c2dff4545ebf5dac0099e9c598cb2ab2f352b3.dolsen@gentoo>
Subject: [gentoo-commits] proj/catalyst:pending 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: dolsen
X-VCS-Committer-Name: Brian Dolbec
X-VCS-Revision: 61c2dff4545ebf5dac0099e9c598cb2ab2f352b3
X-VCS-Branch: pending
Date: Thu, 21 May 2015 23:53:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 04cbd3d3-48a1-4a20-9533-2b0ae285774c
X-Archives-Hash: 8ef3375757a8df3f4faf24558e0e2685
Message-ID: <20150521235330.IqSTYyPNXBYauaEhGQqm1m4Hiap5fx6BP5vo88fTfEw@z>
commit: 61c2dff4545ebf5dac0099e9c598cb2ab2f352b3
Author: Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 5 10:40:05 2014 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:04 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=61c2dff4
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}