@@ -59,6 +59,38 @@ echo "header files define structures and constants that are needed for"
echo "building most standard programs and are also needed for rebuilding the"
echo "glibc package."
echo ""
+echo "%define boot boot"
+echo "%ifarch %{all_x86}"
+echo "%define kbuild_image arch/x86/boot/bzImage"
+echo "%endif"
+echo "%ifarch x86_64"
+echo "%define kbuild_image arch/x86/boot/bzImage"
+echo "%endif"
+echo "%ifarch ppc64"
+echo "%define kbuild_image vmlinux"
+echo "%endif"
+echo "%ifarch s390"
+echo "%define kbuild_image arch/s390/boot/image"
+echo "%endif"
+echo "%ifarch s390x"
+echo "%define kbuild_image arch/s390/boot/image"
+echo "%endif"
+echo "%ifarch sparc64"
+echo "%define kbuild_image arch/sparc/boot/image"
+echo "%endif"
+echo "%ifarch ppc"
+echo "%define kbuild_image vmlinux"
+echo "%endif"
+echo "%ifarch ia64"
+echo "%define boot boot/efi"
+echo "%define kbuild_image vmlinux.gz"
+echo "%endif"
+echo "%ifarch alpha alphaev56"
+echo "%define kbuild_image vmlinux"
+echo "%endif"
+echo "%ifarch %{arm}"
+echo "%define kbuild_image vmlinux"
+echo "%endif"
if ! $PREBUILT; then
echo "%prep"
@@ -74,26 +106,11 @@ echo ""
fi
echo "%install"
-echo "%ifarch ia64"
-echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib/modules'
+echo 'mkdir -p $RPM_BUILD_ROOT/%{boot} $RPM_BUILD_ROOT/lib/modules'
echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'
-echo "%else"
-echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'
-echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'
-echo "%endif"
echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= modules_install'
-echo "%ifarch ia64"
-echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
-echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
-echo "%else"
-echo "%ifarch ppc64"
-echo "cp vmlinux arch/powerpc/boot"
-echo "cp arch/powerpc/boot/"'$KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE"
-echo "%else"
-echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE"
-echo "%endif"
-echo "%endif"
+echo 'cp %{kbuild_image} $RPM_BUILD_ROOT'"/%{boot}/vmlinuz-$KERNELRELEASE"
echo 'make %{?_smp_mflags} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr KBUILD_SRC= headers_install'
echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$KERNELRELEASE"