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

Import patches-unapplied version 2.5 to ubuntu/oneiric

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 7af7abdcc099650e8d5311a4c7acb65e9d84d025

New changelog entries:
  * Pass correct IMAGEFORMAT through to live-build from BuildLiveCD.
  * Add Lubuntu support.
  * Set --chroot-filesystem option if IMAGEFORMAT is ext2 or ext3.
This commit is contained in:
Colin Watson 2011-06-15 14:40:05 +01:00 committed by usd-importer
parent 7af7abdcc0
commit d234b27412
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BuildLiveCD
View File

@ -36,7 +36,7 @@ LIVE_BUILD=false
while getopts :s:d:f:pa:l name; do case $name in while getopts :s:d:f:pa:l name; do case $name in
s) SUBARCH="$OPTARG";; s) SUBARCH="$OPTARG";;
d) NEWSUITE="$OPTARG";; d) NEWSUITE="$OPTARG";;
f) IMAGEFORMAT="-f$OPTARG";; f) IMAGEFORMAT="$OPTARG";;
p) PROPOSED="-p";; p) PROPOSED="-p";;
a) APT_SOURCE="-A $OPTARG";; a) APT_SOURCE="-A $OPTARG";;
l) LIVE_BUILD=:;; l) LIVE_BUILD=:;;
@ -143,7 +143,7 @@ for STE in $SUITES; do
fi fi
COMMAND="PROJECT=${FS} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build" COMMAND="PROJECT=${FS} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
else else
COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}" COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
fi fi
if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && $COMMAND" >> ${LOG} 2>&1; then if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && $COMMAND" >> ${LOG} 2>&1; then
rm -f ${PUBDIR}current rm -f ${PUBDIR}current

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.5) oneiric; urgency=low
* Pass correct IMAGEFORMAT through to live-build from BuildLiveCD.
* Add Lubuntu support.
* Set --chroot-filesystem option if IMAGEFORMAT is ext2 or ext3.
-- Colin Watson <cjwatson@ubuntu.com> Wed, 15 Jun 2011 14:40:05 +0100
livecd-rootfs (2.4) oneiric; urgency=low livecd-rootfs (2.4) oneiric; urgency=low
* Remove old config directory before creating a new configuration. * Remove old config directory before creating a new configuration.

8
live-build/auto/config
View File

@ -50,7 +50,7 @@ BINARY_REMOVE_LINUX=:
case $IMAGEFORMAT in case $IMAGEFORMAT in
ext2|ext3) ext2|ext3)
OPTS="${OPTS:+$OPTS }--initramfs none" OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
add_package live jasper add_package live jasper
;; ;;
@ -100,6 +100,12 @@ case $PROJECT in
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
;; ;;
lubuntu)
add_task install minimal standard lubuntu-desktop
add_task live lubuntu-live
COMPONENTS='main restricted universe multiverse'
;;
base) base)
add_task install minimal standard add_task install minimal standard
;; ;;