diff --git a/debian/changelog b/debian/changelog index 3d2edc6a..48a41782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ livecd-rootfs (2.65.8) UNRELEASED; urgency=low * live-build/auto/config: - Add some manual hints to work around slightly different dependency resolution for metapackages vs. tasks. + - Use kernel and X enablement stacks for Mythbuntu amd64/i386 too. -- Colin Watson Tue, 15 Jan 2013 17:27:59 +0000 diff --git a/live-build/auto/config b/live-build/auto/config index 0f78b6b9..4351461e 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -214,9 +214,27 @@ case $PROJECT in ;; mythbuntu) - add_task install minimal standard mythbuntu-desktop + case $ARCH in + amd64|i386) + # We have to use metapackages rather than + # tasks, so that the X enablement stack can + # be used rather than the normal stack. + # This changes dependency resolution + # sufficiently that some manual hints are + # needed. + add_package install ubuntu-minimal ubuntu-standard mythbuntu-desktop notify-osd + ;; + *) + add_task install minimal standard mythbuntu-desktop + ;; + esac LIVE_TASK='mythbuntu-live' COMPONENTS='main restricted universe multiverse' + case $ARCH in + amd64|i386) + KERNEL_FLAVOURS=generic-lts-quantal + ;; + esac ;; lubuntu)