From a1743f955866f4e9ec36a7de44356bda63c353f4 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 26 Jun 2015 10:43:07 +0200 Subject: [PATCH] Import patches-unapplied version 2.319 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: d286b4fed10a132f337d78ff064e6455256c3567 New changelog entries: * copy set locale hook from core to desktop-next [ Sergio Schvezov ] * removing debian packaging artifacts from the image --- debian/changelog | 9 +++++++ .../ubuntu-core/hooks/600-no-debian.binary | 24 +++++++++++++++++++ .../hooks/13-set-locale.chroot | 7 ++++++ 3 files changed, 40 insertions(+) create mode 100755 live-build/ubuntu-core/hooks/600-no-debian.binary create mode 100644 live-build/ubuntu-desktop-next/hooks/13-set-locale.chroot diff --git a/debian/changelog b/debian/changelog index 86d8ff20..569e3e2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.319) wily; urgency=medium + + * copy set locale hook from core to desktop-next + + [ Sergio Schvezov ] + * removing debian packaging artifacts from the image + + -- Sebastien Bacher Fri, 26 Jun 2015 10:43:07 +0200 + livecd-rootfs (2.318) wily; urgency=medium * merge lp:~sergiusens/livecd-rootfs/no-walinuxagent to remove all the diff --git a/live-build/ubuntu-core/hooks/600-no-debian.binary b/live-build/ubuntu-core/hooks/600-no-debian.binary new file mode 100755 index 00000000..5b02e5d9 --- /dev/null +++ b/live-build/ubuntu-core/hooks/600-no-debian.binary @@ -0,0 +1,24 @@ +#!/bin/sh +# +# removing debian packaging artifacts + +set -ex + +echo "I: Removing the debian legacy" + +PREFIX=binary/boot/filesystem.dir + +# dpkg-deb and dpkg purposefully left behind +(cd $PREFIX + chroot . dpkg --purge apt + rm -r \ + var/lib/dpkg \ + var/log/apt + rm \ + usr/bin/dpkg-query \ + usr/bin/dpkg-split \ + usr/bin/dpkg-divert \ + usr/bin/dpkg-trigger \ + usr/bin/dpkg-statoverride \ + usr/bin/dpkg-maintscript-helper +) diff --git a/live-build/ubuntu-desktop-next/hooks/13-set-locale.chroot b/live-build/ubuntu-desktop-next/hooks/13-set-locale.chroot new file mode 100644 index 00000000..0ac33906 --- /dev/null +++ b/live-build/ubuntu-desktop-next/hooks/13-set-locale.chroot @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +cat >/etc/default/locale<