From 8c784360c6c16add140b69121218cbc7bffc9521 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 19 Jul 2016 13:59:16 +0200
Subject: [PATCH] Import patches-unapplied version 2.420 to
 ubuntu/yakkety-proposed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Imported using git-ubuntu import.

Changelog parent: 4109c1c2b360322778ac7f8d8659c51b2fc8f048

New changelog entries:
  [ Łukasz 'sil2100' Zemczak ]
  * Remove the ubuntu-pd project from the scripts
  * Add instead an ubuntu-touch-custom project for custom re-builds of
    ubuntu-touch
  [ Oliver Grawert ]
  * sanitize the version number of the ubuntu-core snap
  * sanitize the version number of the kernel snap
---
 debian/changelog                              | 13 +++++++++++++
 live-build/auto/build                         | 12 +++++++-----
 live-build/auto/config                        | 17 ++++++-----------
 live-build/{ubuntu-pd => ubuntu-touch-custom} |  0
 4 files changed, 26 insertions(+), 16 deletions(-)
 rename live-build/{ubuntu-pd => ubuntu-touch-custom} (100%)

diff --git a/debian/changelog b/debian/changelog
index 29528186..b2bffaf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+livecd-rootfs (2.420) yakkety; urgency=medium
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Remove the ubuntu-pd project from the scripts
+  * Add instead an ubuntu-touch-custom project for custom re-builds of
+    ubuntu-touch 
+
+  [ Oliver Grawert ]
+  * sanitize the version number of the ubuntu-core snap
+  * sanitize the version number of the kernel snap
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 19 Jul 2016 13:59:16 +0200
+
 livecd-rootfs (2.419) yakkety; urgency=medium
 
   [ Daniel Watkins ]
diff --git a/live-build/auto/build b/live-build/auto/build
index 1f62ce50..0ce13893 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -178,7 +178,7 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS
 			> chroot/etc/apt/sources.list
 		rm chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig
 	fi
-	if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
+	if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
 		if [ "$ARCH" = "armhf" ]; then
 			INFO_DESC="$(lsb_release -d -s)"
 			echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info
@@ -257,7 +257,9 @@ if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then
             mkdir -p $rootfs/$dir
         done
 
-        VERSION="$(lsb_release -r -s)+$(date +20%y%m%d.%H-%M)"
+        # get a proper version from the chroot
+        . $rootfs/etc/os-release
+        VERSION="$(echo $PRETTY_NAME | sed 's/[^0-9.]*//g')"
 
         CORENAME="ubuntu-core"
         cat > $rootfs/meta/snap.yaml <<EOF
@@ -276,7 +278,7 @@ EOF
     fi
 fi
 
-if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
+if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
 	(cd "binary/$INITFS/custom.dir/" && tar -c *) | \
 		gzip -9 --rsyncable > "$PREFIX.custom.tar.gz"
 	chmod 644 "$PREFIX.custom.tar.gz"
@@ -508,7 +510,7 @@ EOF
         ln -s $kernel kernel.img
         kvers="$(ls vmlinuz-*|sed 's/^.*vmlinuz-//;s/-[a-z.]*$//')"
 
-        VERSION=$kvers+$(date +20%y%m%d.%H-%M)
+        VERSION=$kvers
 
         cat > meta/kernel.yaml <<EOF
 version: $kvers
@@ -635,7 +637,7 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
 
 fi
 
-if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
+if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
 	sourceslist="chroot/etc/apt/sources.list"
 
 	lb chroot_proc install "$@"
diff --git a/live-build/auto/config b/live-build/auto/config
index d254c307..da5f387d 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -135,7 +135,7 @@ case $IMAGEFORMAT in
 
 	*)
 		case $PROJECT in
-			ubuntu-server|ubuntu-touch|ubuntu-pd)
+			ubuntu-server|ubuntu-touch|ubuntu-touch-custom)
 				;;
 			*)
 				add_package live lupin-casper
@@ -168,7 +168,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
 		ubuntu-server)
 			add_package live oem-config-debconf ubiquity-frontend-debconf
 			;;
-		ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-pd|ubuntu-cpc|ubuntu-desktop-next)
+		ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom|ubuntu-cpc|ubuntu-desktop-next)
 			;;
 		*)
 			add_package live oem-config-gtk ubiquity-frontend-gtk
@@ -404,19 +404,14 @@ case $PROJECT in
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;
 
-	ubuntu-touch|ubuntu-pd)
-		if [ "$PROJECT" = "ubuntu-touch" ]; then
-			meta_package=ubuntu-touch
-		else
-			meta_package=ubuntu-pocket-desktop
-		fi
+	ubuntu-touch|ubuntu-touch-custom)
 		HINTS="packagekit ubuntu-system-settings-online-accounts"
 		case $ARCH in
 		    amd64|i386)
 			HINTS="$HINTS qml-module-ubuntu-components-gles unity8"
 			;;
 		esac
-		add_package install ubuntu-minimal $meta_package $HINTS
+		add_package install ubuntu-minimal ubuntu-touch $HINTS
 
 		COMPONENTS='main restricted universe'
 		BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
@@ -554,7 +549,7 @@ case $ARCH in
 esac
 
 case $PROJECT in
-	ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-pd)
+	ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-touch-custom)
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
 		KERNEL_FLAVOURS=none
 		BINARY_REMOVE_LINUX=false
@@ -734,7 +729,7 @@ EOF
 		fi
 		;;
 
-	ubuntu-touch:*|ubuntu-pd:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
+	ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
 		cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
 			config/
 		;;
diff --git a/live-build/ubuntu-pd b/live-build/ubuntu-touch-custom
similarity index 100%
rename from live-build/ubuntu-pd
rename to live-build/ubuntu-touch-custom