From d467c9238826ad23d2905728120aa5b2751aef61 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 11 Aug 2015 18:18:58 +0200
Subject: [PATCH] Import patches-unapplied version 2.338 to
 ubuntu/wily-proposed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Imported using git-ubuntu import.

Changelog parent: 3dd0e68f99222548009f61d719bff8abbe1d015f

New changelog entries:
  [ Łukasz Zemczak ]
  * merge lp:~sil2100/livecd-rootfs/deb-src_for_extra_ppas,
  In case of extra PPAs also include the deb-src entry in the sources list.
  (LP: #1482703)
  [ Oliver Grawert ]
  * add the apparmor-super-noise change to get extra detailed info about all
  apparmor operations in the ubuntu-touch build logs
---
 debian/changelog                              | 12 ++++++++++
 live-build/auto/config                        |  7 +++++-
 .../90-precompile-apparmor-policies.chroot    | 23 ++++++++++++++++++-
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd9736e5..0bd7d0a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+livecd-rootfs (2.338) wily; urgency=medium
+
+  [ Łukasz Zemczak ]
+  * merge lp:~sil2100/livecd-rootfs/deb-src_for_extra_ppas,
+  In case of extra PPAs also include the deb-src entry in the sources list.
+  (LP: #1482703)
+  [ Oliver Grawert ]
+  * add the apparmor-super-noise change to get extra detailed info about all
+  apparmor operations in the ubuntu-touch build logs
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 11 Aug 2015 18:18:58 +0200
+
 livecd-rootfs (2.336) wily; urgency=medium
 
   * make apparmor precompilation more verbose, list the dir contents of
diff --git a/live-build/auto/config b/live-build/auto/config
index 1c9cc697..1f569376 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -690,7 +690,12 @@ if [ "$EXTRA_PPAS" ]; then
 			;;
 		esac
 		extra_ppa_fingerprint="$(/usr/share/livecd-rootfs/get-ppa-fingerprint "$extra_ppa")"
-		echo "deb http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main" >> config/archives/extra-ppas.list.chroot
+
+		cat >> config/archives/extra-ppas.list.chroot <<EOF
+deb http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main
+deb-src http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main
+EOF
+
 		if [ -n "$extra_ppa_pin" ]; then
 		    extra_ppa_origin="LP-PPA-$(echo $extra_ppa | sed -e 's,/ppa$,,' -e 's,/,-,')"
 		    echo "Package: *" >> config/archives/extra-ppas.pref.chroot
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 dc94e56d..ac1a7c26 100755
--- a/live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot
+++ b/live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot
@@ -2,6 +2,16 @@
 
 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 '*/\.*'`
 
@@ -12,6 +22,14 @@ 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
@@ -50,4 +68,7 @@ for manifest in /var/lib/apparmor/clicks/*; do
 	fi
 done
 
-ls -l /custom/cache/apparmor/
+echo "I: Content of the final apparmor files:"
+ls -lR /custom
+ls -lR /var/lib/apparmor
+ls -lR /var/cache/apparmor