mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-08-09 15:54:06 +00:00
Import patches-unapplied version 2.10 to ubuntu/oneiric
Imported using git-ubuntu import. Changelog parent: 518b7ae70c69538ea28b361a6427c4e99cc56565 New changelog entries: * Initial Wubi support.
This commit is contained in:
parent
518b7ae70c
commit
8a101c3563
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
||||
livecd-rootfs (2.10) oneiric; urgency=low
|
||||
|
||||
* Initial Wubi support.
|
||||
|
||||
-- Evan Dandrea <ev@ubuntu.com> Mon, 04 Jul 2011 10:54:07 +0100
|
||||
|
||||
livecd-rootfs (2.9) oneiric; urgency=low
|
||||
|
||||
* Rename the ARM headless image to ubuntu-server for oneiric
|
||||
|
@ -47,12 +47,20 @@ add_package ()
|
||||
OPTS=
|
||||
COMPONENTS=
|
||||
BINARY_REMOVE_LINUX=:
|
||||
LIVE_TASK=
|
||||
|
||||
case $IMAGEFORMAT in
|
||||
ext2|ext3|ext4)
|
||||
OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
|
||||
case $SUBPROJECT in
|
||||
wubi)
|
||||
add_package install lupin-support
|
||||
;;
|
||||
*)
|
||||
add_package live jasper
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
*)
|
||||
add_package live lupin-casper
|
||||
@ -62,47 +70,47 @@ esac
|
||||
case $PROJECT in
|
||||
ubuntu|ubuntu-dvd)
|
||||
add_task install minimal standard ubuntu-desktop
|
||||
add_task live ubuntu-live
|
||||
LIVE_TASK='ubuntu-live'
|
||||
;;
|
||||
|
||||
kubuntu|kubuntu-dvd)
|
||||
add_task install minimal standard kubuntu-desktop
|
||||
add_task live kubuntu-live
|
||||
LIVE_TASK='kubuntu-live'
|
||||
;;
|
||||
|
||||
kubuntu-mobile)
|
||||
add_task install minimal standard kubuntu-mobile
|
||||
add_task live kubuntu-mobile-live
|
||||
LIVE_TASK='kubuntu-mobile-live'
|
||||
COMPONENTS='main restricted universe'
|
||||
;;
|
||||
|
||||
edubuntu|edubuntu-dvd)
|
||||
add_task install minimal standard edubuntu-desktop-gnome
|
||||
add_task live edubuntu-live
|
||||
LIVE_TASK='edubuntu-live'
|
||||
COMPONENTS='main restricted universe'
|
||||
;;
|
||||
|
||||
xubuntu)
|
||||
add_task install minimal standard xubuntu-desktop
|
||||
add_package install xterm
|
||||
add_task live xubuntu-live
|
||||
LIVE_TASK='xubuntu-live'
|
||||
COMPONENTS='main restricted universe multiverse'
|
||||
;;
|
||||
|
||||
ubuntu-netbook)
|
||||
add_task install minimal standard ubuntu-netbook
|
||||
add_task live netbook-live
|
||||
LIVE_TASK='netbook-live'
|
||||
;;
|
||||
|
||||
mythbuntu)
|
||||
add_task install minimal standard mythbuntu-desktop
|
||||
add_task live mythbuntu-live
|
||||
LIVE_TASK='mythbuntu-live'
|
||||
COMPONENTS='main restricted universe multiverse'
|
||||
;;
|
||||
|
||||
lubuntu)
|
||||
add_task install minimal standard lubuntu-desktop
|
||||
add_task live lubuntu-live
|
||||
LIVE_TASK='lubuntu-live'
|
||||
COMPONENTS='main restricted universe multiverse'
|
||||
;;
|
||||
|
||||
@ -119,6 +127,15 @@ case $PROJECT in
|
||||
exit 2
|
||||
;;
|
||||
esac
|
||||
|
||||
case $SUBPROJECT in
|
||||
wubi)
|
||||
;;
|
||||
*)
|
||||
add_task live "$LIVE_TASK"
|
||||
;;
|
||||
esac
|
||||
|
||||
case $PROJECT in
|
||||
*-dvd)
|
||||
add_task live "$PROJECT-live"
|
||||
@ -176,6 +193,12 @@ case $PROJECT in
|
||||
;;
|
||||
esac
|
||||
|
||||
case $SUBPROJECT in
|
||||
wubi)
|
||||
ln -s /usr/share/live/build/examples/hooks/ubuntu_binary_build-wubildr.sh config/binary_local-hooks/
|
||||
;;
|
||||
esac
|
||||
|
||||
case $PROJECT in
|
||||
*-dvd)
|
||||
. config/bootstrap
|
||||
|
Loading…
x
Reference in New Issue
Block a user