bin/reproducible_setup_alpine_schroot.sh

@@ -164,73 +164,8 @@ 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 && 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__
+# 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 ." 
 
 echo "============================================================================="
 echo "schroot $TARGET set up successfully in $SCHROOT_BASE/$TARGET - exiting now."