livecd-rootfs

Merge lp:~vorlon/livecd-rootfs/lp.1302192 into lp:livecd-rootfs

  1. lp.1302192
  2. Merge into trunk
Proposed by Steve Langasek
Status: Merged
Merged at revision: 1689
Proposed branch: lp:~vorlon/livecd-rootfs/lp.1302192
Merge into: lp:livecd-rootfs
Diff against target: 45 lines (+9/-3)
3 files modified
debian/changelog (+6/-0)
live-build/auto/build (+2/-2)
live-build/ubuntu-cpc/hooks/031-1-root-xz.binary (+1/-1)
To merge this branch: bzr merge lp:~vorlon/livecd-rootfs/lp.1302192
Reviewer Review Type Date Requested Status
Brian Murray Approve
Robert C Jennings (community) Approve
Review via email: mp+352055@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert C Jennings (rcj) wrote :

+1

review: Approve
Revision history for this message
Brian Murray (brian-murray) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2018-07-18 17:07:30 +0000
3+++ debian/changelog 2018-08-02 03:53:59 +0000
4@@ -1,3 +1,9 @@
5+livecd-rootfs (2.534) UNRELEASED; urgency=medium
6+
7+ * generate all tar files with --xattrs. LP: #1302192.
8+
9+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 01 Aug 2018 17:59:41 -0700
10+
11 livecd-rootfs (2.533) cosmic; urgency=medium
12
13 [ Robert C Jennings ]
14
15=== modified file 'live-build/auto/build'
16--- live-build/auto/build 2018-07-04 15:48:23 +0000
17+++ live-build/auto/build 2018-08-02 03:53:59 +0000
18@@ -490,7 +490,7 @@
19 done
20
21 if [ -e "binary/$INITFS/filesystem.dir" ]; then
22- (cd "binary/$INITFS/filesystem.dir/" && tar -c *) | \
23+ (cd "binary/$INITFS/filesystem.dir/" && tar -c --xattrs *) | \
24 gzip -9 --rsyncable > "$PREFIX.rootfs.tar.gz"
25 chmod 644 "$PREFIX.rootfs.tar.gz"
26 elif [ -e binary-tar.tar.gz ]; then
27@@ -527,7 +527,7 @@
28 fi
29
30 if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
31- (cd "binary/$INITFS/custom.dir/" && tar -c *) | \
32+ (cd "binary/$INITFS/custom.dir/" && tar -c --xattrs *) | \
33 gzip -9 --rsyncable > "$PREFIX.custom.tar.gz"
34 chmod 644 "$PREFIX.custom.tar.gz"
35 fi
36
37=== modified file 'live-build/ubuntu-cpc/hooks/031-1-root-xz.binary'
38--- live-build/ubuntu-cpc/hooks/031-1-root-xz.binary 2018-06-07 23:24:29 +0000
39+++ live-build/ubuntu-cpc/hooks/031-1-root-xz.binary 2018-08-02 03:53:59 +0000
40@@ -12,4 +12,4 @@
41 rootfs_dir=rootfs.dir
42
43 cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest
44-(cd $rootfs_dir/ && tar -c *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz
45+(cd $rootfs_dir/ && tar -c --xattrs *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz

Subscribers

People subscribed via source and target branches