Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 1.121 to ubuntu/maverick

Browse Source 
Imported using git-ubuntu import.

Changelog parent: dc1eff00fc8383a4808c13e4eb0425d65164ba70

New changelog entries:
  [ LaMont Jones ]
  * BuildLiveCD: only pass -f if we were told it, since older chroots don't
    support it.
  [ Oliver Grawert ]
  * instead of special casing for only one arch, base jasper vs casper
    inclusion on the IMAGETYPE variable
  * depend on genext2fs
This commit is contained in:
Oliver Grawert 2010-06-25 17:30:28 +02:00 committed by usd-importer
parent dc1eff00fc
commit 482984f3d9
4 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BuildLiveCD
View File

@ -30,12 +30,12 @@ SUBARCHARG=""
NEWSUITE="maverick"
SUITES=""
PROPOSED=""
IMAGEFORMAT="squashfs"
IMAGEFORMAT=""
while getopts :s:d:f:p name; do case $name in
s) SUBARCH="$OPTARG";;
d) NEWSUITE="$OPTARG";;
f) IMAGEFORMAT="$OPTARG";;
f) IMAGEFORMAT="-f$OPTARG";;
p) PROPOSED="-p";;
esac; done;
shift $((OPTIND-1))
@ -120,7 +120,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} -f${IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} $arg" > ${LOG} 2>&1; then
if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && /usr/sbin/livecd.sh ${SUBARCHARG} ${PROPOSED} -d${STE} ${IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} $arg" > ${LOG} 2>&1; then
rm -f ${PUBDIR}current
ln -sf ${NOW} ${PUBDIR}current

13
debian/changelog vendored
View File

@ -1,3 +1,16 @@
livecd-rootfs (1.121) maverick; urgency=low
[ LaMont Jones ]
* BuildLiveCD: only pass -f if we were told it, since older chroots don't
support it.
[ Oliver Grawert ]
* instead of special casing for only one arch, base jasper vs casper
inclusion on the IMAGETYPE variable
* depend on genext2fs
-- Oliver Grawert <ogra@ubuntu.com> Fri, 25 Jun 2010 17:30:28 +0200
livecd-rootfs (1.120) maverick; urgency=low
* add special case to ubuntu-netbook on omap3 and 4, we want jasper instead of

2
debian/control vendored
View File

@ -8,7 +8,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
Package: livecd-rootfs
Architecture: all
Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma
Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, genext2fs
Suggests: partimage
Description: construction script for the livecd rootfs
livecd-rootfs provides the script used to create the root filesystem

29
livecd.sh
View File

@ -178,6 +178,12 @@ if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
fi
fi
if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ]; then
LIVE_BOOT_SCRIPTS="jasper"
else
LIVE_BOOT_SCRIPTS="$LIVE_BOOT_SCRIPTS"
fi
for arg in "$@"; do
case "$arg" in
ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|tocd)
@ -222,29 +228,29 @@ Flags: seen
case "$FS" in
ubuntu|ubuntu-lpia|ubuntu-dvd)
LIST="$LIST minimal^ standard^ ubuntu-desktop^"
LIVELIST="ubuntu-live^ laptop-detect casper lupin-casper"
LIVELIST="ubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
;;
kubuntu|kubuntu-dvd)
LIST="$LIST minimal^ standard^ kubuntu-desktop^"
LIVELIST="kubuntu-live^ laptop-detect casper lupin-casper"
LIVELIST="kubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
;;
kubuntu-netbook)
LIST="$LIST minimal^ standard^ kubuntu-netbook^"
LIVELIST="language-support-en kubuntu-netbook-live^ laptop-detect casper lupin-casper"
LIVELIST="language-support-en kubuntu-netbook-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
;;
edubuntu|edubuntu-dvd)
LIST="$LIST minimal^ standard^ edubuntu-desktop-gnome^"
LIVELIST="edubuntu-live^ laptop-detect casper lupin-casper"
LIVELIST="edubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
COMP="main restricted universe"
;;
xubuntu)
LIST="$LIST minimal^ standard^ xterm xubuntu-desktop^"
LIVELIST="xubuntu-live^ laptop-detect casper lupin-casper"
LIVELIST="xubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
COMP="main restricted universe multiverse"
;;
gobuntu)
LIST="$LIST minimal^ standard^ gobuntu-desktop^"
LIVELIST="gobuntu-live^ laptop-detect casper lupin-casper"
LIVELIST="gobuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
COMP="main"
;;
ubuntu-mid)
@ -254,16 +260,11 @@ Flags: seen
;;
ubuntu-netbook)
LIST="$LIST minimal^ standard^ ubuntu-netbook^"
LIVELIST="netbook-live^ laptop-detect casper lupin-casper"
case $TARGETARCH+$SUBARCH in
armel+omap*)
LIVELIST="netbook-live^ laptop-detect jasper"
;;
esac
LIVELIST="netbook-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
;;
mythbuntu)
LIST="$LIST minimal^ standard^ mythbuntu-desktop^"
LIVELIST="mythbuntu-live^ laptop-detect casper lupin-casper"
LIVELIST="mythbuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
COMP="main restricted universe multiverse"
;;
ubuntu-moblin-remix)
@ -274,7 +275,7 @@ Flags: seen
;;
base)
LIST="$LIST minimal^ standard^"
LIVELIST="casper lupin-casper"
LIVELIST="$LIVE_BOOT_SCRIPTS"
;;
tocd)
LIST="$LIST minimal^ standard^"