Merge lp:~ubuntu-mate-dev/livecd-rootfs/ubuntu-mate-base into lp:livecd-rootfs

[Martin Wimpress ]

This merge proposal adds support for Xubuntu Base and Ubuntu MATE Base as discussed with Adam Conrad. The "Base" variants contain a minimal desktop environment suitable for experienced user to craft their own setup.

[lp:~ubuntu-mate-dev/livecd-rootfs/ubuntu-mate-base]

1269. By Martin Wimpress  on 2016-01-29

Merged with upstream.

[Dimitri John Ledkov (xnox)]

Looks like bare "base" is dropped, see inline comment.

[Daniel Holbach (dholbach)]

Setting status to WIP.

[Balint Reczey (rbalint)]

The target Bazaar branch is not active anymore.
Please resubmit the merge proposal against https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+ref/ubuntu/master .

[Steve Langasek (vorlon)]

review: Needs Resubmitting

Unmerged revisions

1269. By Martin Wimpress  on 2016-01-29

Merged with upstream.

1268. By Martin Wimpress  on 2016-01-26

Added ubuntu-mate-base.

1267. By Sean Davis on 2016-01-26

Replace Xubuntu Core with Base

1266. By Sean Davis on 2016-01-26

Merge in lp:~unit193/livecd-rootfs/xubuntu-core

=== modified file 'BuildLiveCD'
--- BuildLiveCD	2013-07-23 14:45:15 +0000
+++ BuildLiveCD	2016-01-29 23:25:21 +0000
@@ -69,9 +69,9 @@
     exit 1
 fi
 if ([ $# = 0 ] || [ "X$1" = "Xall" ]) && ! $LIVE_BUILD; then
-    set -- ubuntu kubuntu kubuntu-active edubuntu xubuntu mythbuntu base
+    set -- ubuntu kubuntu kubuntu-active edubuntu xubuntu xubuntu-base mythbuntu base ubuntu-mate ubuntu-mate-base
     if [ "$ARCH" = "i386" ]; then
-        set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook kubuntu kubuntu-dvd kubuntu-active edubuntu edubuntu-dvd xubuntu mythbuntu base
+        set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook kubuntu kubuntu-dvd kubuntu-active edubuntu edubuntu-dvd xubuntu xubuntu-base ubuntu-mate ubuntu-mate-base mythbuntu base
     fi
 fi
 

=== modified file 'live-build/auto/config'
--- live-build/auto/config	2015-12-08 15:48:30 +0000
+++ live-build/auto/config	2016-01-29 23:25:21 +0000
@@ -290,6 +290,19 @@
 		esac
 		;;
 
+	xubuntu-base)
+		add_task install minimal standard xubuntu-base
+		add_package install xterm
+		LIVE_TASK='xubuntu-live'
+		case $ARCH in
+			amd64)	add_package live linux-signed-generic ;;
+		esac
+		COMPONENTS='main restricted universe multiverse'
+		case $ARCH in
+			amd64|i386)	KERNEL_FLAVOURS=generic ;;
+		esac
+		;;
+
 	ubuntu-netbook)
 		add_task install minimal standard ubuntu-netbook
 		LIVE_TASK='netbook-live'
@@ -341,6 +354,18 @@
 		export APT_OPTIONS="--yes --no-install-recommends"
 		;;
 
+	ubuntu-mate-base)
+		add_task install minimal standard ubuntu-mate-core
+		LIVE_TASK='ubuntu-mate-live'
+		case $ARCH in
+			amd64)	add_package live linux-signed-generic ;;
+		esac
+		COMPONENTS='main restricted universe multiverse'
+		# The Ubuntu MATE STRUCTURE file has "feature
+		# no-follow-recommends".  Mirror this.
+		export APT_OPTIONS="--yes --no-install-recommends"
+		;;                
+
 	ubuntustudio-dvd)
 		add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography
 		COMPONENTS='main restricted universe multiverse'