[Qa-jenkins-scm] [jenkins.debian.net] 03/03: reproducible openwrt: stop renaming *.bin to *.bin.squashfs because debbindiff needs to learn to deal with them anyway and because they are not simple squashfs filesystems

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 3809618850d039d81fec32a01faf22c79d352b64
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Jun 13 10:32:45 2015 +0200

    reproducible openwrt: stop renaming *.bin to *.bin.squashfs because debbindiff needs to learn to deal with them anyway and because they are not simple squashfs filesystems
---
 bin/reproducible_openwrt.sh | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index a34b88f..f8ac938 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -73,15 +73,7 @@ save_openwrt_results(){
 		# save images
 		mkdir -p $TMPDIR/$RUN/$i
 		for j in $(find . -name "*.bin" -exec basename \{\} \; ) ; do
-			# rename *-squashfs*.bin to *.bin.squashfs
-			# (needed for debbindiff 20)
-			if (echo $j| grep -q -- '-squashfs') ; then
-				k=$(echo $j| sed "s#-squashfs##g")
-				k=${j}.squashfs
-			else
-				k=$j
-			fi
-			cp -p $j $TMPDIR/$RUN/$i/$k
+			cp -p $j $TMPDIR/$RUN/$i/
 		done
 		# save packages
 		cd packages

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git