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

Tolerate ubuntu-defaults-image's kernel renaming.

Browse Source
This commit is contained in:
Colin Watson 2011-08-23 18:34:47 +01:00
parent 87d6aa1876
commit bc091c8edf
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ livecd-rootfs (2.31) UNRELEASED; urgency=low
* Link binary.iso or binary-hybrid.iso, if found, into the output * Link binary.iso or binary-hybrid.iso, if found, into the output
directory for use by BuildLiveCD. directory for use by BuildLiveCD.
* Tolerate ubuntu-defaults-image's kernel renaming.
-- Colin Watson <cjwatson@ubuntu.com> Tue, 23 Aug 2011 18:28:02 +0100 -- Colin Watson <cjwatson@ubuntu.com> Tue, 23 Aug 2011 18:28:02 +0100

16
live-build/auto/build
View File

@ -148,6 +148,10 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
fi fi
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )" KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
if [ -z "$KVERS" ]; then if [ -z "$KVERS" ]; then
if [ -e "binary/$INITFS/vmlinuz" ]; then
# already renamed by ubuntu-defaults-image
break
fi
echo "No kernel output for $FLAVOUR!" >&2 echo "No kernel output for $FLAVOUR!" >&2
exit 1 exit 1
fi fi
@ -167,8 +171,16 @@ done
NUMFLAVOURS="$(set -- $LB_LINUX_FLAVOURS; echo $#)" NUMFLAVOURS="$(set -- $LB_LINUX_FLAVOURS; echo $#)"
if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
# only one kernel flavour # only one kernel flavour
ln -sf "$PREFIX.kernel-$LB_LINUX_FLAVOURS" "$PREFIX.kernel" if [ -e "binary/$INITFS/vmlinuz" ]; then
ln -sf "$PREFIX.initrd-$LB_LINUX_FLAVOURS" "$PREFIX.initrd" ln "binary/$INITFS/vmlinuz" "$PREFIX.kernel"
else
ln -sf "$PREFIX.kernel-$LB_LINUX_FLAVOURS" "$PREFIX.kernel"
fi
if [ -e "binary/$INITFS/initrd.lz" ]; then
ln "binary/$INITFS/initrd.lz" "$PREFIX.initrd"
else
ln -sf "$PREFIX.initrd-$LB_LINUX_FLAVOURS" "$PREFIX.initrd"
fi
fi fi
if [ "$SUBARCH" = "ac100" ]; then if [ "$SUBARCH" = "ac100" ]; then