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

Import patches-unapplied version 0.58 to ubuntu/intrepid

Browse Source 
Imported using git-ubuntu import.

Changelog parent: f23f76577d96a6a484222c8dab5e9c8bdab9b78f

New changelog entries:
  * Fix up BuildLiveCD to only pass -a$ARCH when building for intrepid,
    and to disallow multi-suite builds (does anyone use it for this) of
    suites >= intrepid and <= hardy in the same invocation.
This commit is contained in:
Adam Conrad 2008-05-02 15:44:17 -06:00 committed by usd-importer
parent f23f76577d
commit 61a11da916
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
BuildLiveCD
View File

@ -54,6 +54,23 @@ done
if [ -z "$SUITES" ]; then if [ -z "$SUITES" ]; then
echo "No valid suites to build for" >&2 && exit 1 echo "No valid suites to build for" >&2 && exit 1
fi fi
for s in $SUITES; do
case $s in
dapper|edgy|feisty|gutsy|hardy)
ARCHARG=""
old_suite="yes"
;;
*)
ARCHARG="-a$ARCH"
new_suite="yes"
;;
esac
done
if [ "$new_suite" = "yes" ] && [ "$old_suite" = "yes" ]; then
echo "Can't build images for suites older than intrepid and suites" >&2
echo "greater than hardy at the same time, please use two invocations" >&2
exit 1
fi
if (( $# == 0 )) || [ "X$1" = "Xall" ]; then if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu base set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu base
if [ "$ARCH" = "i386" ]; then if [ "$ARCH" = "i386" ]; then
@ -111,7 +128,7 @@ for STE in $SUITES; do
rm -f ${PUBDIR}latest rm -f ${PUBDIR}latest
ln -sf ${PUBDIR}${NOW} ${PUBDIR}latest ln -sf ${PUBDIR}${NOW} ${PUBDIR}latest
mkdir -p ${PUBDIR}${NOW} mkdir -p ${PUBDIR}${NOW}
if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && /usr/sbin/livecd.sh ${SUBARCHARG} ${PROPOSED} -d${STE} -a${ARCH} $arg" > ${LOG} 2>&1; then if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && /usr/sbin/livecd.sh ${SUBARCHARG} ${PROPOSED} -d${STE} ${ARCHARG} $arg" > ${LOG} 2>&1; then
rm -f ${PUBDIR}current rm -f ${PUBDIR}current
ln -sf ${NOW} ${PUBDIR}current ln -sf ${NOW} ${PUBDIR}current

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (0.58) intrepid; urgency=low
* Fix up BuildLiveCD to only pass -a$ARCH when building for intrepid,
and to disallow multi-suite builds (does anyone use it for this) of
suites >= intrepid and <= hardy in the same invocation.
-- Adam Conrad <adconrad@ubuntu.com> Fri, 02 May 2008 15:44:17 -0600
livecd-rootfs (0.57) intrepid; urgency=low livecd-rootfs (0.57) intrepid; urgency=low
* Allow the user to specify the ARCH on the livecd.sh command line, * Allow the user to specify the ARCH on the livecd.sh command line,