Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-07 17:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Imported using git-ubuntu import.

Changelog parent: d467c9238826ad23d2905728120aa5b2751aef61

New changelog entries:
  * revert the apparmor-super-noise change, issue is found
  * touch the cache files during build to prevent timestamp issues in the future
  * drop copying of zip files of the android package, we do not generate these
    anymore.
This commit is contained in:
Oliver Grawert 2015-08-12 12:17:51 +02:00 committed by usd-importer
parent d467c92388
commit 0f5bec4b55
3 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (2.339) wily; urgency=medium
* revert the apparmor-super-noise change, issue is found
* touch the cache files during build to prevent timestamp issues in the future
* drop copying of zip files of the android package, we do not generate these
anymore.
-- Oliver Grawert <ogra@ubuntu.com> Wed, 12 Aug 2015 12:17:51 +0200
livecd-rootfs (2.338) wily; urgency=medium livecd-rootfs (2.338) wily; urgency=medium
[ Łukasz Zemczak ] [ Łukasz Zemczak ]

4
live-build/auto/build
View File

@ -473,10 +473,6 @@ if [ "$PROJECT" = "ubuntu-touch" ]; then
"${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.boot-armhf+${subarch}.img"
# drop this following line once cdimage can handle -boot-*.img # drop this following line once cdimage can handle -boot-*.img
cp -v "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}" cp -v "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
# Android 4.4.2 based images do not ship a .zip file, do not fail if it does not exist
cp -v chroot/usr/share/android/product/*-preinstalled-touch-armel+${subarch}.zip\
"${PREFIX}.armel+${subarch}.zip" || true
done done
fi fi
if [ "$ARCH" = "i386" ]; then if [ "$ARCH" = "i386" ]; then

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

@ -2,16 +2,6 @@
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 '*/\.*'`
@ -22,15 +12,6 @@ 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
mkdir -p /custom/lib/apparmor/profiles mkdir -p /custom/lib/apparmor/profiles
@ -68,7 +49,7 @@ for manifest in /var/lib/apparmor/clicks/*; do
fi fi
done done
echo "I: Content of the final apparmor files:" ls -l /custom/cache/apparmor/
ls -lR /custom echo "I: touching cache files to sanitize possible timestamp issues"
ls -lR /var/lib/apparmor touch /custom/cache/apparmor/*
ls -lR /var/cache/apparmor ls -l /custom/cache/apparmor/