From 46ce707e6d8281cc3e140b29a1b55266812decb1 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 7 Sep 2007 19:11:03 +0100 Subject: [PATCH] Import patches-unapplied version 0.33 to ubuntu/gutsy Imported using git-ubuntu import. Changelog parent: be02feaeba32d3da434851c413e023d6501081b6 New changelog entries: [ Adam Conrad ] * Implement hideous hacks to build lpia mixed-arch livecds for developers to test with. This should be reverted ASAP once LPIA main is built. * Add missing ${ROOT}sys to $MOUNTS; a bug exposed by a buggy debootstrap. [ Colin Watson ] * Add lupin-casper as well as casper, for installer-for-windows. * Revert most of the lpia hacks now that most of main is built, though we still need a few of them to make the ubuntu-lpia project work. * Move powerpc to ports.ubuntu.com. --- BuildLiveCD | 7 +++++-- debian/changelog | 15 +++++++++++++++ livecd.sh | 50 +++++++++++++++++++++++++++++++++--------------- 3 files changed, 55 insertions(+), 17 deletions(-) diff --git a/BuildLiveCD b/BuildLiveCD index ef83efc1..54462949 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -24,6 +24,7 @@ if [ -n "$SSH_ORIGINAL_COMMAND" ]; then [ ${1##*/} != 'BuildLiveCD' ] && echo bad command >&2 && exit 2 shift fi +ARCH=$(dpkg --print-installation-architecture) SUBARCH="" SUBARCHARG="" DEFAULTSUITE="gutsy" @@ -55,9 +56,11 @@ if [ -z "$SUITES" ]; then fi if (( $# == 0 )) || [ "X$1" = "Xall" ]; then set -- ubuntu kubuntu edubuntu xubuntu base + if [ "$ARCH" = "i386" ]; then + set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu base + fi fi -ARCH=$(dpkg --print-installation-architecture) case ${ARCH} in hppa|sparc|powerpc) LINUX32=linux32;; *) LINUX32="";; @@ -65,7 +68,7 @@ esac for arg in "$@"; do case "$arg" in - *ubuntu|base|tocd) ;; + *ubuntu|ubuntu-lpia|base|tocd) ;; *) echo "bad project: $arg" >&2 exit 2 diff --git a/debian/changelog b/debian/changelog index 93056f9c..aa75713e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +livecd-rootfs (0.33) gutsy; urgency=low + + [ Adam Conrad ] + * Implement hideous hacks to build lpia mixed-arch livecds for developers + to test with. This should be reverted ASAP once LPIA main is built. + * Add missing ${ROOT}sys to $MOUNTS; a bug exposed by a buggy debootstrap. + + [ Colin Watson ] + * Add lupin-casper as well as casper, for installer-for-windows. + * Revert most of the lpia hacks now that most of main is built, though we + still need a few of them to make the ubuntu-lpia project work. + * Move powerpc to ports.ubuntu.com. + + -- Colin Watson Fri, 07 Sep 2007 19:11:03 +0100 + livecd-rootfs (0.32) gutsy; urgency=low * For Edubuntu images, include the intersection of edubuntu-ship-addon and diff --git a/livecd.sh b/livecd.sh index 4f2a84a5..309c6c2b 100755 --- a/livecd.sh +++ b/livecd.sh @@ -67,10 +67,19 @@ SRCMIRROR=http://archive.ubuntu.com/ubuntu COMP="main restricted" ARCH=$(dpkg --print-installation-architecture) case $ARCH in - i386|powerpc|amd64|sparc) - USERMIRROR=http://archive.ubuntu.com/ubuntu - SECMIRROR=http://security.ubuntu.com/ubuntu - SECSRCMIRROR=${SECMIRROR} + i386|amd64|sparc) + case $FS in + ubuntu-lpia) + USERMIRROR=http://ports.ubuntu.com/ubuntu-ports + SECMIRROR=${USERMIRROR} + SECSRCMIRROR=${SRCMIRROR} + ;; + *) + USERMIRROR=http://archive.ubuntu.com/ubuntu + SECMIRROR=http://security.ubuntu.com/ubuntu + SECSRCMIRROR=${SECMIRROR} + ;; + esac ;; hppa) USERMIRROR=http://ports.ubuntu.com/ubuntu-ports @@ -114,11 +123,14 @@ shift $((OPTIND-1)) if (( $# == 0 )) || [ "X$1" = "Xall" ]; then set -- ubuntu kubuntu edubuntu xubuntu base + if [ "$ARCH" = "i386" ]; then + set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu base + fi fi for arg in "$@"; do case "$arg" in - ubuntu|edubuntu|kubuntu|xubuntu|base|tocd) + ubuntu|ubuntu-lpia|edubuntu|kubuntu|xubuntu|base|tocd) ;; *) echo bad name >&2; @@ -131,7 +143,7 @@ ROOT=$(pwd)/chroot-livecd/ # trailing / is CRITICAL for FS in "$@"; do FSS="$FS${SUBARCH:+-$SUBARCH}" IMG=livecd.${FSS}.fsimg - MOUNTS="${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev ${ROOT}proc" + MOUNTS="${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev ${ROOT}proc ${ROOT}sys" DEV="" rm -rf ${ROOT} @@ -147,25 +159,25 @@ Flags: seen @@EOF case "$FS" in - ubuntu) + ubuntu|ubuntu-lpia) LIST="$LIST minimal^ standard^ ubuntu-desktop^" - LIVELIST="ubuntu-live^ xresprobe laptop-detect casper" + LIVELIST="ubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; kubuntu) LIST="$LIST minimal^ standard^ kubuntu-desktop^" - LIVELIST="kubuntu-live^ xresprobe laptop-detect casper" + LIVELIST="kubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; edubuntu) LIST="$LIST minimal^ standard^ edubuntu-desktop^" - LIVELIST="edubuntu-live^ xresprobe laptop-detect casper" + LIVELIST="edubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; xubuntu) LIST="$LIST minimal^ standard^ xterm libgoffice-gtk-0-4 xubuntu-desktop^" - LIVELIST="xubuntu-live^ xresprobe laptop-detect casper" + LIVELIST="xubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; base) LIST="$LIST minimal^ standard^" - LIVELIST="casper" + LIVELIST="casper lupin-casper" ;; tocd) LIST="$LIST minimal^ standard^" @@ -192,8 +204,12 @@ Flags: seen LIVELIST="$tocdlive casper" esac - #dpkg -l livecd-rootfs # get our version # in the log. - debootstrap --components=$(echo $COMP | sed 's/ /,/g') $STE $ROOT $MIRROR + dpkg -l livecd-rootfs # 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 # Just make a few things go away, which lets us skip a few other things. DIVERTS="usr/sbin/mkinitrd usr/sbin/invoke-rc.d" @@ -244,7 +260,11 @@ link_in_boot = $link_in_boot case $ARCH in amd64) LIST="$LIST linux-generic";; - i386) LIST="$LIST linux-generic";; + i386) + case $FS in + ubuntu-lpia) LIST="$LIST linux-lpia";; + *) LIST="$LIST linux-generic";; + esac;; powerpc) case $SUBARCH in ps3) LIST="$LIST linux-ps3";;