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

Import patches-unapplied version 2.6 to ubuntu/oneiric

Browse Source 
Imported using git-ubuntu import.

Changelog parent: d234b27412691883abe71388192ff9952500b593

New changelog entries:
  * '--initramfs none' produces *.packages* outputs rather than *.manifest*;
    handle this.
This commit is contained in:
Colin Watson 2011-06-16 12:59:09 +01:00 committed by usd-importer
parent d234b27412
commit d53a745359
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

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

10
live-build/auto/build
View File

@ -59,6 +59,16 @@ for OUTPUT in ext2 ext3 manifest manifest-remove size squashfs; do
chmod 644 "$PREFIX.$OUTPUT"
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
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
if [ -z "$KVERS" ]; then