From 882c311fe2a8c994e6f0f7677fa9ceef1c0be248 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Thu, 13 Mar 2008 14:33:31 +0000 Subject: [PATCH 01/17] Explicitly install language-support-en first for kubuntu-kde4 live, should stop apt wanting to install firefox for no good reason. --- debian/changelog | 8 ++++++++ livecd.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eaee130f..a24d1b30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (0.56) hardy; urgency=low + + * Explicitly install language-support-en first for kubuntu-kde4 + live, should stop apt wanting to install firefox for no good + reason. + + -- Jonathan Riddell Thu, 13 Mar 2008 14:32:14 +0000 + livecd-rootfs (0.55) hardy; urgency=low * All powerpc builds (including ps3) use the powerpc/powerpc64-smp kernels diff --git a/livecd.sh b/livecd.sh index 2db2b45e..b56bfed5 100755 --- a/livecd.sh +++ b/livecd.sh @@ -179,7 +179,7 @@ Flags: seen ;; kubuntu-kde4) LIST="$LIST minimal^ standard^ kubuntu-kde4-desktop^" - LIVELIST="kubuntu-kde4-live^ xresprobe laptop-detect casper lupin-casper" + LIVELIST="language-support-en kubuntu-kde4-live^ xresprobe laptop-detect casper lupin-casper" COMP="main restricted universe multiverse" ;; edubuntu|edubuntu-dvd) From 00d2e2782a3b5944f33d8277478667b5366b8490 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Fri, 2 May 2008 15:19:51 -0600 Subject: [PATCH 02/17] * Allow the user to specify the ARCH on the livecd.sh command line, overriding the use of the dpkg architecture for the livecd run. * Differentiate between ARCH (the local architecture) and TARGETARCH, so that builds of ubuntu-lpia continue to work on the i386 buildd. * Pass ARCH by default from BuildLiveCD to livecd.sh; this should be manually overridden on cross-arch buildds, instead of using dpkg. * Update default suite in BuildLiveCD to intrepid, gutsy's a bit old. --- BuildLiveCD | 4 ++-- debian/changelog | 12 ++++++++++++ livecd.sh | 36 ++++++++++++++---------------------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/BuildLiveCD b/BuildLiveCD index 4f5b61fa..0714c66b 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -27,7 +27,7 @@ fi ARCH=$(dpkg --print-installation-architecture) SUBARCH="" SUBARCHARG="" -DEFAULTSUITE="gutsy" +DEFAULTSUITE="intrepid" NEWSUITE="" SUITES="" PROPOSED="" @@ -111,7 +111,7 @@ for STE in $SUITES; do rm -f ${PUBDIR}latest ln -sf ${PUBDIR}${NOW} ${PUBDIR}latest mkdir -p ${PUBDIR}${NOW} - if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && /usr/sbin/livecd.sh ${SUBARCHARG} ${PROPOSED} -d${STE} $arg" > ${LOG} 2>&1; then + if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && /usr/sbin/livecd.sh ${SUBARCHARG} ${PROPOSED} -d${STE} -a${ARCH} $arg" > ${LOG} 2>&1; then rm -f ${PUBDIR}current ln -sf ${NOW} ${PUBDIR}current diff --git a/debian/changelog b/debian/changelog index a24d1b30..62a3edc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +livecd-rootfs (0.57) intrepid; urgency=low + + * Allow the user to specify the ARCH on the livecd.sh command line, + overriding the use of the dpkg architecture for the livecd run. + * Differentiate between ARCH (the local architecture) and TARGETARCH, + so that builds of ubuntu-lpia continue to work on the i386 buildd. + * Pass ARCH by default from BuildLiveCD to livecd.sh; this should be + manually overridden on cross-arch buildds, instead of using dpkg. + * Update default suite in BuildLiveCD to intrepid, gutsy's a bit old. + + -- Adam Conrad Fri, 02 May 2008 15:10:32 -0600 + livecd-rootfs (0.56) hardy; urgency=low * Explicitly install language-support-en first for kubuntu-kde4 diff --git a/livecd.sh b/livecd.sh index b56bfed5..3a17429d 100755 --- a/livecd.sh +++ b/livecd.sh @@ -70,29 +70,27 @@ OPTMIRROR= select_mirror () { case $ARCH in - i386|amd64|sparc) + i386|amd64) case $FS in ubuntu-lpia) USERMIRROR=http://ports.ubuntu.com/ubuntu-ports SECMIRROR=${USERMIRROR} SECSRCMIRROR=${SRCMIRROR} + TARGETARCH=lpia ;; *) USERMIRROR=http://archive.ubuntu.com/ubuntu SECMIRROR=http://security.ubuntu.com/ubuntu SECSRCMIRROR=${SECMIRROR} + TARGETARCH=${ARCH} ;; esac ;; - hppa) - USERMIRROR=http://ports.ubuntu.com/ubuntu-ports - SECMIRROR=${USERMIRROR} - SECSRCMIRROR=${SRCMIRROR} - ;; *) USERMIRROR=http://ports.ubuntu.com/ubuntu-ports SECMIRROR=${USERMIRROR} SECSRCMIRROR=${SRCMIRROR} + TARGETARCH=${ARCH} ;; esac case $(hostname --fqdn) in @@ -123,6 +121,7 @@ while getopts :d:e:i:I:m:S:s: name; do case $name in m) OPTMIRROR="$OPTARG";; S) USZ="$OPTARG";; s) SUBARCH="$OPTARG";; + a) ARCH="$OPTARG";; \?) echo bad usage >&2; exit 2;; \:) echo missing argument >&2; exit 2;; esac; done; @@ -131,7 +130,7 @@ shift $((OPTIND-1)) if (( $# == 0 )) || [ "X$1" = "Xall" ]; then set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu gobuntu base if [ "$ARCH" = "i386" ]; then - set -- ubuntu ubuntu-dvd ubuntu-lpia kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu gobuntu base + set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu gobuntu base fi fi @@ -231,11 +230,7 @@ Flags: seen esac dpkg -l livecd-rootfs || true # get our version # in the log. - if [ "$FS" != "ubuntu-lpia" ]; then - debootstrap --components=$(echo $COMP | sed 's/ /,/g') $STE $ROOT $MIRROR - else - debootstrap --components=$(echo $COMP | sed 's/ /,/g') --arch lpia $STE $ROOT $MIRROR - fi + debootstrap --components=$(echo $COMP | sed 's/ /,/g') --arch $TARGETARCH $STE $ROOT $MIRROR # Just make a few things go away, which lets us skip a few other things. DIVERTS="usr/sbin/mkinitrd usr/sbin/invoke-rc.d" @@ -257,8 +252,8 @@ for i in range(len(sys.argv)): trap "cleanup" 0 1 2 3 15 - case $ARCH in - alpha|amd64|i386|ia64|m68k|mips|mipsel) + case $TARGETARCH in + alpha|amd64|i386|ia64|lpia|m68k|mips|mipsel) link_in_boot=no ;; *) @@ -279,7 +274,7 @@ link_in_boot = $link_in_boot mkdir -p ${ROOT}proc mount -tproc none ${ROOT}proc - case $ARCH+$SUBARCH in + case $TARGETARCH+$SUBARCH in powerpc+ps3) mkdir -p ${ROOT}spu;; esac @@ -289,15 +284,12 @@ link_in_boot = $link_in_boot cp ${ROOT}etc/apt/trusted.gpg ${ROOT}etc/apt/trusted.gpg.$$ cat /etc/apt/trusted.gpg >> ${ROOT}etc/apt/trusted.gpg - case $ARCH in + case $TARGETARCH in amd64) LIST="$LIST linux-generic";; i386) - case $FS in - ubuntu-lpia) LIST="$LIST linux-lpia";; - *) LIST="$LIST linux-generic";; - esac;; # and the bastard stepchildren + lpia) LIST="$LIST linux-lpia";; ia64) LIST="$LIST linux-itanium linux-mckinley";; hppa) LIST="$LIST linux-hppa32 linux-hppa64";; powerpc) LIST="$LIST linux-powerpc linux-powerpc64-smp";; @@ -393,7 +385,7 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP} ln -s livecd.${FSS}.initrd-"${SUBARCH}" livecd.${FSS}.initrd ln -s livecd.${FSS}.kernel-"${SUBARCH}" livecd.${FSS}.kernel fi - case $ARCH+$SUBARCH in + case $TARGETARCH+$SUBARCH in powerpc+ps3) chroot ${ROOT} addgroup --system spu;; esac @@ -428,7 +420,7 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP} livefs_squash() { - squashsort="http://people.ubuntu.com/~tfheen/livesort/${FSS}.list.${ARCH}" + squashsort="http://people.ubuntu.com/~tfheen/livesort/${FSS}.list.${TARGETARCH}" if wget -O livecd.${FSS}.sort ${squashsort} > /dev/null 2>&1; then echo "Using the squashfs sort list from ${squashsort}." else From 3cb4f22949b01dd9aec660061c223d84be604074 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Fri, 2 May 2008 15:24:41 -0600 Subject: [PATCH 03/17] Fix getopts options, and give i386 its kernel back. --- livecd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livecd.sh b/livecd.sh index 3a17429d..4695f1ec 100755 --- a/livecd.sh +++ b/livecd.sh @@ -113,7 +113,7 @@ EXCLUDE="" LIST="" SUBARCH="" -while getopts :d:e:i:I:m:S:s: name; do case $name in +while getopts :d:e:i:I:m:S:s:a: name; do case $name in d) STE=$OPTARG;; e) EXCLUDE="$EXCLUDE $OPTARG";; i) LIST="$LIST $OPTARG";; @@ -286,7 +286,7 @@ link_in_boot = $link_in_boot case $TARGETARCH in amd64) LIST="$LIST linux-generic";; - i386) + i386) LIST="$LIST linux-generic";; # and the bastard stepchildren lpia) LIST="$LIST linux-lpia";; From af68a8201d94a991f7b9bb53495318ad3e08223c Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Fri, 2 May 2008 15:46:36 -0600 Subject: [PATCH 04/17] * 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. --- BuildLiveCD | 17 ++++++++++++++++- debian/changelog | 8 ++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/BuildLiveCD b/BuildLiveCD index 0714c66b..5ce6c76a 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -54,6 +54,21 @@ done if [ -z "$SUITES" ]; then echo "No valid suites to build for" >&2 && exit 1 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 set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu base if [ "$ARCH" = "i386" ]; then @@ -111,7 +126,7 @@ for STE in $SUITES; do rm -f ${PUBDIR}latest ln -sf ${PUBDIR}${NOW} ${PUBDIR}latest 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 ln -sf ${NOW} ${PUBDIR}current diff --git a/debian/changelog b/debian/changelog index 62a3edc7..4b9b544a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 02 May 2008 15:44:17 -0600 + livecd-rootfs (0.57) intrepid; urgency=low * Allow the user to specify the ARCH on the livecd.sh command line, From 7c96f6c978e259ec363e6c2978dec7946bbc89c0 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Fri, 2 May 2008 15:48:12 -0600 Subject: [PATCH 05/17] You didn't see the unterminated cases, and neither did I... --- BuildLiveCD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BuildLiveCD b/BuildLiveCD index 5ce6c76a..b58d7296 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -59,9 +59,11 @@ for s in $SUITES; do 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 From a7871085ed252d8c6b9327833fe50b6a1c9ac0f2 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 6 May 2008 11:58:42 +0100 Subject: [PATCH 06/17] Remove /boot/initrd.img-*.bak (LP: #64887). --- debian/changelog | 6 ++++++ livecd.sh | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4b9b544a..3480a8e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.59) UNRELEASED; urgency=low + + * Remove /boot/initrd.img-*.bak (LP: #64887). + + -- Colin Watson Tue, 06 May 2008 11:58:01 +0100 + livecd-rootfs (0.58) intrepid; urgency=low * Fix up BuildLiveCD to only pass -a$ARCH when building for intrepid, diff --git a/livecd.sh b/livecd.sh index 4695f1ec..794c7bbc 100755 --- a/livecd.sh +++ b/livecd.sh @@ -376,6 +376,7 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP} chroot ${ROOT} update-initramfs -k "${KVER}" -u # we mv the initramfs, so it's not wasting space on the livefs mv ${ROOT}/boot/initrd.img-"${KVER}" livecd.${FSS}.initrd-"${SUBARCH}" + rm -f ${ROOT}/boot/initrd.img-"${KVER}".bak cp ${ROOT}/boot/vmlinu?-"${KVER}" livecd.${FSS}.kernel-"${SUBARCH}" done NUMKVERS="$(set -- $KVERS; echo $#)" From f2b39e905d94231801d841d9c2bdad3bac2725a7 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Tue, 10 Jun 2008 13:20:23 -0600 Subject: [PATCH 07/17] * Resurrect the proposed option for livecd.sh/BuildLiveCD, so we can build test images that include packages from proposed. * Build with updates and security by default, which is a no-op on development releases (where these suites are empty), but a necessity for point-release image building. --- debian/changelog | 12 ++++++++++-- livecd.sh | 27 ++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3480a8e9..3cfd54f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,16 @@ -livecd-rootfs (0.59) UNRELEASED; urgency=low +livecd-rootfs (0.59) intrepid; urgency=low + [ Colin Watson ] * Remove /boot/initrd.img-*.bak (LP: #64887). - -- Colin Watson Tue, 06 May 2008 11:58:01 +0100 + [ Adam Conrad ] + * Resurrect the proposed option for livecd.sh/BuildLiveCD, so + we can build test images that include packages from proposed. + * Build with updates and security by default, which is a no-op + on development releases (where these suites are empty), but + a necessity for point-release image building. + + -- Adam Conrad Tue, 10 Jun 2008 13:16:17 -0600 livecd-rootfs (0.58) intrepid; urgency=low diff --git a/livecd.sh b/livecd.sh index 794c7bbc..ab71237b 100755 --- a/livecd.sh +++ b/livecd.sh @@ -112,8 +112,9 @@ STE=gutsy EXCLUDE="" LIST="" SUBARCH="" +PROPOSED="" -while getopts :d:e:i:I:m:S:s:a: name; do case $name in +while getopts :d:e:i:I:m:S:s:a:p name; do case $name in d) STE=$OPTARG;; e) EXCLUDE="$EXCLUDE $OPTARG";; i) LIST="$LIST $OPTARG";; @@ -122,6 +123,7 @@ while getopts :d:e:i:I:m:S:s:a: name; do case $name in S) USZ="$OPTARG";; s) SUBARCH="$OPTARG";; a) ARCH="$OPTARG";; + p) PROPOSED="yes";; \?) echo bad usage >&2; exit 2;; \:) echo missing argument >&2; exit 2;; esac; done; @@ -237,7 +239,7 @@ Flags: seen for file in $DIVERTS; do mkdir -p ${ROOT}${file%/*} chroot $ROOT dpkg-divert --add --local --divert /${file}.livecd --rename /${file} - cp /bin/true ${ROOT}$file + cp ${ROOT}/bin/true ${ROOT}$file done # /bin/true won't cut it for mkinitrd, need to have -o support. @@ -303,7 +305,13 @@ link_in_boot = $link_in_boot # Create a good sources.list, and finish the install echo deb $MIRROR $STE ${COMP} > ${ROOT}etc/apt/sources.list + echo deb $MIRROR ${STE}-security ${COMP} >> ${ROOT}etc/apt/sources.list + echo deb $MIRROR ${STE}-updates ${COMP} >> ${ROOT}etc/apt/sources.list + if [ "$PROPOSED" = "yes" ]; then + echo deb $MIRROR ${STE}-proposed ${COMP} >> ${ROOT}etc/apt/sources.list + fi chroot $ROOT apt-get update + chroot $ROOT apt-get -y --purge dist-upgrade livecd.${FSS}.manifest-desktop @@ -339,6 +347,14 @@ link_in_boot = $link_in_boot deb ${USERMIRROR} $STE ${COMP} deb-src ${SRCMIRROR} $STE ${COMP} +deb ${SECMIRROR} ${STE}-security ${COMP} +deb-src ${SECSRCMIRROR} ${STE}-security ${COMP} + +## Major bug fix updates produced after the final release of the +## distribution. +deb ${USERMIRROR} ${STE}-updates ${COMP} +deb-src ${USERMIRROR} ${STE}-updates ${COMP} + ## Uncomment the following two lines to add software from the 'universe' ## repository. ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu @@ -348,9 +364,10 @@ deb-src ${SRCMIRROR} $STE ${COMP} ## team. # deb ${USERMIRROR} $STE universe # deb-src ${SRCMIRROR} $STE universe - -deb ${SECMIRROR} ${STE}-security ${COMP} -deb-src ${SECSRCMIRROR} ${STE}-security ${COMP} +# deb ${USERMIRROR} ${STE}-updates universe +# deb-src ${USERMIRROR} ${STE}-updates universe +# deb ${USERMIRROR} ${STE}-security universe +# deb-src ${USERMIRROR} ${STE}-security universe @@EOF mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg From 991281149ffaba5e0636707a20cc33e8966975ba Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Tue, 10 Jun 2008 13:23:00 -0600 Subject: [PATCH 08/17] * Copy bin/true from the chroot, not from the real root, so image builds for i386/lpia work on amd64, as intended. --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3cfd54f9..5e697247 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ livecd-rootfs (0.59) intrepid; urgency=low * Build with updates and security by default, which is a no-op on development releases (where these suites are empty), but a necessity for point-release image building. + * Copy bin/true from the chroot, not from the real root, so + image builds for i386/lpia work on amd64, as intended. - -- Adam Conrad Tue, 10 Jun 2008 13:16:17 -0600 + -- Adam Conrad Tue, 10 Jun 2008 13:22:07 -0600 livecd-rootfs (0.58) intrepid; urgency=low From 5a03abc2f215336794d5b93b26bc8a42f67c16ca Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Tue, 10 Jun 2008 13:23:48 -0600 Subject: [PATCH 09/17] Grr, fix my email address in the changelog. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5e697247..26461435 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,7 @@ livecd-rootfs (0.59) intrepid; urgency=low * Copy bin/true from the chroot, not from the real root, so image builds for i386/lpia work on amd64, as intended. - -- Adam Conrad Tue, 10 Jun 2008 13:22:07 -0600 + -- Adam Conrad Tue, 10 Jun 2008 13:23:18 -0600 livecd-rootfs (0.58) intrepid; urgency=low From e7256f68409bbb5171f90521b90da8b2530febc2 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Wed, 11 Jun 2008 13:46:06 -0600 Subject: [PATCH 10/17] * Employ hideous hack to ensure that when we're building against updates/proposed, we only get one version of kernel headers. * Move the cleanup() call to the end of the script, so we still have proc mounted for coreutils when update-initramfs is run. * Mount dev/pts immediately after debootstrap, as dpkg has begun whining pretty loudly (and occasionally exiting) if it's gone. --- debian/changelog | 11 +++++++++++ livecd.sh | 27 ++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 26461435..05465ea8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +livecd-rootfs (0.60) intrepid; urgency=low + + * Employ hideous hack to ensure that when we're building against + updates/proposed, we only get one version of kernel headers. + * Move the cleanup() call to the end of the script, so we still + have proc mounted for coreutils when update-initramfs is run. + * Mount dev/pts immediately after debootstrap, as dpkg has begun + whining pretty loudly (and occasionally exiting) if it's gone. + + -- Adam Conrad Tue, 10 Jun 2008 17:20:10 -0600 + livecd-rootfs (0.59) intrepid; urgency=low [ Colin Watson ] diff --git a/livecd.sh b/livecd.sh index ab71237b..72eb56c3 100755 --- a/livecd.sh +++ b/livecd.sh @@ -234,6 +234,10 @@ Flags: seen dpkg -l livecd-rootfs || true # get our version # in the log. debootstrap --components=$(echo $COMP | sed 's/ /,/g') --arch $TARGETARCH $STE $ROOT $MIRROR + # Recent dpkg has started complaining pretty loudly if dev/pts isn't + # mounted, so let's get it mounted immediately after debootstrap: + mount -t devpts devpts-${STE}-${FSS}-livefs ${ROOT}dev/pts + # Just make a few things go away, which lets us skip a few other things. DIVERTS="usr/sbin/mkinitrd usr/sbin/invoke-rc.d" for file in $DIVERTS; do @@ -313,6 +317,24 @@ link_in_boot = $link_in_boot chroot $ROOT apt-get update chroot $ROOT apt-get -y --purge dist-upgrade livecd.${FSS}.manifest-headers + chroot ${ROOT} dpkg -l linux-headers-\* | grep ^i | awk '{print $2}' \ + > livecd.${FSS}.manifest-headers-full + HEADERPACKAGES=`cat livecd.${FSS}.manifest-headers-full` + HEADERMETA="" + for i in `comm -3 livecd.${FSS}.manifest-headers livecd.${FSS}.manifest-headers-full`; do + HEADERMETA="$HEADERMETA $i" + done + rm -f livecd.${FSS}.manifest-headers livecd.${FSS}.manifest-headers-full + chroot ${ROOT} apt-get -y --purge remove $HEADERPACKAGES livecd.${FSS}.manifest-desktop chroot $ROOT apt-get -y install $LIVELIST ${ROOT}etc/apt/sources.list deb ${USERMIRROR} $STE ${COMP} deb-src ${SRCMIRROR} $STE ${COMP} @@ -436,6 +457,10 @@ deb-src ${USERMIRROR} ${STE}-updates ${COMP} perl -i -nle 'print unless /^Package: language-(pack|support)/ .. /^$/;' \ ${ROOT}/var/lib/apt/extended_states + # And run the cleanup function dead last, to umount /proc after nothing + # else needs to be run in the chroot (umounting it earlier breaks rm): + cleanup + livefs_squash() { squashsort="http://people.ubuntu.com/~tfheen/livesort/${FSS}.list.${TARGETARCH}" From 69bb3ff1da0daa3f20b5adb3d3567b9b98e13b3f Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 20 Jun 2008 00:24:16 -0700 Subject: [PATCH 11/17] * Use apt pinning to force use of the version of ssl-cert from the hardy release pocket, not the one from -updates, so we avoid pulling in the very large openssl-blacklist package that we don't need on live CDs --- debian/changelog | 8 ++++++++ livecd.sh | 15 +++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/debian/changelog b/debian/changelog index 05465ea8..273f71a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (0.61) UNRELEASED; urgency=low + + * Use apt pinning to force use of the version of ssl-cert from the hardy + release pocket, not the one from -updates, so we avoid pulling in the + very large openssl-blacklist package that we don't need on live CDs + + -- Steve Langasek Fri, 20 Jun 2008 00:23:23 -0700 + livecd-rootfs (0.60) intrepid; urgency=low * Employ hideous hack to ensure that when we're building against diff --git a/livecd.sh b/livecd.sh index 72eb56c3..a29664cb 100755 --- a/livecd.sh +++ b/livecd.sh @@ -307,6 +307,18 @@ link_in_boot = $link_in_boot LIST="$(without_package "$x" "$LIST")" done + if [ "$STE" = "hardy" ]; then + # use the version of ssl-cert from the release + # pocket, because the version in -updates pulls in the large + # openssl-blacklist package which we should never need on the + # live CD + cat << @@EOF > ${ROOT}etc/apt/preferences +Package: ssl-cert +Pin: version 1.0.14-0ubuntu2 +Pin-Priority: 900 +@@EOF + fi + # Create a good sources.list, and finish the install echo deb $MIRROR $STE ${COMP} > ${ROOT}etc/apt/sources.list echo deb $MIRROR ${STE}-security ${COMP} >> ${ROOT}etc/apt/sources.list @@ -363,6 +375,9 @@ link_in_boot = $link_in_boot chroot $ROOT dpkg-divert --remove --rename /${file} done + # remove the apt preferences hack if it was added + rm -f ${ROOT}etc/apt/preferences + # And make this look more pristine cat << @@EOF > ${ROOT}etc/apt/sources.list deb ${USERMIRROR} $STE ${COMP} From 97fb584c31109e589ed1d5be2c31f835ae482dcf Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 20 Jun 2008 13:54:28 -0700 Subject: [PATCH 12/17] release 0.61 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 273f71a6..1a6dbab7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -livecd-rootfs (0.61) UNRELEASED; urgency=low +livecd-rootfs (0.61) hardy; urgency=low * Use apt pinning to force use of the version of ssl-cert from the hardy release pocket, not the one from -updates, so we avoid pulling in the very large openssl-blacklist package that we don't need on live CDs - -- Steve Langasek Fri, 20 Jun 2008 00:23:23 -0700 + -- Steve Langasek Fri, 20 Jun 2008 13:53:17 -0700 livecd-rootfs (0.60) intrepid; urgency=low From bedc17a83b623e748e92c112057553830850659c Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 20 Jun 2008 13:56:27 -0700 Subject: [PATCH 13/17] fix the upload target; grr, need to not run dch -r from hardy --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1a6dbab7..0b888ca7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (0.61) hardy; urgency=low +livecd-rootfs (0.61) intrepid; urgency=low * Use apt pinning to force use of the version of ssl-cert from the hardy release pocket, not the one from -updates, so we avoid pulling in the From ab5872fb06613fe0c450add9df3ea4dcc40d249f Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 8 Jul 2008 10:15:51 +0100 Subject: [PATCH 14/17] Use 'set -eu' rather than putting -eu on the #! line, so that running 'sh -x /usr/sbin/livecd.sh' for testing doesn't invoke different error-handling behaviour. --- debian/changelog | 8 ++++++++ livecd.sh | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0b888ca7..9ac41a15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (0.62) UNRELEASED; urgency=low + + * Use 'set -eu' rather than putting -eu on the #! line, so that running + 'sh -x /usr/sbin/livecd.sh' for testing doesn't invoke different + error-handling behaviour. + + -- Colin Watson Tue, 08 Jul 2008 10:14:50 +0100 + livecd-rootfs (0.61) intrepid; urgency=low * Use apt pinning to force use of the version of ssl-cert from the hardy diff --git a/livecd.sh b/livecd.sh index a29664cb..30782541 100755 --- a/livecd.sh +++ b/livecd.sh @@ -1,4 +1,5 @@ -#!/bin/bash -eu +#!/bin/bash +set -eu ########################################################################## #### (c) Copyright 2004-2007 Canonical Ltd. ##### From 2cb63fc7a58471b169e01b63f7206cbe6eccda3e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 18 Jul 2008 20:00:15 +0100 Subject: [PATCH 15/17] Remove the kernel from the livefs; ubiquity >= 1.9.4 will copy it from the CD root if it needs to (LP: #80385). --- debian/changelog | 2 ++ livecd.sh | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9ac41a15..d3e6e93a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ livecd-rootfs (0.62) UNRELEASED; urgency=low * Use 'set -eu' rather than putting -eu on the #! line, so that running 'sh -x /usr/sbin/livecd.sh' for testing doesn't invoke different error-handling behaviour. + * Remove the kernel from the livefs; ubiquity >= 1.9.4 will copy it from + the CD root if it needs to (LP: #80385). -- Colin Watson Tue, 08 Jul 2008 10:14:50 +0100 diff --git a/livecd.sh b/livecd.sh index 30782541..4a99800c 100755 --- a/livecd.sh +++ b/livecd.sh @@ -431,7 +431,9 @@ deb-src ${USERMIRROR} ${STE}-updates ${COMP} # we mv the initramfs, so it's not wasting space on the livefs mv ${ROOT}/boot/initrd.img-"${KVER}" livecd.${FSS}.initrd-"${SUBARCH}" rm -f ${ROOT}/boot/initrd.img-"${KVER}".bak - cp ${ROOT}/boot/vmlinu?-"${KVER}" livecd.${FSS}.kernel-"${SUBARCH}" + # ubiquity >= 1.9.3 copies the kernel from the CD root if it doesn't + # find one on the livefs, allowing us to save space + mv ${ROOT}/boot/vmlinu?-"${KVER}" livecd.${FSS}.kernel-"${SUBARCH}" done NUMKVERS="$(set -- $KVERS; echo $#)" if [ "$NUMKVERS" = 1 ]; then From f0a0953e14365225b3ec28badb4cbe0d8789b130 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 18 Jul 2008 20:01:11 +0100 Subject: [PATCH 16/17] fix version in comment --- livecd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livecd.sh b/livecd.sh index 4a99800c..bba7449b 100755 --- a/livecd.sh +++ b/livecd.sh @@ -431,7 +431,7 @@ deb-src ${USERMIRROR} ${STE}-updates ${COMP} # we mv the initramfs, so it's not wasting space on the livefs mv ${ROOT}/boot/initrd.img-"${KVER}" livecd.${FSS}.initrd-"${SUBARCH}" rm -f ${ROOT}/boot/initrd.img-"${KVER}".bak - # ubiquity >= 1.9.3 copies the kernel from the CD root if it doesn't + # ubiquity >= 1.9.4 copies the kernel from the CD root if it doesn't # find one on the livefs, allowing us to save space mv ${ROOT}/boot/vmlinu?-"${KVER}" livecd.${FSS}.kernel-"${SUBARCH}" done From df432969eb5089d4c763cbaf06a9d2665d16436c Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 18 Jul 2008 20:01:59 +0100 Subject: [PATCH 17/17] releasing version 0.62 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d3e6e93a..1152001d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (0.62) UNRELEASED; urgency=low +livecd-rootfs (0.62) intrepid; urgency=low * Use 'set -eu' rather than putting -eu on the #! line, so that running 'sh -x /usr/sbin/livecd.sh' for testing doesn't invoke different @@ -6,7 +6,7 @@ livecd-rootfs (0.62) UNRELEASED; urgency=low * Remove the kernel from the livefs; ubiquity >= 1.9.4 will copy it from the CD root if it needs to (LP: #80385). - -- Colin Watson Tue, 08 Jul 2008 10:14:50 +0100 + -- Colin Watson Fri, 18 Jul 2008 20:01:15 +0100 livecd-rootfs (0.61) intrepid; urgency=low