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

Name the manifest the way ubuntu-cdimage expects it for subarchs

Browse Source
This commit is contained in:
Steve Langasek 2017-11-08 12:35:38 -08:00
parent e96fa8b878
commit 696ae6e1eb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
live-build/auto/build
View File

@ -15,6 +15,9 @@ if [ -z "${PROJECT:-}" ]; then
exit 1 exit 1
fi fi
# Link output files somewhere BuildLiveCD will be able to find them.
PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
# Use ubuntu-image instead of live-build # Use ubuntu-image instead of live-build
@ -33,7 +36,7 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
ubuntu-image -c edge $extra_args \ ubuntu-image -c edge $extra_args \
-o livecd."$PROJECT".img livecd."$PROJECT".model-assertion -o livecd."$PROJECT".img livecd."$PROJECT".model-assertion
xz -0 -T4 livecd."$PROJECT".img xz -0 -T4 livecd."$PROJECT".img
mv seed.manifest livecd."$PROJECT".manifest mv seed.manifest "PREFIX".manifest
exit 0 exit 0
fi fi
@ -456,9 +459,6 @@ else
exit 1 exit 1
fi fi
# Link output files somewhere BuildLiveCD will be able to find them.
PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
case $LB_INITRAMFS in case $LB_INITRAMFS in
casper) casper)
INITFS="casper" INITFS="casper"