From 44705028bfe4995ae21b2a3a02829971f3e4a705 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 15 Oct 2014 17:12:23 +0100 Subject: [PATCH] Import patches-unapplied version 2.256 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: 02cb6ca7cfda02bb0e4c5c4cb0a9327593647663 New changelog entries: * Fix directory layout of custom tarball. --- debian/changelog | 6 ++++++ live-build/ubuntu-touch/hooks/60-install-click.binary | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 70b74dfd..05cfde04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.256) utopic; urgency=medium + + * Fix directory layout of custom tarball. + + -- Colin Watson Wed, 15 Oct 2014 17:12:23 +0100 + livecd-rootfs (2.255) utopic; urgency=medium [ Steve Langasek ] diff --git a/live-build/ubuntu-touch/hooks/60-install-click.binary b/live-build/ubuntu-touch/hooks/60-install-click.binary index c57b372e..25b1d71a 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.binary +++ b/live-build/ubuntu-touch/hooks/60-install-click.binary @@ -5,5 +5,5 @@ set -e echo "Splitting out custom tarball" rm -f binary/boot/custom.dir -mkdir binary/boot/custom.dir -mv binary/boot/filesystem.dir/custom binary/boot/custom.dir/custom +mkdir -p binary/boot/custom.dir/system +mv binary/boot/filesystem.dir/custom binary/boot/custom.dir/system/custom