From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] tar: Update to 1.30 (V3)
Date: Fri, 01 Jun 2018 18:40:07 +0200
Message-ID: <20180601164007.2478-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7872331957927070875=="
List-Id: <development.lists.ipfire.org>

--===============7872331957927070875==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

For details see:
https://www.gnu.org/software/tar/

Since new 'tar' has changes in commandline option parsing,
it was necessary to adjust 'lfs/Config, 'lfs/cdrom' and
'lfs/core-updates' (thanks to Marcel for diffs and Michael for
corrections).

I have tried to make only the most necessary changes.

As always, please check.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 lfs/Config       | 6 ++----
 lfs/cdrom        | 5 ++---
 lfs/core-updates | 7 +++----
 lfs/tar          | 6 +++---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/lfs/Config b/lfs/Config
index 1cb9e2db4..9a1e7797f 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -205,11 +205,9 @@ define PAK
 	sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE=
/$(BUILD_ARCH)/g' -i /install/packages/package/ROOTFILES
 	sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
 	chmod 755 /install/packages/package/{{,un}install,update}.sh
-	cd / && tar cf /install/packages/package/files.tmp --files-from=3D/install/=
packages/package/ROOTFILES --exclude=3D'#*' \
-		-p --numeric-owner
+	cd / && tar cfp /install/packages/package/files.tmp --numeric-owner --exclu=
de=3D'#*' --files-from=3D/install/packages/package/ROOTFILES
 	# Double tar to remove double files
-	tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp=
/ \
-		-p --numeric-owner
+	tar xfp /install/packages/package/files.tmp --numeric-owner -C /install/pac=
kages/package/tmp/
 	rm -f /install/packages/package/files.tmp
 	cd /install/packages/package/tmp/ && tar cf - -p --numeric-owner * | xz $(X=
Z_OPT) > /install/packages/package/files.tar.xz
 	rm -r /install/packages/package/tmp
diff --git a/lfs/cdrom b/lfs/cdrom
index 00f185d81..6382034b5 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -65,9 +65,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
=20
 	# Compress root filesystem
 	# Reason for this tar+untar+tar is removing of entries listed two or more i=
n src/ROOTFILES
-	tar -c -C / --files-from=3D/tmp/ROOTFILES \
-		-f /$(SNAME).tar --exclude=3D'#*' --exclude=3D'dev/pts/*' \
-		--exclude=3D'proc/*' --exclude=3D'tmp/ROOTFILES'
+	tar -c --exclude=3D'#*' --exclude=3D'proc/*' --exclude=3D'dev/pts/*' --excl=
ude=3D'tmp/ROOTFILES' \
+		-C / --files-from=3D/tmp/ROOTFILES -f /$(SNAME).tar
 	rm -f /tmp/ROOTFILES
 	tar -x -C /tmp -f /$(SNAME).tar
 	rm -f /$(SNAME).tar
diff --git a/lfs/core-updates b/lfs/core-updates
index d34926967..3d12d40b1 100644
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -72,10 +72,9 @@ core/%:
 	sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
=20
 	#Remove doubled files with tar/untar/tar to save space
-	tar -c -C / --files-from=3D/tmp/ROOTFILES \
-		-f /$(SNAME).tar --exclude=3D'#*' --exclude=3D'dev/pts/*' \
-		--exclude=3D'proc/*' --exclude=3D'tmp/ROOTFILES' \
-		--exclude-from=3D$(DIR_SRC)/config/rootfiles/$@/exclude
+	tar -c --exclude=3D'proc/*' --exclude=3D'tmp/ROOTFILES' --exclude=3D'#*' --=
exclude=3D'dev/pts/*' \
+		--exclude-from=3D$(DIR_SRC)/config/rootfiles/$@/exclude \
+		-C / --files-from=3D/tmp/ROOTFILES -f /$(SNAME).tar
 	mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES
 	tar -p --numeric-owner -x  -C /tmp -f /$(SNAME).tar
 	rm -f /$(SNAME).tar
diff --git a/lfs/tar b/lfs/tar
index 6a949a003..4e914b535 100644
--- a/lfs/tar
+++ b/lfs/tar
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                    =
  #
+# Copyright (C) 2018  Michael Tremer & Christian Schmidt                    =
  #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 1.28
+VER        =3D 1.30
=20
 THISAPP    =3D tar-$(VER)
 DL_FILE    =3D $(THISAPP).tar.bz2
@@ -50,7 +50,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 8f32b2bc1ed7ddf4cf4e4a39711341b0
+$(DL_FILE)_MD5 =3D 8404e4c1fc5a3000228ab2b8ad674a65
=20
 install : $(TARGET)
=20
--=20
2.17.1


--===============7872331957927070875==--