diff --git a/BuildLiveCD b/BuildLiveCD index 9cd17418..2024e32f 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -87,15 +87,6 @@ case ${ARCH} in *) LINUX32="";; esac -for arg in "$@"; do - case "$arg" in - *ubuntu|*ubuntu-dvd|kubuntu-active|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|ubuntustudio-dvd|base|tocd|ubuntu-headless|ubuntu-server|ubuntu-core|cloud-live) ;; - *) - echo "bad project: $arg" >&2 - exit 2 - ;; - esac -done if [ "`echo $@ | wc -w`" -gt "1" ]; then for arg in "$@"; do $0 $arg diff --git a/debian/changelog b/debian/changelog index a065adff..636d9ff6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +livecd-rootfs (2.111) raring; urgency=low + + * live-build/auto/config: Add ubuntukylin as a valid project + (LP: #1152812). + * BuildLiveCD: Remove the explicit list of valid projects. This is a + hassle to modify, and not very useful since an invalid project will fail + soon enough anyway. + + -- Colin Watson Sat, 09 Mar 2013 12:13:24 +0000 + livecd-rootfs (2.110) raring; urgency=low * live-build/auto/config: Drop ubuntustudio-audio-plugins task. diff --git a/live-build/auto/config b/live-build/auto/config index 9122d80f..97c842e9 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -233,6 +233,13 @@ case $PROJECT in esac ;; + ubuntukylin) + add_task install minimal standard ubuntu-desktop + add_package install ubuntukylin-default-settings + LIVE_TASK='ubuntu-live' + COMPONENTS='main restricted universe' + ;; + base) add_task install minimal standard ;;