From b4b036109bac76054e61eebe58f83bc35448451d Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Wed, 3 Apr 2013 19:46:57 +0400 Subject: [PATCH] Continous rebuild fixed. --- sbin/kernel-getlast.sh | 3 ++- sbin/kernel-rebuild.sh | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/kernel-getlast.sh b/sbin/kernel-getlast.sh index 225735d..9276dc9 100755 --- a/sbin/kernel-getlast.sh +++ b/sbin/kernel-getlast.sh @@ -54,7 +54,8 @@ kernel-clean.sh vmlinuz_file=/boot/`echo $new_kernel | sed 's~^linux~vmlinuz~'` [ "" == "$vmlinuz_file" ] && echo "vmlinuz_file == \"\"" && exit -1 -genkernel_file=/boot/`echo $new_kernel | sed 's~^linux~kernel-genkernel~'` +march=`uname -m` +genkernel_file=/boot/`echo $new_kernel | sed "s~^linux~kernel-genkernel-${march}~"` [ "" == "$genkernel_file" ] && echo "genkernel_file == \"\"" && exit -1 if [[ ! -f "$vmlinuz_file" && ! -f "$genkernel_file" || 1 -eq $FORCE_REBUILD ]]; then diff --git a/sbin/kernel-rebuild.sh b/sbin/kernel-rebuild.sh index 7dcfd9e..06818cb 100755 --- a/sbin/kernel-rebuild.sh +++ b/sbin/kernel-rebuild.sh @@ -100,8 +100,7 @@ fi [ -f /boot/grub/grub.conf ] && \ sed -i "s~\/boot\/vmlinuz-[0-9][^ ]*~\/boot\/vmlinuz-$REVISION~g; - s~\/boot\/kernel-genkernel-x86_64-[0-9][^]*~\/boot\/kernel-genkernel-x86_64-$REVISION~g; - s~\/boot\/kernel-genkernel-x86-[0-9][^]*~\/boot\/kernel-genkernel-x86-$REVISION~g; + s~\/boot\/kernel-genkernel-`uname -m`-[0-9][^]*~\/boot\/kernel-genkernel-`uname -m`-$REVISION~g; s~\/boot\/initramfs-[0-9][^ ]*~\/boot\/initramfs-$REVISION.img~g" \ /boot/grub/grub.conf