summaryrefslogtreecommitdiffstats
path: root/scripts/mk-images
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/mk-images')
-rwxr-xr-xscripts/mk-images13
1 files changed, 9 insertions, 4 deletions
diff --git a/scripts/mk-images b/scripts/mk-images
index fa1629166..8cdc7221a 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -312,11 +312,11 @@ makemoduletree() {
done
# clean up leftover cruft
- find $MMB_DIR/lib/modules -type d -exec rmdir -f {} \; 2>/dev/null
+ find -H $MMB_DIR/lib/modules -type d -exec rmdir -f {} \; 2>/dev/null
$MODLIST --modinfo-file $MODINFO --ignore-missing --modinfo \
$MMB_MODULESET > $MMB_DIR/lib/modules/module-info
# compress modules
- find $MMB_DIR/lib/modules -type f -name *.ko -exec gzip -9 {} \;
+ find -H $MMB_DIR/lib/modules -type f -name *.ko -exec gzip -9 {} \;
rundepmod $MMB_DIR
rm -f $MMB_DIR/lib/modules/*/modules.*map
rm -f $MMB_DIR/lib/modules/*/{build,source}
@@ -786,8 +786,13 @@ for KERNELARCH in $arches; do
if [ "${kernelvers}" = "kernel-xen" ]; then kerneltag="xen" ; fi
- vmlinuz=$(rpm --nodigest --nosignature -qpl $kpackage |grep ^/boot/vmlinuz | head -n 1)
- version=${vmlinuz##/boot/vmlinuz-}
+ if [ "$BUILDARCH" = "ia64" ]; then
+ vmlinuz=$(rpm --nodigest --nosignature -qpl $kpackage |grep ^/boot/efi/EFI/redhat/vmlinuz | head -n 1)
+ version=${vmlinuz##/boot/efi/EFI/redhat/vmlinuz-}
+ else
+ vmlinuz=$(rpm --nodigest --nosignature -qpl $kpackage |grep ^/boot/vmlinuz | head -n 1)
+ version=${vmlinuz##/boot/vmlinuz-}
+ fi
arch=$(rpm --nodigest --nosignature --qf '%{ARCH}\n' -qp $kpackage)
rpm2cpio $kpackage | (cd $KERNELROOT; cpio --quiet -iumd)