From 3dd0e68f99222548009f61d719bff8abbe1d015f Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 11 Aug 2015 11:29:01 +0200 Subject: [PATCH] Import patches-unapplied version 2.336 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: f4d2a993b3eb872f2b20a55fa69105c878788454 New changelog entries: * make apparmor precompilation more verbose, list the dir contents of /custom/cache/apparmor to see in the build log what has been created. --- debian/changelog | 7 +++++++ .../hooks/90-precompile-apparmor-policies.chroot | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c4aea5b3..fd9736e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.336) wily; urgency=medium + + * make apparmor precompilation more verbose, list the dir contents of + /custom/cache/apparmor to see in the build log what has been created. + + -- Oliver Grawert Tue, 11 Aug 2015 11:29:01 +0200 + livecd-rootfs (2.335) wily; urgency=medium * Attempt to build Ubuntu image using metapackages instead of tasks; this 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 664379b0..dc94e56d 100755 --- a/live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot +++ b/live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot @@ -3,14 +3,14 @@ FEATURES=/var/cache/apparmor/.features echo "I: precompiling click apparmor policies" -/sbin/apparmor_parser -M ${FEATURES} -Q --write-cache --cache-loc=/var/cache/apparmor/ `find /var/lib/apparmor/profiles/ -maxdepth 1 -type f -not -path '*/\.*'` +/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 '*/\.*'` echo "I: precompiling deb apparmor policies" -/sbin/apparmor_parser -M ${FEATURES} -Q --write-cache --cache-loc=/etc/apparmor.d/cache/ `find /etc/apparmor.d/ -maxdepth 1 -type f -not -path '*/\.*'` +/sbin/apparmor_parser -v -M ${FEATURES} -Q --write-cache --cache-loc=/etc/apparmor.d/cache/ `find /etc/apparmor.d/ -maxdepth 1 -type f -not -path '*/\.*'` echo "I: precompiling custom click apparmor policies" mkdir -p /custom/cache/apparmor -/sbin/apparmor_parser -M ${FEATURES} -Q --write-cache --cache-loc=/custom/cache/apparmor/ `find /var/lib/apparmor/profiles/ -maxdepth 1 -type f -not -path '*/\.*'` +/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 '*/\.*'` #get the apparmor manifests and profiles @@ -49,3 +49,5 @@ for manifest in /var/lib/apparmor/clicks/*; do rm -f "/custom/cache/apparmor/click_$profile" fi done + +ls -l /custom/cache/apparmor/