tar: Update to 1.30 (V3)

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@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/Config b/lfs/Config
index 76f732de8a618dac34108c0fccd7aea70a6802c7..82bdde066a991ca0629df53c81758a2f036093b6 100644 (file)
--- 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=/install/packages/package/ROOTFILES --exclude='#*' \
-               -p --numeric-owner
+       cd / && tar cfp /install/packages/package/files.tmp --numeric-owner --exclude='#*' --files-from=/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/packages/package/tmp/
        rm -f /install/packages/package/files.tmp
        cd /install/packages/package/tmp/ && tar cf - -p --numeric-owner * | xz $(XZ_OPT) > /install/packages/package/files.tar.xz
        rm -r /install/packages/package/tmp

diff --git a/lfs/cdrom b/lfs/cdrom
index 00f185d817283cf2c0cc1e693d748afb69879cdf..6382034b54f4c76063e19bf0b30f8b312641a742 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -65,9 +65,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # Compress root filesystem
        # Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
-       tar -c -C / --files-from=/tmp/ROOTFILES \
-               -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
-               --exclude='proc/*' --exclude='tmp/ROOTFILES'
+       tar -c --exclude='#*' --exclude='proc/*' --exclude='dev/pts/*' --exclude='tmp/ROOTFILES' \
+               -C / --files-from=/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 d3492696726578c4b015c06e407ea2a88ffeb444..3d12d40b1a01197f81183c5ca650fe28c01cc27b 100644 (file)
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -72,10 +72,9 @@ core/%:
        sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
 
        #Remove doubled files with tar/untar/tar to save space
-       tar -c -C / --files-from=/tmp/ROOTFILES \
-               -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
-               --exclude='proc/*' --exclude='tmp/ROOTFILES' \
-               --exclude-from=$(DIR_SRC)/config/rootfiles/$@/exclude
+       tar -c --exclude='proc/*' --exclude='tmp/ROOTFILES' --exclude='#*' --exclude='dev/pts/*' \
+               --exclude-from=$(DIR_SRC)/config/rootfiles/$@/exclude \
+               -C / --files-from=/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 6a949a003fbd274b7dc826172988745808e294ad..4e914b535e0f7892e24b4e53475ae862982d054b 100644 (file)
--- 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 @@
 
 include Config
 
-VER        = 1.28
+VER        = 1.30
 
 THISAPP    = tar-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8f32b2bc1ed7ddf4cf4e4a39711341b0
+$(DL_FILE)_MD5 = 8404e4c1fc5a3000228ab2b8ad674a65
 
 install : $(TARGET)