From a43bfeffcf88a1db3d9e6dd5ac29a0667571222b Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 10 Mar 2015 16:22:24 +0100 Subject: [PATCH] remove all .override files inside the chroot to not kill the buildd --- debian/changelog | 7 ++++++- live-build/auto/build | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 002b50b0..1943487d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ livecd-rootfs (2.293) UNRELEASED; urgency=low + [ Michael Vogt ] * live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot: - remove libpython2.7 and friends as welll - -- Michael Vogt Tue, 10 Mar 2015 12:22:37 +0100 + [ 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 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))