From 90df19ceaef510bb0058d1197f01785a0aa1536d Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Mon, 2 Feb 2015 05:40:00 -0700 Subject: [PATCH] Before trying to copy kernels around, cut -lts* off the end of FLAVOUR, since the actual files on disk are -generic, not -generic-lts-utopic. --- debian/changelog | 2 ++ live-build/auto/build | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index f784dae3..6701c8dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ livecd-rootfs (2.208.2) UNRELEASED; urgency=medium * Move from task-based installs to package-based installs, and switch to using the lts-utopic HWE kernel and X stack for all flavours. * Abstract the signed kernel image, so it's only defined in one spot. + * Before trying to copy kernels around, cut -lts* off the end of FLAVOUR, + since the actual files on disk are -generic, not -generic-lts-utopic. * Define HWE_X_PACKAGES required to install lts-utopic and use it. -- Adam Conrad Mon, 02 Feb 2015 01:43:48 -0700 diff --git a/live-build/auto/build b/live-build/auto/build index 8169d7a9..9b8a6659 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -328,6 +328,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then continue fi + FLAVOUR=${FLAVOUR%%-lts-*} KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )" if [ -z "$KVERS" ]; then if [ -e "binary/$INITFS/vmlinuz" ]; then