Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 03:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

12
debian/changelog vendored
View File

@ -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 livecd-rootfs (2.336) wily; urgency=medium
* make apparmor precompilation more verbose, list the dir contents of * make apparmor precompilation more verbose, list the dir contents of

7
live-build/auto/config
View File

@ -690,7 +690,12 @@ if [ "$EXTRA_PPAS" ]; then
;; ;;
esac esac
extra_ppa_fingerprint="$(/usr/share/livecd-rootfs/get-ppa-fingerprint "$extra_ppa")" 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 if [ -n "$extra_ppa_pin" ]; then
extra_ppa_origin="LP-PPA-$(echo $extra_ppa | sed -e 's,/ppa$,,' -e 's,/,-,')" extra_ppa_origin="LP-PPA-$(echo $extra_ppa | sed -e 's,/ppa$,,' -e 's,/,-,')"
echo "Package: *" >> config/archives/extra-ppas.pref.chroot echo "Package: *" >> config/archives/extra-ppas.pref.chroot

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

@ -2,6 +2,16 @@
FEATURES=/var/cache/apparmor/.features 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" 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 '*/\.*'` /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 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 '*/\.*'` /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 #get the apparmor manifests and profiles
mkdir -p /custom/lib/apparmor/clicks mkdir -p /custom/lib/apparmor/clicks
@ -50,4 +68,7 @@ for manifest in /var/lib/apparmor/clicks/*; do
fi fi
done 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