From d123ebed5ed4af9d70934fde09159a21419f70e9 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 7 Oct 2011 18:28:55 +0200 Subject: [PATCH] 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. --- BuildLiveCD | 3 +-- debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/BuildLiveCD b/BuildLiveCD index 39cb0884..0c95b67e 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -149,8 +149,7 @@ for STE in $SUITES; do fi COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build" 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} --components main,restricted,universe" + COMMAND="ubuntu-defaults-image --locale ${UBUNTU_DEFAULTS_LOCALE} --arch ${ARCH} --release ${STE}" else COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}" fi diff --git a/debian/changelog b/debian/changelog index 9611a5e3..cb05738e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 07 Oct 2011 18:28:12 +0200 + livecd-rootfs (2.42) oneiric; urgency=low * Explicitly select ubuquity frontend as well, to match the