Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-20 15:21:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.336 to ubuntu/wily-proposed

Browse Source 
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.
This commit is contained in:
Oliver Grawert 2015-08-11 11:29:01 +02:00 committed by usd-importer
parent f4d2a993b3
commit 3dd0e68f99
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 <ogra@ubuntu.com> Tue, 11 Aug 2015 11:29:01 +0200
livecd-rootfs (2.335) wily; urgency=medium livecd-rootfs (2.335) wily; urgency=medium
* Attempt to build Ubuntu image using metapackages instead of tasks; this * Attempt to build Ubuntu image using metapackages instead of tasks; this

8
live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot
View File

@ -3,14 +3,14 @@
FEATURES=/var/cache/apparmor/.features FEATURES=/var/cache/apparmor/.features
echo "I: precompiling click apparmor policies" 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" 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" echo "I: precompiling custom click apparmor policies"
mkdir -p /custom/cache/apparmor 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 #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" rm -f "/custom/cache/apparmor/click_$profile"
fi fi
done done
ls -l /custom/cache/apparmor/