Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-04 16:01:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Allow the user to specify the ARCH on the livecd.sh command line,

Browse Source 
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.
This commit is contained in:
Adam Conrad 2008-05-02 15:19:51 -06:00
parent 882c311fe2
commit 00d2e2782a
3 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BuildLiveCD
View File

@ -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

12
debian/changelog vendored
View File

@ -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 <adconrad@ubuntu.com> Fri, 02 May 2008 15:10:32 -0600
livecd-rootfs (0.56) hardy; urgency=low
* Explicitly install language-support-en first for kubuntu-kde4

36
livecd.sh
View File

@ -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