From 394b1e11161e9779a7e0e0ae40fe64b64a75c4e4 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 21 Nov 2012 22:31:46 +0000 Subject: [PATCH] Import patches-unapplied version 2.103 to ubuntu/raring-proposed Imported using git-ubuntu import. Changelog parent: 164ac67eb48ebe22134caa8e2a5d5e43595287eb New changelog entries: * live-build/auto/build: Exclude all *.efi* files from kernel version detection (i.e. including *.efi.signature), not just *.efi.signed. --- debian/changelog | 7 +++++++ live-build/auto/build | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8b7aa5c1..75e8e720 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.103) raring; 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 Wed, 21 Nov 2012 22:31:46 +0000 + livecd-rootfs (2.102) raring; urgency=low * create the nexus7 rootfs image with .ext4 as suffix instead of using diff --git a/live-build/auto/build b/live-build/auto/build index 654b1c13..0abca601 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -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