From 0f5bec4b551e80a188694cdc87ffe30cbf194d72 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 12 Aug 2015 12:17:51 +0200
Subject: [PATCH] Import patches-unapplied version 2.339 to
 ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: d467c9238826ad23d2905728120aa5b2751aef61

New changelog entries:
  * revert the apparmor-super-noise change, issue is found
  * touch the cache files during build to prevent timestamp issues in the future
  * drop copying of zip files of the android package, we do not generate these
    anymore.
---
 debian/changelog                              |  9 +++++++
 live-build/auto/build                         |  4 ---
 .../90-precompile-apparmor-policies.chroot    | 27 +++----------------
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0bd7d0a8..13390670 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.339) wily; urgency=medium
+
+  * revert the apparmor-super-noise change, issue is found
+  * touch the cache files during build to prevent timestamp issues in the future
+  * drop copying of zip files of the android package, we do not generate these
+    anymore.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 12 Aug 2015 12:17:51 +0200
+
 livecd-rootfs (2.338) wily; urgency=medium
 
   [ Łukasz Zemczak ]
diff --git a/live-build/auto/build b/live-build/auto/build
index 97523cb6..40968052 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -473,10 +473,6 @@ if [ "$PROJECT" = "ubuntu-touch" ]; then
 				"${PREFIX}.boot-armhf+${subarch}.img"
 			# drop this following line once cdimage can handle -boot-*.img
 			cp -v "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
-
-			# Android 4.4.2 based images do not ship a .zip file, do not fail if it does not exist
-			cp -v chroot/usr/share/android/product/*-preinstalled-touch-armel+${subarch}.zip\
-				"${PREFIX}.armel+${subarch}.zip" || true
 		done
 	fi
 	if [ "$ARCH" = "i386" ]; then
diff --git a/live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot b/live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot
index ac1a7c26..de9cbbf4 100755
--- a/live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot
+++ b/live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot
@@ -2,16 +2,6 @@
 
 FEATURES=/var/cache/apparmor/.features
 
-echo "date is: `date`"
-
-touch /custom/cache/apparmor/test-timestamp.before
-echo "I: Content of the /custom dir before apparmor runs:"
-ls -lR /custom
-
-echo "I: Content of the apparmor caches before:"
-ls -lR /var/lib/apparmor
-ls -lR /var/cache/apparmor
-
 echo "I: precompiling click apparmor policies"
 /sbin/apparmor_parser -v -M ${FEATURES} -Q --write-cache --cache-loc=/var/cache/apparmor/ `find /var/lib/apparmor/profiles/ -maxdepth 1 -type f -not -path '*/\.*'`
 
@@ -22,15 +12,6 @@ echo "I: precompiling custom click apparmor policies"
 mkdir -p /custom/cache/apparmor
 /sbin/apparmor_parser -v -M ${FEATURES} -Q --write-cache --cache-loc=/custom/cache/apparmor/ `find /var/lib/apparmor/profiles/ -maxdepth 1 -type f -not -path '*/\.*'`
 
-touch /custom/cache/apparmor/test-timestamp.after
-echo "I: Content of the /custom dir after apparmor ran:"
-ls -lR /custom
-
-echo "I: Content of the apparmor caches after:"
-ls -lR /var/lib/apparmor
-ls -lR /var/cache/apparmor
-
-
 #get the apparmor manifests and profiles
 mkdir -p /custom/lib/apparmor/clicks
 mkdir -p /custom/lib/apparmor/profiles
@@ -68,7 +49,7 @@ for manifest in /var/lib/apparmor/clicks/*; do
 	fi
 done
 
-echo "I: Content of the final apparmor files:"
-ls -lR /custom
-ls -lR /var/lib/apparmor
-ls -lR /var/cache/apparmor
+ls -l /custom/cache/apparmor/
+echo "I: touching cache files to sanitize possible timestamp issues"
+touch /custom/cache/apparmor/*
+ls -l /custom/cache/apparmor/