Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-22 10:51:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Anchor regex to avoid misdetecting vmlinux-3.0-0-powerpc64-smp as a

Browse Source 
powerpc flavour kernel.
This commit is contained in:
Colin Watson 2011-06-14 09:09:06 +01:00
parent 5b53e147aa
commit e9cd756c36
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -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 <cjwatson@ubuntu.com> Tue, 14 Jun 2011 08:58:02 +0100

2
live-build/auto/build
View File

@ -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