'--initramfs none' produces *.packages* outputs rather than *.manifest*;

handle this.
ubuntu/precise
Colin Watson 14 years ago
parent eb6b328a41
commit ed52d04be5

7
debian/changelog vendored

@ -1,3 +1,10 @@
livecd-rootfs (2.6) UNRELEASED; urgency=low
* '--initramfs none' produces *.packages* outputs rather than *.manifest*;
handle this.
-- Colin Watson <cjwatson@ubuntu.com> Thu, 16 Jun 2011 12:48:38 +0100
livecd-rootfs (2.5) oneiric; urgency=low livecd-rootfs (2.5) oneiric; urgency=low
* Pass correct IMAGEFORMAT through to live-build from BuildLiveCD. * Pass correct IMAGEFORMAT through to live-build from BuildLiveCD.

@ -59,6 +59,16 @@ for OUTPUT in ext2 ext3 manifest manifest-remove size squashfs; do
chmod 644 "$PREFIX.$OUTPUT" chmod 644 "$PREFIX.$OUTPUT"
done done
# '--initramfs none' produces different manifest names.
if [ -e "binary/$INITFS/filesystem.packages" ]; then
ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest"
chmod 644 "$PREFIX.manifest"
fi
if [ -e "binary/$INITFS/filesystem.packages-remove" ]; then
ln "binary/$INITFS/filesystem.packages-remove" "$PREFIX.manifest-remove"
chmod 644 "$PREFIX.manifest-remove"
fi
for FLAVOUR in $LB_LINUX_FLAVOURS; do for FLAVOUR in $LB_LINUX_FLAVOURS; do
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

Loading…
Cancel
Save