From 93deed0c3adb0eeae258892a9545a78528abdfd5 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 12 Aug 2015 12:16:58 +0200
Subject: [PATCH] revert the debugging code in the apparmor cache generation,
 touch the cache files to sanitize the timestamps

---
 debian/changelog                              |  7 +++++
 .../90-precompile-apparmor-policies.chroot    | 27 +++----------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0bd7d0a8..419c0b31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.339) UNRELEASED; urgency=medium
+
+  * revert the apparmor-super-noise change, issue is found
+  * touch the cache files during build to prevent timestamp issues in the future
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 12 Aug 2015 12:14:47 +0200
+
 livecd-rootfs (2.338) wily; urgency=medium
 
   [ Łukasz Zemczak ]
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/