mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-06-09 09:02:11 +00:00
Add a -u option to BuildLiveCD which calls ubuntu-defaults-image.
This commit is contained in:
parent
bc091c8edf
commit
8d908a16d9
@ -33,8 +33,9 @@ SUITES=""
|
|||||||
PROPOSED=""
|
PROPOSED=""
|
||||||
IMAGEFORMAT=""
|
IMAGEFORMAT=""
|
||||||
LIVE_BUILD=false
|
LIVE_BUILD=false
|
||||||
|
UBUNTU_DEFAULTS_LOCALE=""
|
||||||
|
|
||||||
while getopts :s:r:d:f:pa:l name; do case $name in
|
while getopts :s:r:d:f:pa:lu: name; do case $name in
|
||||||
s) SUBARCH="$OPTARG";;
|
s) SUBARCH="$OPTARG";;
|
||||||
r) SUBPROJECT="$OPTARG";;
|
r) SUBPROJECT="$OPTARG";;
|
||||||
d) NEWSUITE="$OPTARG";;
|
d) NEWSUITE="$OPTARG";;
|
||||||
@ -42,6 +43,7 @@ while getopts :s:r:d:f:pa:l name; do case $name in
|
|||||||
p) PROPOSED="-p";;
|
p) PROPOSED="-p";;
|
||||||
a) APT_SOURCE="-A $OPTARG";;
|
a) APT_SOURCE="-A $OPTARG";;
|
||||||
l) LIVE_BUILD=:;;
|
l) LIVE_BUILD=:;;
|
||||||
|
u) UBUNTU_DEFAULTS_LOCALE="$OPTARG";;
|
||||||
esac; done;
|
esac; done;
|
||||||
shift $((OPTIND-1))
|
shift $((OPTIND-1))
|
||||||
|
|
||||||
@ -112,7 +114,7 @@ for STE in $SUITES; do
|
|||||||
if [ -d ~/build-${STE}-live/chroot-${STE} ]; then
|
if [ -d ~/build-${STE}-live/chroot-${STE} ]; then
|
||||||
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -qq update || true
|
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -qq update || true
|
||||||
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y dist-upgrade || true
|
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y dist-upgrade || true
|
||||||
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs || true
|
sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs ubuntu-defaults-builder || true
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
for STE in $SUITES; do
|
for STE in $SUITES; do
|
||||||
@ -145,6 +147,9 @@ for STE in $SUITES; do
|
|||||||
exit 1
|
exit 1
|
||||||
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
|
||||||
|
# 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"
|
||||||
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
|
||||||
|
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -3,6 +3,7 @@ livecd-rootfs (2.31) UNRELEASED; urgency=low
|
|||||||
* Link binary.iso or binary-hybrid.iso, if found, into the output
|
* Link binary.iso or binary-hybrid.iso, if found, into the output
|
||||||
directory for use by BuildLiveCD.
|
directory for use by BuildLiveCD.
|
||||||
* Tolerate ubuntu-defaults-image's kernel renaming.
|
* Tolerate ubuntu-defaults-image's kernel renaming.
|
||||||
|
* Add a -u option to BuildLiveCD which calls ubuntu-defaults-image.
|
||||||
|
|
||||||
-- Colin Watson <cjwatson@ubuntu.com> Tue, 23 Aug 2011 18:28:02 +0100
|
-- Colin Watson <cjwatson@ubuntu.com> Tue, 23 Aug 2011 18:28:02 +0100
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user