From patchwork Sun Aug 30 16:26:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Neukirchen X-Patchwork-Id: 512243 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CE30D1401E7 for ; Mon, 31 Aug 2015 02:30:07 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 8BBEC28BFEC; Sun, 30 Aug 2015 18:28:24 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id DFE9E28BEB7 for ; Sun, 30 Aug 2015 18:28:19 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from mout.web.de (mout.web.de [212.227.15.3]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sun, 30 Aug 2015 18:28:19 +0200 (CEST) Received: from tenchi-htpc.lan ([91.64.206.38]) by smtp.web.de (mrweb002) with ESMTPSA (Nemesis) id 0MK2FR-1ZWuIG1NqP-001P02 for ; Sun, 30 Aug 2015 18:29:13 +0200 From: Dirk Neukirchen To: openwrt-devel@lists.openwrt.org Date: Sun, 30 Aug 2015 18:26:45 +0200 Message-Id: <1440952005-10523-1-git-send-email-dirkneukirchen@web.de> X-Mailer: git-send-email 2.5.0 X-Provags-ID: V03:K0:5Voe37JyS6pY/nGF3ffifvJy1Ye1n+1E6sDeoZu4HdW/z+cC1vl UV89bpN7A+PWvQZYB7bpkEnPPV93lROl4Q+rhFifnjDavcLNKpzryqQRCxYZ4//KPukSv3g 76e8/Ojp3f9rxUw4ejyOkV8GurHZy7TrzljfZAnTHrN2F/I83ntSQJIXwyLb9vnbC5JIeoy N5U/MeLQckN3aZd71Axvg== X-UI-Out-Filterresults: notjunk:1; V01:K0:+t2aL/hnJB8=:/vtN2vMZgad+l1ZgUxADOx OsGLomlx3cBwn17am9Mt5Fs9y9vNkWF3jeKdy1Nl1cdS5e4au9dotf7Tr9CgmGhixt2iB3eGg Ov0VfWy8j9mxya6SQQ3sJuj3rU52RGqqG1FI5h9GkPmuFskBfKOMokb9ptQ5sm16ypWC1YlwQ v+ZEKX3QgfzXm73iad0tGk2m57O9OfXaUJVCM2vl/AomG2gdWWBj2FkQ70CaUfuh77oum2Hfr ne1QqQHNWN1YCENWWv/4UTYUyMntC27kLTK/4SpTH5bEAbDuBdsN8ICxpuR0K3nk4ok7G68u/ TzvXkHOKp4V4NS3fgAAgPIt5Fnd5vCCelEYFNlSWD3oQTPdRFAQKuXVX1722S+WvLQVeKujQN wlP9xde8TkEGILQdvOcZ9oeCn1lI1R13Whv2E0Fi3oO92Hmlw66DK9Jx+i2dXBIgOdPG1JSD4 2aI/5cyTRwlciRdS43eexCHxcSWle95a04pJowvR/yn4pLPor252Qny7PwdrmX6QnHG/TvWZe 7wMuMAawiaDG63TEW2ow9MnPMfc2NwcO/s3g2BRKfMI/DgauzY4XQurV/bMFWGKREm+p8mvEa C4+q9QyweY4+v2L83sSpakATyvTKQrDLqXC0g+AZKjCqNkei6jNFfwjjUmGEzhWGsjZTet5tF 1iCFqq2xc+rFV56+7ohqkA7LXrXCQm3KIRJ4ZCbP18DA1P1i8z3ZwhJ751YYdYPxf/nnX4NEW s1U5MXxny2zdcHcm Subject: [OpenWrt-Devel] [PATCH] include/image.mk: make tar reproducible X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" several packages reported different file order between builds make binutils, kmod-sched reproducible Signed-off-by: Dirk Neukirchen --- include/image.mk | 2 +- scripts/ipkg-build | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/image.mk b/include/image.mk index 73fc805..f8601f0 100644 --- a/include/image.mk +++ b/include/image.mk @@ -245,7 +245,7 @@ define Image/mkfs/cpiogz endef define Image/mkfs/targz - $(TAR) -czpf $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE),-$(PROFILE))-rootfs.tar.gz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ . + $(TAR) -czpf $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE),-$(PROFILE))-rootfs.tar.gz --numeric-owner --owner=0 --group=0 --sort=name -C $(TARGET_DIR)/ . endef E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024*1024))) diff --git a/scripts/ipkg-build b/scripts/ipkg-build index cd70c1f..a54e9b5 100755 --- a/scripts/ipkg-build +++ b/scripts/ipkg-build @@ -139,20 +139,20 @@ mkdir $tmp_dir echo $CONTROL > $tmp_dir/tarX # Preserve permissions (-p) when creating data.tar.gz as non-root user -( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX --format=gnu -czpf $tmp_dir/data.tar.gz --mtime="$TIMESTAMP" . ) +( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX --format=gnu --sort=name -czpf $tmp_dir/data.tar.gz --mtime="$TIMESTAMP" . ) installed_size=`stat -c "%s" $tmp_dir/data.tar.gz` sed -i -e "s/^Installed-Size: .*/Installed-Size: $installed_size/" \ $pkg_dir/$CONTROL/control -( cd $pkg_dir/$CONTROL && $TAR $ogargs --format=gnu -czf $tmp_dir/control.tar.gz --mtime="$TIMESTAMP" . ) +( cd $pkg_dir/$CONTROL && $TAR $ogargs --format=gnu --sort=name -czf $tmp_dir/control.tar.gz --mtime="$TIMESTAMP" . ) rm $tmp_dir/tarX echo "2.0" > $tmp_dir/debian-binary pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk rm -f $pkg_file -( cd $tmp_dir && $TAR --format=gnu -zcf $pkg_file --mtime="$TIMESTAMP" ./debian-binary ./data.tar.gz ./control.tar.gz ) +( cd $tmp_dir && $TAR --format=gnu --sort=name -zcf $pkg_file --mtime="$TIMESTAMP" ./debian-binary ./data.tar.gz ./control.tar.gz ) rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz rmdir $tmp_dir