diff --git a/debian/changelog b/debian/changelog index a5a54900..5726f4c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +livecd-rootfs (2.293) vivid; urgency=low + + [ Michael Vogt ] + * live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot: + - remove libpython2.7 and friends as welll + + [ Oliver Grawert ] + * remove all .override files in teh build chroot, else teh buildd machines + fall over. + + -- Oliver Grawert Tue, 10 Mar 2015 16:21:36 +0100 + livecd-rootfs (2.292) vivid; urgency=low [ Michael Vogt ] diff --git a/live-build/auto/build b/live-build/auto/build index 7833560e..6552fb0a 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -479,6 +479,8 @@ if [ "$PROJECT" = "ubuntu-touch" ]; then lb chroot_devpts remove "$@" lb chroot_sysfs remove "$@" lb chroot_proc remove "$@" + + rm -rf chroot/etc/init/*.override fi # LTSP chroot building (only in 32bit and for Edubuntu (DVD)) diff --git a/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot b/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot index cc6ae423..38cacf9e 100644 --- a/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot +++ b/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot @@ -11,4 +11,4 @@ apt-get purge -y locales apt-get purge -y libicu52 # no more py2, yay -apt-get purge -y python python-minimal libpython-stdlib python2.7 +apt-get purge -y python python-minimal libpython-stdlib python2.* libpython2.*