summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-06-13 02:56:40 +0200
committerHolger Levsen <holger@layer-acht.org>2015-06-13 02:56:40 +0200
commitf795aaea7ccbb94c1163cb653174dc421ba52953 (patch)
tree82ac67db8edf47fda65abd405bae582fe09dfb5a /bin
parent6b23830e6ec2a2e4e77e62a75430e9e32e1ef4ae (diff)
downloadjenkins.debian.net-f795aaea7ccbb94c1163cb653174dc421ba52953.tar.xz
reproducible openwrt: rename *-squashfs*.bin to *.bin.squashfs (needed for debbindiff 20)
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_openwrt.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index 6bfb3e8a..0ddb0472 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -73,7 +73,15 @@ save_openwrt_results(){
# save images
mkdir -p $TMPDIR/$RUN/$i
for j in $(find . -name "*.bin" -exec basename \{\} \; ) ; do
- cp -p $j $TMPDIR/$RUN/$i/
+ # 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
done
# save packages
cd packages
@@ -229,7 +237,7 @@ create_results_dirs
cd $TMPDIR/b1
for i in * ; do
cd $i
- for j in $(find . -name "*.bin" -exec basename \{\} \; |sort -u ) ; do
+ for j in $(find . -name "*.bin" -o -name "*.squashfs" -exec basename \{\} \; |sort -u ) ; do
let ALL_IMAGES+=1
call_debbindiff $i $j
SIZE="$(du -h -b $j | cut -f1)"