live-build/auto/build: Exclude all *.efi* files from kernel version

detection (i.e. including *.efi.signature), not just *.efi.signed.
This commit is contained in:
Colin Watson 2012-11-21 22:31:25 +00:00
parent 3282eaf6f0
commit c2d2c4d262
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.103) UNRELEASED; urgency=low
* live-build/auto/build: Exclude all *.efi* files from kernel version
detection (i.e. including *.efi.signature), not just *.efi.signed.
-- Colin Watson <cjwatson@ubuntu.com> Wed, 21 Nov 2012 22:29:13 +0000
livecd-rootfs (2.102) raring; urgency=low
* create the nexus7 rootfs image with .ext4 as suffix instead of using

View File

@ -320,7 +320,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
continue
fi
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | fgrep -v .efi.signed | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | fgrep -v .efi | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
if [ -z "$KVERS" ]; then
if [ -e "binary/$INITFS/vmlinuz" ]; then
# already renamed by ubuntu-defaults-image