Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-12 20:01:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Before trying to copy kernels around, cut -lts* off the end of FLAVOUR,

Browse Source 
since the actual files on disk are -generic, not -generic-lts-utopic.
This commit is contained in:
Adam Conrad 2015-02-02 05:40:00 -07:00
parent 3528438c85
commit 90df19ceae
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -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 <adconrad@ubuntu.com> Mon, 02 Feb 2015 01:43:48 -0700

1
live-build/auto/build
View File

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