mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-03-05 00:11:10 +00:00
merge with trunk
This commit is contained in:
Mario Limonciello
commit
209541fff0
@ -55,9 +55,9 @@ if [ -z "$SUITES" ]; then
|
||||
echo "No valid suites to build for" >&2 && exit 1
|
||||
fi
|
||||
if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
|
||||
set -- ubuntu kubuntu edubuntu xubuntu base
|
||||
set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu base
|
||||
if [ "$ARCH" = "i386" ]; then
|
||||
set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu base
|
||||
set -- ubuntu ubuntu-dvd ubuntu-lpia kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu base
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -68,7 +68,7 @@ esac
|
||||
|
||||
for arg in "$@"; do
|
||||
case "$arg" in
|
||||
*ubuntu|ubuntu-lpia|base|tocd) ;;
|
||||
*ubuntu|*ubuntu-dvd|kubuntu-kde4|ubuntu-lpia|base|tocd) ;;
|
||||
*)
|
||||
echo "bad project: $arg" >&2
|
||||
exit 2
|
||||
|
||||
88
debian/changelog
vendored
88
debian/changelog
vendored
@ -1,9 +1,95 @@
|
||||
livecd-rootfs (0.44) UNRELEASED; urgency=low
|
||||
livecd-rootfs (0.56) UNRELEASED; urgency=low
|
||||
|
||||
* Add Mythbuntu support.
|
||||
|
||||
-- Mario Limonciello <superm1@ubuntu.com> Wed, 31 Oct 2007 10:26:25 -0400
|
||||
|
||||
livecd-rootfs (0.55) hardy; urgency=low
|
||||
|
||||
* All powerpc builds (including ps3) use the powerpc/powerpc64-smp kernels
|
||||
now.
|
||||
|
||||
-- Colin Watson <cjwatson@ubuntu.com> Wed, 27 Feb 2008 20:19:16 +0000
|
||||
|
||||
livecd-rootfs (0.54) hardy; urgency=low
|
||||
|
||||
* Run /etc/cron.daily/mlocate rather than /etc/cron.daily/slocate.
|
||||
|
||||
-- Colin Watson <cjwatson@ubuntu.com> Wed, 27 Feb 2008 06:54:12 +0000
|
||||
|
||||
livecd-rootfs (0.53) hardy; urgency=low
|
||||
|
||||
* Set kubuntu-kde4 to universe
|
||||
|
||||
-- Jonathan Riddell <jriddell@ubuntu.com> Fri, 22 Feb 2008 09:42:15 +0000
|
||||
|
||||
livecd-rootfs (0.52) hardy; urgency=low
|
||||
|
||||
* Enable *ubuntu-dvd and kubuntu-kde4 as known projects in BuildLiveCD
|
||||
|
||||
-- Steve Langasek <steve.langasek@ubuntu.com> Thu, 14 Feb 2008 15:58:31 -0800
|
||||
|
||||
livecd-rootfs (0.51) hardy; urgency=low
|
||||
|
||||
[ Jonathan Riddell ]
|
||||
* Add kubuntu-kde4
|
||||
|
||||
[ Steve Langasek ]
|
||||
* Add new targets for {k,ed,}ubuntu-dvd
|
||||
|
||||
-- Steve Langasek <steve.langasek@ubuntu.com> Thu, 14 Feb 2008 10:15:33 -0800
|
||||
|
||||
livecd-rootfs (0.50) hardy; urgency=low
|
||||
|
||||
* Switch Xubuntu to libgoffice-gtk-0-6.
|
||||
|
||||
-- Colin Watson <cjwatson@ubuntu.com> Thu, 31 Jan 2008 17:22:35 +0000
|
||||
|
||||
livecd-rootfs (0.49) hardy; urgency=low
|
||||
|
||||
* Allow Xubuntu to build against universe and multiverse.
|
||||
|
||||
-- Colin Watson <cjwatson@ubuntu.com> Mon, 28 Jan 2008 16:33:06 +0000
|
||||
|
||||
livecd-rootfs (0.48) hardy; urgency=low
|
||||
|
||||
* fix typo in getopts call so the -m and -S options are recognized
|
||||
* drop call to non-existent sanitize command (LP: #179130)
|
||||
|
||||
-- Oliver Grawert <ogra@ubuntu.com> Fri, 25 Jan 2008 17:40:57 +0100
|
||||
|
||||
livecd-rootfs (0.47) hardy; urgency=low
|
||||
|
||||
* Fix versioned dependency to squashfs-tools. "." != "-", silly me.
|
||||
|
||||
-- Martin Pitt <martin.pitt@ubuntu.com> Thu, 20 Dec 2007 14:17:47 +0100
|
||||
|
||||
livecd-rootfs (0.46) hardy; urgency=low
|
||||
|
||||
* Use -nolzma option of mksquashfs, since our current kernel squashfs module
|
||||
does not support it yet (see LP #177634). Bump dependency to
|
||||
squashfs-tools to ensure availability of that option.
|
||||
|
||||
-- Martin Pitt <martin.pitt@ubuntu.com> Thu, 20 Dec 2007 12:03:41 +0100
|
||||
|
||||
livecd-rootfs (0.45) hardy; urgency=low
|
||||
|
||||
[ Colin Watson ]
|
||||
* Vcs-Bzr is now an official field. Use an unauthenticated URL for it.
|
||||
|
||||
[ Bryce Harrington ]
|
||||
* livecd.sh: Leave a token empty xorg.conf in place to let
|
||||
xserver-xorg postinst know it needs to regenerate it. (LP: #174537)
|
||||
|
||||
-- Timo Aaltonen <tepsipakki@ubuntu.com> Wed, 19 Dec 2007 01:23:32 +0200
|
||||
|
||||
livecd-rootfs (0.44) hardy; urgency=low
|
||||
|
||||
* xubuntu seed change - libgoffice-gtk-0-4 --> libgoffice-gtk-0-5
|
||||
|
||||
-- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 30 Nov 2007 14:52:29 +1100
|
||||
|
||||
>>>>>>> MERGE-SOURCE
|
||||
livecd-rootfs (0.43) hardy; urgency=low
|
||||
|
||||
* Add Gobuntu support.
|
||||
|
||||
4
debian/control
vendored
4
debian/control
vendored
@ -4,11 +4,11 @@ Priority: optional
|
||||
Build-Depends: debhelper (>=4)
|
||||
Maintainer: Adam Conrad <adconrad@ubuntu.com>
|
||||
Standards-Version: 3.6.1.0
|
||||
XS-Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
|
||||
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
|
||||
|
||||
Package: livecd-rootfs
|
||||
Architecture: all
|
||||
Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools, grep-dctrl, fdupes
|
||||
Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes
|
||||
Suggests: partimage
|
||||
Description: construction script for the livecd rootfs
|
||||
livecd-rootfs provides the script used to create the root filesystem
|
||||
|
||||
36
livecd.sh
Executable file → Normal file
36
livecd.sh
Executable file → Normal file
@ -129,15 +129,15 @@ esac; done;
|
||||
shift $((OPTIND-1))
|
||||
|
||||
if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
|
||||
set -- ubuntu kubuntu edubuntu xubuntu gobuntu mythbuntu base
|
||||
set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu gobuntu base
|
||||
if [ "$ARCH" = "i386" ]; then
|
||||
set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu gobuntu mythbuntu base
|
||||
set -- ubuntu ubuntu-dvd ubuntu-lpia kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu gobuntu base
|
||||
fi
|
||||
fi
|
||||
|
||||
for arg in "$@"; do
|
||||
case "$arg" in
|
||||
ubuntu|ubuntu-lpia|edubuntu|kubuntu|xubuntu|gobuntu|mythbuntu|base|tocd)
|
||||
ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|gobuntu|base|tocd)
|
||||
;;
|
||||
*)
|
||||
echo bad name >&2;
|
||||
@ -169,15 +169,20 @@ Flags: seen
|
||||
@@EOF
|
||||
|
||||
case "$FS" in
|
||||
ubuntu|ubuntu-lpia)
|
||||
ubuntu|ubuntu-lpia|ubuntu-dvd)
|
||||
LIST="$LIST minimal^ standard^ ubuntu-desktop^"
|
||||
LIVELIST="ubuntu-live^ xresprobe laptop-detect casper lupin-casper"
|
||||
;;
|
||||
kubuntu)
|
||||
kubuntu|kubuntu-dvd)
|
||||
LIST="$LIST minimal^ standard^ kubuntu-desktop^"
|
||||
LIVELIST="kubuntu-live^ xresprobe laptop-detect casper lupin-casper"
|
||||
;;
|
||||
edubuntu)
|
||||
kubuntu-kde4)
|
||||
LIST="$LIST minimal^ standard^ kubuntu-kde4-desktop^"
|
||||
LIVELIST="kubuntu-kde4-live^ xresprobe laptop-detect casper lupin-casper"
|
||||
COMP="main restricted universe multiverse"
|
||||
;;
|
||||
edubuntu|edubuntu-dvd)
|
||||
LIST="$LIST minimal^ standard^ edubuntu-desktop^"
|
||||
LIVELIST="edubuntu-live^ xresprobe laptop-detect casper lupin-casper"
|
||||
;;
|
||||
@ -223,6 +228,11 @@ Flags: seen
|
||||
LIST="$LIST $tocddesktop"
|
||||
LIVELIST="$tocdlive casper"
|
||||
esac
|
||||
case "$FS" in
|
||||
*-dvd)
|
||||
LIVELIST="$LIVELIST ${FS}-live^"
|
||||
;;
|
||||
esac
|
||||
|
||||
dpkg -l livecd-rootfs || true # get our version # in the log.
|
||||
if [ "$FS" != "ubuntu-lpia" ]; then
|
||||
@ -290,15 +300,11 @@ link_in_boot = $link_in_boot
|
||||
ubuntu-lpia) LIST="$LIST linux-lpia";;
|
||||
*) LIST="$LIST linux-generic";;
|
||||
esac;;
|
||||
powerpc)
|
||||
case $SUBARCH in
|
||||
ps3) LIST="$LIST linux-cell";;
|
||||
*) LIST="$LIST linux-powerpc linux-powerpc64-smp";;
|
||||
esac;;
|
||||
|
||||
# and the bastard stepchildren
|
||||
ia64) LIST="$LIST linux-itanium linux-mckinley";;
|
||||
hppa) LIST="$LIST linux-hppa32 linux-hppa64";;
|
||||
powerpc) LIST="$LIST linux-powerpc linux-powerpc64-smp";;
|
||||
sparc*) LIST="$LIST linux-sparc64";;
|
||||
*) echo "Unknown architecture: no kernel."; exit 1;;
|
||||
esac
|
||||
@ -329,7 +335,7 @@ link_in_boot = $link_in_boot
|
||||
> livecd.${FSS}.manifest
|
||||
kill_users
|
||||
|
||||
chroot $ROOT /etc/cron.daily/slocate || true
|
||||
chroot $ROOT /etc/cron.daily/mlocate || true
|
||||
chroot $ROOT /etc/cron.daily/man-db || true
|
||||
|
||||
# remove our diversions
|
||||
@ -363,6 +369,8 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
|
||||
# get rid of the .debs - we don't need them.
|
||||
chroot ${ROOT} apt-get clean
|
||||
rm -f ${ROOT}etc/X11/xorg.conf
|
||||
# Restore an empty xorg.conf, else xserver-xorg postinst will be confused
|
||||
touch ${ROOT}etc/X11/xorg.conf
|
||||
rm -f ${ROOT}var/lib/apt/lists/*_*
|
||||
rm -f ${ROOT}var/spool/postfix/maildrop/*
|
||||
# Removing update-notifier notes is now considered harmful:
|
||||
@ -405,7 +413,7 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
|
||||
(cd $ROOT && find usr/share/doc -maxdepth 1 -type d | xargs du -s | sort -nr)
|
||||
echo END docdirs
|
||||
|
||||
# search for duplicate files, write the summary to stdout,
|
||||
# search for duplicate files, write the summary to stdout,
|
||||
if which fdupes >/dev/null 2>&1; then
|
||||
echo "first line: <total size for dupes> <different dupes> <all dupes>"
|
||||
echo "data lines: <size for dupes> <number of dupes> <file size> <filename> [<filename> ...]"
|
||||
@ -432,7 +440,7 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
|
||||
: > livecd.${FSS}.sort
|
||||
fi
|
||||
|
||||
mksquashfs ${ROOT} livecd.${FSS}.squashfs -sort livecd.${FSS}.sort
|
||||
mksquashfs ${ROOT} livecd.${FSS}.squashfs -nolzma -sort livecd.${FSS}.sort
|
||||
chmod 644 livecd.${FSS}.squashfs
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user