openwrt / buildbot

OpenWrt buildbot configuration
10 stars 13 forks source link

Bunch of various apk and phase2 related fixes #53

Open ynezz opened 1 week ago

ynezz commented 1 week ago

scripts: signall: fix wrong GPG signature on apk packages.adb index

Currently the GPG signature verification of apk's packages.adb index fails as the file is modified with apk adbsign after its GPG signed.

So lets fix it by moving the apk adbsign before the GPG signing step.

Fixes: a94d4e15fdc1 ("add APK signing logic")

buildworker: start: fix leaking BUILDWORKER_TLS env variable

I've noticed leakage of BUILDWORKER_TLS environment variable in build logs, so lets fix it in a generic way via new cleanup_buildworker_env_variables() by using Bash's parameter expansion and unset all environment variables starting with BUILDWORKER_ prefix.

scripts: sha2rsync: fix missing feeds in additional_files list

Currently only packages feeds are being handled in phase2, so lets add the other missing feeds.

Fixes: c3ddb0db167d ("phase2: use sha2rsync.pl for 'targetupload'")

scripts: sha2rsync: add apk package index signature files

Currently additional_files list is missing signature files for apk's package index, so lets add those to get them rsync-ed as well.

scripts: signall: fix wrong sha256sum on apk packages.adb index

Currently the sha256sum verification of apk's packages.adb index fails as the file is modified with apk adbsign.

So lets update sha256sum of all packages.adb indexes after they were signed with apk adbsign.

While at it fix formatting.

Fixes: a94d4e15fdc1 ("add APK signing logic")

scripts: signall: fix finish function not called when apk adbsign failed

The finish 3 was not being called when the apk adbsign command failed within the find command using -exec. This happened because find does not exit with a non-zero status when the command executed by -exec fails, so the || finish 3 condition was not triggered.

So lets replace the find ... -exec ... construct with a loop and call finish 3 immediately if it fails.

Fixes: a94d4e15fdc1 ("add APK signing logic")