From patchwork Sat Jun 2 02:40:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 1789 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id C0DAA60603 for ; Fri, 1 Jun 2018 18:40:15 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 58FC810D19D7; Fri, 1 Jun 2018 17:40:14 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1527871215; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:list-id: list-unsubscribe:list-subscribe:list-post; bh=/6ZR2j3iI+/te8uhkCPF+JzdifsPABI4foDZRBFyx1U=; b=obczp+k1NiQ5+o4DMNqJcKQHFS/sSmGhuevQTOzCfFBpCFy0888ytr8fHRr2snXfretwPw dnE6sm7XIe6u168WBkmhVCrJPGkHxf1UU7S+kKaH0o9p12K7XI+Yzg4IneP5dmD2O/7LSd PRLS011EUrUMSfMwjbVna+FuOVwTQG7BC5x4jXKz/DHEO831SgN7iEExExbTZjQ7YtXAo0 Mrxxq7VEJCdgID5/3Naixre/ENu+/l2F3J3gFXBec65lMji11Xlh5usfFU+ZOo96vAJce9 3Zpc+/TL9m9oIwiGd3+FRKy4iLortnvdL3cFZRrKYmKOYxLm3jklJ8QFOt643w== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=mfischer smtp.mailfrom=matthias.fischer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1527871211; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=/6ZR2j3iI+/te8uhkCPF+JzdifsPABI4foDZRBFyx1U=; b=dCkmkbPhI3aQ10J36trzCp14KvCOFetzkcCJS7G4P0hSNqc0UiOZHnfJ/RXHpQNwENmpPD VQUqmYgAA12tCxLPeBsuYjc5zv9TlqSP+eFQ7gnD0lPoIThr1d1PdV5UHcSW8ohgYSltpS khNNQKpzwjsfu2NWvA2Tx1uZ1Ikc9dQB08JlxqbI78oNtmmHS6TiFz09qLTcaBBgE6wR/s CM6ovNdGCCkHigGx6B2mKH07WCpidHKMxJ+NN7zL7Ec8tTZFcoRU1a2+a+J21YMtsKLy11 OBmTRHtzLjg2hD+59DMQMsCw+jz1eR0KhWKAMCyw3ouo2ORAALXjYoZ+LeFBNQ== Received: from Devel.localdomain (p5B0A2E81.dip0.t-ipconnect.de [91.10.46.129]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 75FD010D19C0 for ; Fri, 1 Jun 2018 17:40:11 +0100 (BST) From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] tar: Update to 1.30 (V3) Date: Fri, 1 Jun 2018 18:40:07 +0200 Message-Id: <20180601164007.2478-1-matthias.fischer@ipfire.org> X-Mailer: git-send-email 2.17.1 X-Spamd-Result: default: False [-4.96 / 11.00]; ASN(0.00)[asn:3320, ipnet:91.0.0.0/10, country:DE]; DKIM_SIGNED(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; RCPT_COUNT_ONE(0.00)[1]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; NEURAL_HAM(-2.86)[-0.953,0] X-Spam-Status: No, score=-4.96 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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=/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 00f185d81..6382034b5 100644 --- 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 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 #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 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 @@ 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)