[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: Revert "reproducible alpine: fix escaping of inline patch"
Holger Levsen
gitlab at salsa.debian.org
Tue Mar 31 22:27:03 BST 2020
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
bb45c781 by kpcyrd at 2020-03-31T23:26:29+02:00
Revert "reproducible alpine: fix escaping of inline patch"
This reverts commit e3624cd3fbbffb8dbf480116a6abacbbd31ed5bd.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
f9ef64df by kpcyrd at 2020-03-31T23:26:36+02:00
Revert "reproducible alpine: commit raw binary patch into script"
This reverts commit c28c0e2200264c3014d0344a5ca906898d55a662.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
2500126c by kpcyrd at 2020-03-31T23:26:44+02:00
Revert "reproducible NACK: sorry, but NACK, no binary diffs etc please. as a PoC yes, but... please fixup now"
This reverts commit 8777b12b9a37dbb9dea200c474ea12d5b93060d9.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
1 changed file:
- bin/reproducible_setup_alpine_schroot.sh
Changes:
=====================================
bin/reproducible_setup_alpine_schroot.sh
=====================================
@@ -164,109 +164,73 @@ echo "$(date -u) - cloning aports repo"
$USERCMD sh -c "$GIT_OPTIONS git clone --depth=1 https://git.alpinelinux.org/aports.git /var/lib/jenkins/aports"
# build and install a patched abuild
-$USERCMD sh -c "cd /var/lib/jenkins/aports/main/abuild && git apply - && PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' abuild -r && sudo /sbin/apk add --allow-untrusted ~/packages/main/x86_64/abuild-3.5.0_rc2-r1.apk && git checkout ." <<-__END__
-diff --git a/main/abuild/0002-repro.patch b/main/abuild/0002-repro.patch
-new file mode 100644
-index 00000000..46778406
---- /dev/null
-+++ b/main/abuild/0002-repro.patch
-@@ -0,0 +1,77 @@
-+commit b514a4e56d4d17da53bbe5a2d203f616f9a9f371
-+Author: kpcyrd <git at rxv.cc>
-+Date: Mon Dec 2 18:09:56 2019 +0100
-+
-+ abuild: set fixed atime and ctime in tar
-+
-+diff --git a/abuild.in b/abuild.in
-+index 5654d8f..644dea8 100644
-+--- a/abuild.in
-++++ b/abuild.in
-+@@ -1579,7 +1579,11 @@ create_apks() {
-+ # normalize timestamps
-+ find . -exec touch -h -d "@\$SOURCE_DATE_EPOCH" {} +
-+
-+- tar --xattrs -f - -c "\$@" | abuild-tar --hash | \$gzip -9 >"\$dir"/data.tar.gz
-++ tar --xattrs \
-++ --format=posix \
-++ --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0 \
-++ --mtime="@\${SOURCE_DATE_EPOCH}" \
-++ -f - -c "\$@" | abuild-tar --hash | \$gzip -n -9 >"\$dir"/data.tar.gz
-+
-+ msg "Create checksum..."
-+ # append the hash for data.tar.gz
-+@@ -1589,8 +1593,12 @@ create_apks() {
-+
-+ # control.tar.gz
-+ cd "\$dir"
-+- tar -f - -c \$(cat "\$dir"/.metafiles) | abuild-tar --cut \
-+- | \$gzip -9 > control.tar.gz
-++ tar \
-++ --format=posix \
-++ --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0 \
-++ --mtime="@\${SOURCE_DATE_EPOCH}" \
-++ -f - -c \$(cat "\$dir"/.metafiles) | abuild-tar --cut \
-++ | \$gzip -n -9 > control.tar.gz
-+ abuild-sign -q control.tar.gz || exit 1
-+
-+ msg "Create \$apk"
-+@@ -1724,7 +1732,7 @@ default_doc() {
-+ fi
-+ done
-+
-+- [ \$islink -eq 0 ] && \$gzip -9 "\$name"
-++ [ \$islink -eq 0 ] && \$gzip -n -9 "\$name"
-+ done
-+
-+ rm -f "\$subpkgdir/usr/share/info/dir"
-+
-+commit 80ca5bbd896146c885403835061aaccad13cbebb
-+Author: kpcyrd <git at rxv.cc>
-+Date: Tue Dec 3 21:31:44 2019 +0100
-+
-+ abuild: explicitly sort apk content
-+
-+diff --git a/abuild.in b/abuild.in
-+index 644dea8..add61a6 100644
-+--- a/abuild.in
-++++ b/abuild.in
-+@@ -1577,13 +1577,15 @@ create_apks() {
-+ fi
-+
-+ # normalize timestamps
-+- find . -exec touch -h -d "@\$SOURCE_DATE_EPOCH" {} +
-++ find "\$@" -exec touch -h -d "@\$SOURCE_DATE_EPOCH" {} +
-+
-+- tar --xattrs \
-++ # explicitly sort package content
-++ find "\$@" -print0 | LC_ALL=C sort -z | tar --xattrs \
-+ --format=posix \
-+ --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0 \
-+ --mtime="@\${SOURCE_DATE_EPOCH}" \
-+- -f - -c "\$@" | abuild-tar --hash | \$gzip -n -9 >"\$dir"/data.tar.gz
-++ --no-recursion --null -T - \
-++ -f - -c | abuild-tar --hash | \$gzip -n -9 >"\$dir"/data.tar.gz
-+
-+ msg "Create checksum..."
-+ # append the hash for data.tar.gz
-diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
-index c8b9a30a..d311e609 100644
---- a/main/abuild/APKBUILD
-+++ b/main/abuild/APKBUILD
-@@ -22,6 +22,7 @@ options="suid !check"
- pkggroups="abuild"
- source="https://dev.alpinelinux.org/archive/abuild/abuild-\$_ver.tar.xz
- 0001-abuild-fix-applying-patches-from-https.patch
-+ 0002-repro.patch
- "
-
- builddir="\$srcdir/\$pkgname-\$_ver"
-@@ -70,4 +71,5 @@ _rootbld() {
- }
-
- sha512sums="7c317d75f8fa64ac2a0674873edc937bcd8fb3d322e5cdf10874fe5ec87fec0ebe3a1d29d50e919376b10135d252659372ffb62e08418158146734fd13f46602 abuild-3.5.0_rc2.tar.xz
--7b565481a85a7094a9f61f39ee44ba3c1f3d5bfeed7a5279c57c14447e94f65b613d56d26d197639ab280745e48c51ff7915fd0570a570d29dd7e2490b298dc7 0001-abuild-fix-applying-patches-from-https.patch"
-+7b565481a85a7094a9f61f39ee44ba3c1f3d5bfeed7a5279c57c14447e94f65b613d56d26d197639ab280745e48c51ff7915fd0570a570d29dd7e2490b298dc7 0001-abuild-fix-applying-patches-from-https.patch
-+451b420fb09877b188f293bb5240d2c222e90722d28d05dee558c833461f2d6c40db772ae2fe5c9dff1aa8534f360e0d1d6e907da64db7919cae53a59acbeff0 0002-repro.patch"
+# FIXME: this abuild patch crap and must go
+$USERCMD sh -c "cd /var/lib/jenkins/aports/main/abuild && base64 -d | git apply - && PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' abuild -r && sudo /sbin/apk add --allow-untrusted ~/packages/main/x86_64/abuild-3.5.0_rc2-r1.apk && git checkout ." <<-__END__
+ZGlmZiAtLWdpdCBhL21haW4vYWJ1aWxkLzAwMDItcmVwcm8ucGF0Y2ggYi9tYWluL2FidWlsZC8w
+MDAyLXJlcHJvLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwLi40Njc3
+ODQwNgotLS0gL2Rldi9udWxsCisrKyBiL21haW4vYWJ1aWxkLzAwMDItcmVwcm8ucGF0Y2gKQEAg
+LTAsMCArMSw3NyBAQAorY29tbWl0IGI1MTRhNGU1NmQ0ZDE3ZGE1M2JiZTVhMmQyMDNmNjE2Zjlh
+OWYzNzEKK0F1dGhvcjoga3BjeXJkIDxnaXRAcnh2LmNjPgorRGF0ZTogICBNb24gRGVjIDIgMTg6
+MDk6NTYgMjAxOSArMDEwMAorCisgICAgYWJ1aWxkOiBzZXQgZml4ZWQgYXRpbWUgYW5kIGN0aW1l
+IGluIHRhcgorCitkaWZmIC0tZ2l0IGEvYWJ1aWxkLmluIGIvYWJ1aWxkLmluCitpbmRleCA1NjU0
+ZDhmLi42NDRkZWE4IDEwMDY0NAorLS0tIGEvYWJ1aWxkLmluCisrKysgYi9hYnVpbGQuaW4KK0BA
+IC0xNTc5LDcgKzE1NzksMTEgQEAgY3JlYXRlX2Fwa3MoKSB7CisgCQkjIG5vcm1hbGl6ZSB0aW1l
+c3RhbXBzCisgCQlmaW5kIC4gLWV4ZWMgdG91Y2ggLWggLWQgIkAkU09VUkNFX0RBVEVfRVBPQ0gi
+IHt9ICsKKyAKKy0JCXRhciAtLXhhdHRycyAtZiAtIC1jICIkQCIgfCBhYnVpbGQtdGFyIC0taGFz
+aCB8ICRnemlwIC05ID4iJGRpciIvZGF0YS50YXIuZ3oKKysJCXRhciAtLXhhdHRycyBcCisrCQkJ
+LS1mb3JtYXQ9cG9zaXggXAorKwkJCS0tcGF4LW9wdGlvbj1leHRoZHIubmFtZT0lZC9QYXhIZWFk
+ZXJzLyVmLGF0aW1lOj0wLGN0aW1lOj0wIFwKKysJCQktLW10aW1lPSJAJHtTT1VSQ0VfREFURV9F
+UE9DSH0iIFwKKysJCQktZiAtIC1jICIkQCIgfCBhYnVpbGQtdGFyIC0taGFzaCB8ICRnemlwIC1u
+IC05ID4iJGRpciIvZGF0YS50YXIuZ3oKKyAKKyAJCW1zZyAiQ3JlYXRlIGNoZWNrc3VtLi4uIgor
+IAkJIyBhcHBlbmQgdGhlIGhhc2ggZm9yIGRhdGEudGFyLmd6CitAQCAtMTU4OSw4ICsxNTkzLDEy
+IEBAIGNyZWF0ZV9hcGtzKCkgeworIAorIAkJIyBjb250cm9sLnRhci5negorIAkJY2QgIiRkaXIi
+CistCQl0YXIgLWYgLSAtYyAkKGNhdCAiJGRpciIvLm1ldGFmaWxlcykgfCBhYnVpbGQtdGFyIC0t
+Y3V0IFwKKy0JCQl8ICRnemlwIC05ID4gY29udHJvbC50YXIuZ3oKKysJCXRhciBcCisrCQkJLS1m
+b3JtYXQ9cG9zaXggXAorKwkJCS0tcGF4LW9wdGlvbj1leHRoZHIubmFtZT0lZC9QYXhIZWFkZXJz
+LyVmLGF0aW1lOj0wLGN0aW1lOj0wIFwKKysJCQktLW10aW1lPSJAJHtTT1VSQ0VfREFURV9FUE9D
+SH0iIFwKKysJCQktZiAtIC1jICQoY2F0ICIkZGlyIi8ubWV0YWZpbGVzKSB8IGFidWlsZC10YXIg
+LS1jdXQgXAorKwkJCXwgJGd6aXAgLW4gLTkgPiBjb250cm9sLnRhci5negorIAkJYWJ1aWxkLXNp
+Z24gLXEgY29udHJvbC50YXIuZ3ogfHwgZXhpdCAxCisgCisgCQltc2cgIkNyZWF0ZSAkYXBrIgor
+QEAgLTE3MjQsNyArMTczMiw3IEBAIGRlZmF1bHRfZG9jKCkgeworIAkJCWZpCisgCQlkb25lCisg
+CistCQlbICRpc2xpbmsgLWVxIDAgXSAmJiAkZ3ppcCAtOSAiJG5hbWUiCisrCQlbICRpc2xpbmsg
+LWVxIDAgXSAmJiAkZ3ppcCAtbiAtOSAiJG5hbWUiCisgCWRvbmUKKyAKKyAJcm0gLWYgIiRzdWJw
+a2dkaXIvdXNyL3NoYXJlL2luZm8vZGlyIgorCitjb21taXQgODBjYTViYmQ4OTYxNDZjODg1NDAz
+ODM1MDYxYWFjY2FkMTNjYmViYgorQXV0aG9yOiBrcGN5cmQgPGdpdEByeHYuY2M+CitEYXRlOiAg
+IFR1ZSBEZWMgMyAyMTozMTo0NCAyMDE5ICswMTAwCisKKyAgICBhYnVpbGQ6IGV4cGxpY2l0bHkg
+c29ydCBhcGsgY29udGVudAorCitkaWZmIC0tZ2l0IGEvYWJ1aWxkLmluIGIvYWJ1aWxkLmluCitp
+bmRleCA2NDRkZWE4Li5hZGQ2MWE2IDEwMDY0NAorLS0tIGEvYWJ1aWxkLmluCisrKysgYi9hYnVp
+bGQuaW4KK0BAIC0xNTc3LDEzICsxNTc3LDE1IEBAIGNyZWF0ZV9hcGtzKCkgeworIAkJZmkKKyAK
+KyAJCSMgbm9ybWFsaXplIHRpbWVzdGFtcHMKKy0JCWZpbmQgLiAtZXhlYyB0b3VjaCAtaCAtZCAi
+QCRTT1VSQ0VfREFURV9FUE9DSCIge30gKworKwkJZmluZCAiJEAiIC1leGVjIHRvdWNoIC1oIC1k
+ICJAJFNPVVJDRV9EQVRFX0VQT0NIIiB7fSArCisgCistCQl0YXIgLS14YXR0cnMgXAorKwkJIyBl
+eHBsaWNpdGx5IHNvcnQgcGFja2FnZSBjb250ZW50CisrCQlmaW5kICIkQCIgLXByaW50MCB8IExD
+X0FMTD1DIHNvcnQgLXogfCB0YXIgLS14YXR0cnMgXAorIAkJCS0tZm9ybWF0PXBvc2l4IFwKKyAJ
+CQktLXBheC1vcHRpb249ZXh0aGRyLm5hbWU9JWQvUGF4SGVhZGVycy8lZixhdGltZTo9MCxjdGlt
+ZTo9MCBcCisgCQkJLS1tdGltZT0iQCR7U09VUkNFX0RBVEVfRVBPQ0h9IiBcCistCQkJLWYgLSAt
+YyAiJEAiIHwgYWJ1aWxkLXRhciAtLWhhc2ggfCAkZ3ppcCAtbiAtOSA+IiRkaXIiL2RhdGEudGFy
+Lmd6CisrCQkJLS1uby1yZWN1cnNpb24gLS1udWxsIC1UIC0gXAorKwkJCS1mIC0gLWMgfCBhYnVp
+bGQtdGFyIC0taGFzaCB8ICRnemlwIC1uIC05ID4iJGRpciIvZGF0YS50YXIuZ3oKKyAKKyAJCW1z
+ZyAiQ3JlYXRlIGNoZWNrc3VtLi4uIgorIAkJIyBhcHBlbmQgdGhlIGhhc2ggZm9yIGRhdGEudGFy
+Lmd6CmRpZmYgLS1naXQgYS9tYWluL2FidWlsZC9BUEtCVUlMRCBiL21haW4vYWJ1aWxkL0FQS0JV
+SUxECmluZGV4IGM4YjlhMzBhLi5kMzExZTYwOSAxMDA2NDQKLS0tIGEvbWFpbi9hYnVpbGQvQVBL
+QlVJTEQKKysrIGIvbWFpbi9hYnVpbGQvQVBLQlVJTEQKQEAgLTIyLDYgKzIyLDcgQEAgb3B0aW9u
+cz0ic3VpZCAhY2hlY2siCiBwa2dncm91cHM9ImFidWlsZCIKIHNvdXJjZT0iaHR0cHM6Ly9kZXYu
+YWxwaW5lbGludXgub3JnL2FyY2hpdmUvYWJ1aWxkL2FidWlsZC0kX3Zlci50YXIueHoKIAkwMDAx
+LWFidWlsZC1maXgtYXBwbHlpbmctcGF0Y2hlcy1mcm9tLWh0dHBzLnBhdGNoCisJMDAwMi1yZXBy
+by5wYXRjaAogCSIKIAogYnVpbGRkaXI9IiRzcmNkaXIvJHBrZ25hbWUtJF92ZXIiCkBAIC03MCw0
+ICs3MSw1IEBAIF9yb290YmxkKCkgewogfQogCiBzaGE1MTJzdW1zPSI3YzMxN2Q3NWY4ZmE2NGFj
+MmEwNjc0ODczZWRjOTM3YmNkOGZiM2QzMjJlNWNkZjEwODc0ZmU1ZWM4N2ZlYzBlYmUzYTFkMjlk
+NTBlOTE5Mzc2YjEwMTM1ZDI1MjY1OTM3MmZmYjYyZTA4NDE4MTU4MTQ2NzM0ZmQxM2Y0NjYwMiAg
+YWJ1aWxkLTMuNS4wX3JjMi50YXIueHoKLTdiNTY1NDgxYTg1YTcwOTRhOWY2MWYzOWVlNDRiYTNj
+MWYzZDViZmVlZDdhNTI3OWM1N2MxNDQ0N2U5NGY2NWI2MTNkNTZkMjZkMTk3NjM5YWIyODA3NDVl
+NDhjNTFmZjc5MTVmZDA1NzBhNTcwZDI5ZGQ3ZTI0OTBiMjk4ZGM3ICAwMDAxLWFidWlsZC1maXgt
+YXBwbHlpbmctcGF0Y2hlcy1mcm9tLWh0dHBzLnBhdGNoIgorN2I1NjU0ODFhODVhNzA5NGE5ZjYx
+ZjM5ZWU0NGJhM2MxZjNkNWJmZWVkN2E1Mjc5YzU3YzE0NDQ3ZTk0ZjY1YjYxM2Q1NmQyNmQxOTc2
+MzlhYjI4MDc0NWU0OGM1MWZmNzkxNWZkMDU3MGE1NzBkMjlkZDdlMjQ5MGIyOThkYzcgIDAwMDEt
+YWJ1aWxkLWZpeC1hcHBseWluZy1wYXRjaGVzLWZyb20taHR0cHMucGF0Y2gKKzQ1MWI0MjBmYjA5
+ODc3YjE4OGYyOTNiYjUyNDBkMmMyMjJlOTA3MjJkMjhkMDVkZWU1NThjODMzNDYxZjJkNmM0MGRi
+NzcyYWUyZmU1YzlkZmYxYWE4NTM0ZjM2MGUwZDFkNmU5MDdkYTY0ZGI3OTE5Y2FlNTNhNTlhY2Jl
+ZmYwICAwMDAyLXJlcHJvLnBhdGNoIgo=
__END__
echo "============================================================================="
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/6778b6442e442af36685a057414029f3781bce1a...2500126cde5acc6ce45616dfda21c09c0c199186
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/6778b6442e442af36685a057414029f3781bce1a...2500126cde5acc6ce45616dfda21c09c0c199186
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20200331/5b6d83d7/attachment-0001.html>
More information about the Qa-jenkins-scm
mailing list