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

BuildLiveCD: Stop building ubuntu-defaults-image images with universe.

Browse Source 
ubuntu-defaults-zh-cn is in main now, and it causes images to overflow
due to the extra /var/lib/apt/lists indexes.
This commit is contained in:
Martin Pitt 2011-10-07 18:28:55 +02:00
parent 6342ac0768
commit d123ebed5e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BuildLiveCD
View File

@ -149,8 +149,7 @@ for STE in $SUITES; do
fi fi
COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build" COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
elif [ "$UBUNTU_DEFAULTS_LOCALE" ]; then elif [ "$UBUNTU_DEFAULTS_LOCALE" ]; then
# universe enabled until ubuntu-defaults-zh-cn is moved to main COMMAND="ubuntu-defaults-image --locale ${UBUNTU_DEFAULTS_LOCALE} --arch ${ARCH} --release ${STE}"
COMMAND="ubuntu-defaults-image --locale ${UBUNTU_DEFAULTS_LOCALE} --arch ${ARCH} --release ${STE} --components main,restricted,universe"
else else
COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}" COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
fi fi

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.43) UNRELEASED; urgency=low
* BuildLiveCD: Stop building ubuntu-defaults-image images with universe.
ubuntu-defaults-zh-cn is in main now, and it causes images to overflow
due to the extra /var/lib/apt/lists indexes.
-- Martin Pitt <martin.pitt@ubuntu.com> Fri, 07 Oct 2011 18:28:12 +0200
livecd-rootfs (2.42) oneiric; urgency=low livecd-rootfs (2.42) oneiric; urgency=low
* Explicitly select ubuquity frontend as well, to match the * Explicitly select ubuquity frontend as well, to match the