Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-04 23:31:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.90 to ubuntu/quantal

Browse Source 
Imported using git-ubuntu import.

Changelog parent: c05b463ee14b6b765ce1a73f7373ae8908ec1d23

New changelog entries:
  * live-build/auto/build: If they exist, link *.efi.signed versions of the
    kernel to binary/$INITFS/kernel-$FLAVOUR rather than the unsigned
    versions.
This commit is contained in:
Colin Watson 2012-10-11 02:22:34 +01:00 committed by usd-importer
parent c05b463ee1
commit abf654a898
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.90) quantal; urgency=low
* live-build/auto/build: If they exist, link *.efi.signed versions of the
kernel to binary/$INITFS/kernel-$FLAVOUR rather than the unsigned
versions.
-- Colin Watson <cjwatson@ubuntu.com> Thu, 11 Oct 2012 02:22:34 +0100
livecd-rootfs (2.89) quantal; urgency=low livecd-rootfs (2.89) quantal; urgency=low
* fix lubuntu and xubuntu preinstalled handling so we end up with the * fix lubuntu and xubuntu preinstalled handling so we end up with the

6
live-build/auto/build
View File

@ -320,7 +320,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
continue continue
fi 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.signed | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
if [ -z "$KVERS" ]; then if [ -z "$KVERS" ]; then
if [ -e "binary/$INITFS/vmlinuz" ]; then if [ -e "binary/$INITFS/vmlinuz" ]; then
# already renamed by ubuntu-defaults-image # already renamed by ubuntu-defaults-image
@ -334,7 +334,11 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
echo "Cannot handle more than one kernel for $FLAVOUR ($KVERS)!" >&2 echo "Cannot handle more than one kernel for $FLAVOUR ($KVERS)!" >&2
exit 1 exit 1
fi fi
if [ -e "binary/$INITFS/"vmlinu?-"$KVERS.efi.signed" ]; then
ln "binary/$INITFS/"vmlinu?-"$KVERS.efi.signed" "$PREFIX.kernel-$FLAVOUR"
else
ln "binary/$INITFS/"vmlinu?-"$KVERS" "$PREFIX.kernel-$FLAVOUR" ln "binary/$INITFS/"vmlinu?-"$KVERS" "$PREFIX.kernel-$FLAVOUR"
fi
chmod 644 "$PREFIX.kernel-$FLAVOUR" chmod 644 "$PREFIX.kernel-$FLAVOUR"
if [ -e "binary/$INITFS/initrd.img-$KVERS" ]; then if [ -e "binary/$INITFS/initrd.img-$KVERS" ]; then
ln "binary/$INITFS/initrd.img-$KVERS" "$PREFIX.initrd-$FLAVOUR" ln "binary/$INITFS/initrd.img-$KVERS" "$PREFIX.initrd-$FLAVOUR"