Merge lp:~sil2100/livecd-rootfs/pocket-desktop into lp:livecd-rootfs

[Łukasz Zemczak]

Add support for pocket-desktop. We do this through SUBPROJECT right now as adding a new project would require modifying multiple lines and copy-pasting the whole hook list - which is complete boilerplate and makes maintenance troublesome, as any change to ubuntu-touch hooks would have to be duplicated in ubuntu-pd (symlinks don't work).

Add support for pocket-desktop. We do this through SUBPROJECT right now as adding a new project would require modifying multiple lines and copy-pasting the whole hook list - which is complete boilerplate and makes maintenance troublesome, as any change to ubuntu-touch hooks would have to be duplicated in ubuntu-pd (symlinks don't work).

Steve said he would prefer to have it as a separate project, and I can surely make it a separate project, but... It would pain me very much to add so much unnecessary changes for something that can be done with a 3 line diff with SUBPROJECT. I leave it up to the reviewers.

Another reason to keep it as a subproject: if we add a new project, we need to modify cdimage code. Subprojects do not require any real changes.

[Łukasz Zemczak (sil2100)]

I know I already had a similar branch before and marked it as rejected, but now I want to re-try a similar approach just with the meta-package instead.

I can change it to doing a separate project (like ubuntu-touch) if the reviewers decide it's a better choice.

[Łukasz Zemczak (sil2100)]

From what I saw in the ubuntu-cdimage code, it seems that new subprojects are handled automatically, simply using everything from the base project + appending the subproject name. I wonder if I saw that right. Anyway, if yes, then that's another good reason for using subproject.

[Michael Vogt (mvo)]

I'm ok with this change, I would rather see a two lines diff like this than to duplicate all the boilerplate. If it turns out to be a problem we can always revert these two lines here and revert to the full project.

review: Approve

[lp:~sil2100/livecd-rootfs/pocket-desktop]

1206. By Łukasz Zemczak on 2015-09-18

Fix indent

[Colin Watson (cjwatson)]

I can see why this looks tempting, but it's going to cause a lot of problems in cdimage. We have a hardwired assumption there that subprojects are only used for a very few things, and that they always have a different image type from the master project (so ubuntu-core/system-image gets away with it at the publication level because it's daily-preinstalled rather than daily). That isn't the case here. I realise that a separate project is a much larger diff, but hopefully it's largely mechanical, and it would avoid getting into trouble in cdimage.

[Colin Watson (cjwatson)]

Also, symlinking the whole directory will work fine. Symlinking individual files might not, but that could easily be fixed by changing "cp -af" to "cp -Rf --preserve=all".

[Michael Vogt (mvo)]

Ok, thanks for explaining the underlying issue(s).

review: Abstain

[Łukasz Zemczak (sil2100)]

ACK! After discussion with Colin I can see the possible problems, changing to the project approach. I'll use a symlink and hope for the best ;)

review: Needs Fixing

[lp:~sil2100/livecd-rootfs/pocket-desktop]

1207. By Łukasz Zemczak on 2015-09-18

Switch to the project approach, add a symlink for the hooks

[Michael Vogt (mvo)]

Looks good.

review: Approve

[Colin Watson (cjwatson)]

Mostly looks OK, but I think the metapackage handling needs to be fixed. See below.

review: Approve

[lp:~sil2100/livecd-rootfs/pocket-desktop]

1208. By Łukasz Zemczak on 2015-09-21

As suggested by Colin, first add the meta packages, then the other deps.

1209. By Łukasz Zemczak on 2015-09-21

Install the meta package as part of one add_package install call.

=== modified file 'live-build/auto/build'
--- live-build/auto/build	2015-08-12 10:19:01 +0000
+++ live-build/auto/build	2015-09-21 14:01:16 +0000
@@ -238,11 +238,13 @@
 			> chroot/etc/apt/sources.list
 		rm chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig
 	fi
-	if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
-		INFO_DESC="$(lsb_release -d -s)"
-		echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info
-		mkdir -p chroot/var/log/installer
-		Chroot chroot "ln -s /etc/media-info /var/log/installer/media-info"
+	if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
+		if [ "$ARCH" = "armhf" ]; then
+			INFO_DESC="$(lsb_release -d -s)"
+			echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info
+			mkdir -p chroot/var/log/installer
+			Chroot chroot "ln -s /etc/media-info /var/log/installer/media-info"
+		fi
 	fi
 	if [ "$PROJECT" = "ubuntu-cpc" ]; then
 		cat > chroot/etc/apt/sources.list << EOF
@@ -313,7 +315,7 @@
 	cp -a binary-tar.tar.gz "$PREFIX.rootfs.tar.gz"
 fi
 
-if [ "$PROJECT" = "ubuntu-touch" ]; then
+if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
 	(cd "binary/$INITFS/custom.dir/" && tar -c *) | \
 		gzip -9 --rsyncable > "$PREFIX.custom.tar.gz"
 	chmod 644 "$PREFIX.custom.tar.gz"
@@ -436,7 +438,7 @@
 
 fi
 
-if [ "$PROJECT" = "ubuntu-touch" ]; then
+if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
 	sourceslist="chroot/etc/apt/sources.list"
 
 	lb chroot_proc install "$@"

=== modified file 'live-build/auto/config'
--- live-build/auto/config	2015-09-17 22:17:52 +0000
+++ live-build/auto/config	2015-09-21 14:01:16 +0000
@@ -129,7 +129,7 @@
 
 	*)
 		case $PROJECT in
-			ubuntu-server|ubuntu-touch)
+			ubuntu-server|ubuntu-touch|ubuntu-pd)
 				;;
 			*)
 				add_package live lupin-casper
@@ -162,7 +162,7 @@
 		ubuntu-server)
 			add_package live oem-config-debconf ubiquity-frontend-debconf
 			;;
-		ubuntu-core|base|ubuntu-touch|ubuntu-cpc|ubuntu-desktop-next)
+		ubuntu-core|base|ubuntu-touch|ubuntu-pd|ubuntu-cpc|ubuntu-desktop-next)
 			;;
 		*)
 			add_package live oem-config-gtk ubiquity-frontend-gtk
@@ -420,8 +420,14 @@
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;
 
-	ubuntu-touch)
-		add_package install ubuntu-minimal ubuntu-touch systemd-sysv- packagekit ubuntu-system-settings-online-accounts
+	ubuntu-touch|ubuntu-pd)
+		if [ "$PROJECT" = "ubuntu-touch" ]; then
+			meta_package=ubuntu-touch
+		else
+			meta_package=ubuntu-pocket-desktop
+		fi
+		add_package install ubuntu-minimal $meta_package systemd-sysv- packagekit ubuntu-system-settings-online-accounts
+
 		COMPONENTS='main restricted universe'
 		BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
 		export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'
@@ -524,7 +530,7 @@
 esac
 
 case $PROJECT in
-	ubuntu-server|ubuntu-core|ubuntu-touch)
+	ubuntu-server|ubuntu-core|ubuntu-touch|ubuntu-pd)
 		case $SUBPROJECT in
 			system-image)
 				# keep the kernel for the system-image build
@@ -665,7 +671,7 @@
 		fi
 		;;
 
-	ubuntu-touch:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
+	ubuntu-touch:*|ubuntu-pd:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
 		cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
 			config/
 		;;

=== added symlink 'live-build/ubuntu-pd'
=== target is u'ubuntu-touch/'