diff --git a/debian/changelog b/debian/changelog index 86270797..a94472fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.65.2) UNRELEASED; urgency=low + + * live-build/auto/build: If they exist, link *.efi.signed versions of the + kernel to binary/$INITFS/kernel-$FLAVOUR.efi.signed (LP: #1075181). + + -- Colin Watson Wed, 21 Nov 2012 21:02:12 +0000 + livecd-rootfs (2.65.1) precise-proposed; urgency=low * live-build/auto/config: Emit sources.list entries for -proposed if the diff --git a/live-build/auto/build b/live-build/auto/build index e6c98121..f786acf9 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -311,7 +311,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) | 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 @@ -326,6 +326,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do exit 1 fi ln "binary/$INITFS/"vmlinu?-"$KVERS" "$PREFIX.kernel-$FLAVOUR" + if [ -e "binary/$INITFS/"vmlinu?-"$KVERS.efi.signed" ]; then + ln "binary/$INITFS/"vmlinu?-"$KVERS.efi.signed" "$PREFIX.kernel-$FLAVOUR.efi.signed" + fi chmod 644 "$PREFIX.kernel-$FLAVOUR" if [ -e "binary/$INITFS/initrd.img-$KVERS" ]; then ln "binary/$INITFS/initrd.img-$KVERS" "$PREFIX.initrd-$FLAVOUR"