From 3db2340c545b30788becc596b674b26ec4b03669 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Wed, 1 Aug 2018 18:02:13 -0700
Subject: [PATCH] generate all tar files with --xattrs.  LP: #1302192.

---
 debian/changelog                                 | 6 ++++++
 live-build/auto/build                            | 4 ++--
 live-build/ubuntu-cpc/hooks/031-1-root-xz.binary | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index edc5317a..9c3e0dfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.534) UNRELEASED; urgency=medium
+
+  * generate all tar files with --xattrs.  LP: #1302192.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 01 Aug 2018 17:59:41 -0700
+
 livecd-rootfs (2.533) cosmic; urgency=medium
 
   [ Robert C Jennings ]
diff --git a/live-build/auto/build b/live-build/auto/build
index 519ce1e7..c71b7b10 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -490,7 +490,7 @@ for ISO in binary.iso binary.hybrid.iso; do
 done
 
 if [ -e "binary/$INITFS/filesystem.dir" ]; then
-	(cd "binary/$INITFS/filesystem.dir/" && tar -c *) | \
+	(cd "binary/$INITFS/filesystem.dir/" && tar -c --xattrs *) | \
 		gzip -9 --rsyncable > "$PREFIX.rootfs.tar.gz"
 	chmod 644 "$PREFIX.rootfs.tar.gz"
 elif [ -e binary-tar.tar.gz ]; then
@@ -527,7 +527,7 @@ EOF
 fi
 
 if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
-	(cd "binary/$INITFS/custom.dir/" && tar -c *) | \
+	(cd "binary/$INITFS/custom.dir/" && tar -c --xattrs *) | \
 		gzip -9 --rsyncable > "$PREFIX.custom.tar.gz"
 	chmod 644 "$PREFIX.custom.tar.gz"
 fi
diff --git a/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary b/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary
index fab8a834..5695f96d 100755
--- a/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary
+++ b/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary
@@ -12,4 +12,4 @@ fi
 rootfs_dir=rootfs.dir
 
 cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest
-(cd $rootfs_dir/ && tar -c *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz
+(cd $rootfs_dir/ && tar -c --xattrs *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz