Merge lp:~rbalint/livecd-rootfs/use-ubuntu-image into lp:livecd-rootfs

[Balint Reczey]

  * Sort and list dependencies nicely
  * Require PROJECT environment to be set for lb build
  * Allow overwriting IMAGEFORMAT even for ubuntu-cpc and ubuntu-server
  * Optionally use ubuntu-image for building snap based images

[Balint Reczey (rbalint)]

Changed Adam's original code a little to avoid pkg installation during script runs.

Maybe I can add this to autopkgtests, it got merged now.

[Adam Conrad (adconrad)]

Not depending on ubuntu-image was an intentional choice, to avoid livecd-rootfs requiring a massive dep chain for *all* builds, when only a small subset actually use those bits.

[Balint Reczey (rbalint)]

I guessed so but changing the system in lb config (any config step) is so bad I pushed them to dependencies instead.
An other option could be adding them to Suggest: and raising error when the tools are not present.

[Balint Reczey (rbalint)]

Pulling in a few more dependencies is really negligible both time- and resources-wise compared to a single lb build run thus making the package cleaner is really worth it here.

[Balint Reczey (rbalint)]

I like the diversion part less and less, I'll give the patch a try without it tomorrow.

[lp:~rbalint/livecd-rootfs/use-ubuntu-image]

1468. By Steve Langasek on 2017-04-25

Merge lp:~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest-fix, w/ modifications

Only call sync, don't wrap kpartx and parse its output (doesn't appear to be
needed)

[lp:~rbalint/livecd-rootfs/use-ubuntu-image]

1469. By Balint Reczey on 2017-04-28

Sort and list dependencies nicely

1470. By Balint Reczey on 2017-04-28

ddd

1471. By Balint Reczey on 2017-04-28

Require PROJECT environment to be set for lb build

1472. By Balint Reczey on 2017-04-28

Allow overriding IMAGEFORMAT even for ubuntu-cpc and ubuntu-server

1473. By Balint Reczey on 2017-04-28

Optionally use ubuntu-image for building snap based images

1474. By Balint Reczey on 2017-04-28

Update changelog

[Steve Langasek (vorlon)]

review: Needs Information

=== modified file 'debian/changelog'
--- debian/changelog	2017-04-25 18:46:26 +0000
+++ debian/changelog	2017-04-28 20:40:28 +0000
@@ -5,8 +5,12 @@
     comparison prior to aa-series (LP: #1681548)
   * live-build/ubuntu-cpc/hooks/999-extras.binary: Exit on first failure
 
-  [Balint Reczey]
+  [ Balint Reczey ]
   * sync before calling kpartx to let writing to loop devices finish
+  * Sort and list dependencies nicely
+  * Require PROJECT environment to be set for lb build
+  * Allow overwriting IMAGEFORMAT even for ubuntu-cpc and ubuntu-server
+  * Optionally use ubuntu-image for building snap based images
 
  -- Steve Langasek <[e-mail]>  Thu, 13 Apr 2017 10:38:04 -0700
 

=== modified file 'debian/control'
--- debian/control	2015-02-04 12:32:24 +0000
+++ debian/control	2017-04-28 20:40:28 +0000
@@ -8,7 +8,25 @@
 
 Package: livecd-rootfs
 Architecture: any
-Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, lsb-release, lzma, e2fsprogs, germinate (>= 1.25.1), apt-utils, gnupg, live-build (>= 3.0~a57-1ubuntu12~), android-tools-fsutils [armhf], python3-software-properties
+Depends: ${misc:Depends},
+         android-tools-fsutils [armhf],
+         apt-utils,
+         debootstrap,
+         e2fsprogs,
+         germinate (>= 1.25.1),
+         gnupg,
+         grep-dctrl,
+         live-build (>= 3.0~a57-1ubuntu12~),
+         lsb-release,
+         lzma,
+         procps,
+         python-minimal | python,
+         python3-software-properties,
+         rsync,
+         snapd,
+         squashfs-tools (>= 1:3.3-1),
+         sudo,
+         ubuntu-image
 Suggests: partimage
 Breaks: ubuntu-defaults-builder (<< 0.32)
 Description: construction script for the livecd rootfs

=== modified file 'live-build/auto/build'
--- live-build/auto/build	2016-08-20 04:56:33 +0000
+++ live-build/auto/build	2017-04-28 20:40:28 +0000
@@ -10,6 +10,17 @@
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
+if [ -z "${PROJECT:-}" ]; then
+    echo "PROJECT environment variable has to be set" >&2
+    exit 1
+fi
+
+if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
+	# Use ubuntu-image instead of live-build
+	env SNAPPY_STORE_NO_CDN=1 ubuntu-image -o livecd."$PROJECT".img livecd."$PROJECT".model-assertion
+	exit 0
+fi
+
 # Setup cleanup function
 Setup_cleanup
 

=== modified file 'live-build/auto/config'
--- live-build/auto/config	2017-04-12 01:44:25 +0000
+++ live-build/auto/config	2017-04-28 20:40:28 +0000
@@ -104,14 +104,16 @@
 	BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1"
 }
 
-case $PROJECT:$SUBPROJECT in
-	ubuntu-cpc:*)
-		IMAGEFORMAT=ext4
-		;;
-	ubuntu-server:live)
-		IMAGEFORMAT=plain
-		;;
-esac
+if [ -z "${IMAGEFORMAT:-}" ]; then
+	case $PROJECT:$SUBPROJECT in
+		ubuntu-cpc:*)
+			IMAGEFORMAT=ext4
+			;;
+		ubuntu-server:live)
+			IMAGEFORMAT=plain
+			;;
+	esac
+fi
 
 case $IMAGEFORMAT in
 	ext2|ext3|ext4)
@@ -145,6 +147,35 @@
 		esac
 		;;
 
+	ubuntu-image)
+		case "$ARCH+${SUBARCH:-}" in
+			amd64+*)
+				MODEL=pc-amd64 ;;
+			i386+*)
+				MODEL=pc-i386 ;;
+			arm64+snapdragon)
+				MODEL=dragonboard ;;
+			armhf+raspi2)
+				MODEL=pi2 ;;
+			armhf+raspi3)
+				MODEL=pi3 ;;
+			*)
+				echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
+				exit 1
+				;;
+		esac
+		echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
+		# Store model assertion in top dir to get it picked up later as a build artifact
+		env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > livecd."$PROJECT".model-assertion
+		echo "Configured ubuntu-image for the following model assertion:"
+		cat livecd."$PROJECT".model-assertion
+		echo "----------------------------------------------------------"
+		# Fake finished configuration for lb build
+		mkdir -p .build
+		touch .build/config
+		exit 0
+		;;
+
 	*)
 		case $PROJECT in
 			ubuntu-server|ubuntu-touch|ubuntu-touch-custom)