From e9cd756c36d316cce62e0a6fb9474f56bb6413e4 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 14 Jun 2011 09:09:06 +0100 Subject: [PATCH] Anchor regex to avoid misdetecting vmlinux-3.0-0-powerpc64-smp as a powerpc flavour kernel. --- debian/changelog | 2 ++ live-build/auto/build | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ee24332e..a3b80cd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ livecd-rootfs (2.3) UNRELEASED; urgency=low * Set pipefail (bash-specific) in auto/build so that we fail immediately if the main image build fails. + * Anchor regex to avoid misdetecting vmlinux-3.0-0-powerpc64-smp as a + powerpc flavour kernel. -- Colin Watson Tue, 14 Jun 2011 08:58:02 +0100 diff --git a/live-build/auto/build b/live-build/auto/build index c597f377..6feb894b 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -60,7 +60,7 @@ for OUTPUT in ext2 ext3 manifest manifest-remove size squashfs; do done for FLAVOUR in $LB_LINUX_FLAVOURS; do - KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)/\\1/p" )" + KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )" if [ -z "$KVERS" ]; then echo "No kernel output for $FLAVOUR!" >&2 exit 1