Skip to contentSkip to conversation

add ia64 support to rpm Makefile target

PATCH In review Greg Edwards 2 participants 3 messages Jul 29, 2004 – Jul 30, 2004

lore
Share & tools
lore

Greg Edwards

author
#0 lore raw

PATCH 1/1 add ia64 support to rpm Makefile target

On ia64, only the EFI (fat) partition is available to boot from. The rpm needs to install the kernel under /boot/efi to be useable on ia64.

Signed-off-by Greg Edwards <[email protected]>

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2004/07/29 13:00:54-05:00 [email protected]
# Add ia64 support to the rpm Makefile target.
#

# scripts/package/mkspec
#   2004/07/29 13:00:41-05:00 [email protected] +13 -2
#   On ia64, only the EFI (fat) partition is available to boot from.  The
#   rpm needs to install the kernel under /boot/efi to be useable on ia64.
# 
diff -Nru a/scripts/package/mkspec b/scripts/package/mkspec
--- a/scripts/package/mkspec	2004-07-29 13:04:34 -05:00
+++ b/scripts/package/mkspec	2004-07-29 13:04:34 -05:00
@@ -43,10 +43,21 @@
 echo "make clean && make"
 echo ""
 echo "%install"
-echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'
+
+if [[ "$ARCH" != "ia64" ]]; then
+	echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'
+else
+	echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'
+fi

echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make modules_install'
-echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" +
+if [[ "$ARCH" != "ia64" ]]; then
+ echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
+else
+ echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
+ echo 'ln -s '"efi/vmlinuz-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" '$RPM_BUILD_ROOT'"/boot/"
+fi

echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"

#1 lore raw
Quoted 4 lines · Greg Edwards

diff -Nru a/scripts/package/mkspec b/scripts/package/mkspec

scripts/package/mkspec line 51

Quoted 10 lines
scripts/package/mkspec +6 -1
@@ -43,10 +43,21 @@
 echo "make clean && make"
 echo ""
 echo "%install"
-echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'
+
+if [[ "$ARCH" != "ia64" ]]; then
+	echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'
+else
+	echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'
+fi

How about using %ifarch ia64 in the generated spec file?

Andreas.

Signature · 4 lines
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
author
#2 lore raw

On Fri, Jul 30, 2004 at 01:52:01AM +0200, Andreas Schwab wrote:
|
| How about using %ifarch ia64 in the generated spec file?

Yeah, I think I like that better, too. New patch attached below.

Greg

Signed-off-by Greg Edwards <[email protected]>

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2004/07/29 13:00:54-05:00 [email protected]
# Add ia64 support to the rpm Makefile target.
#

# scripts/package/mkspec
#   2004/07/29 13:00:41-05:00 [email protected] +13 -2
#   On ia64, only the EFI (fat) partition is available to boot from.  The
#   rpm needs to install the kernel under /boot/efi to be useable on ia64.
# 
# mkspec |    9 +++++++++
# 1 files changed, 9 insertions(+)
#
Index: work-26x-bk/scripts/package/mkspec
===================================================================
--- work-26x-bk.orig/scripts/package/mkspec	2004-07-29 15:40:16.000000000 -0500
+++ work-26x-bk/scripts/package/mkspec	2004-07-30 09:44:51.000000000 -0500
@@ -43,10 +43,19 @@ echo "%build"
 echo "make clean && make"
 echo ""
 echo "%install"
+echo "%ifarch ia64"
+echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'
+echo "%else"
 echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules'
+echo "%endif"

echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make modules_install'
+echo "%ifarch ia64"
+echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" +echo 'ln -s '"efi/vmlinuz-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" '$RPM_BUILD_ROOT'"/boot/" +echo "%else"
echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
+echo "%endif"

echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"