[buildbot] phase2: signpack: fix sha256sums signatures of apk packages.adb index

LEDE Commits lede-commits at lists.infradead.org
Sat Oct 12 02:18:36 PDT 2024


ynezz pushed a commit to buildbot.git, branch main:
https://git.openwrt.org/49c07ef5fa6b023c244402a0d2fa1dc8fe98c22c

commit 49c07ef5fa6b023c244402a0d2fa1dc8fe98c22c
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Sat Oct 12 07:46:46 2024 +0000

    phase2: signpack: fix sha256sums signatures of apk packages.adb index
    
    Currently the sha256sum verification of apk's packages.adb index
    fails as the file is modified with `apk adbsign`, but we currently don't
    send the sha256sums file to the master, thus it can't be fixed during
    signing.
    
    So lets pack sha256sums files and ship them to master for proper
    signing.
    
    Fixes: a94d4e15fdc1 ("add APK signing logic")
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 phase2/master.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phase2/master.cfg b/phase2/master.cfg
index 6b7939b..6dd2c46 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -591,7 +591,8 @@ for arch in arches:
 			name = "signpack",
 			description = "Packing files to sign",
 			workdir = "build/sdk",
-			command = "find bin/packages/%s/ -mindepth 2 -maxdepth 2 -type f " %(arch[0])
+			command = "find bin/packages/%s/ -mindepth 1 -maxdepth 2 -type f " %(arch[0])
+			+ "-name sha256sums -print0 -or "
 			+ "-name Packages -print0 -or "
 			+ "-name packages.adb -print0 | "
 			+ "xargs -0 tar -czf sign.tar.gz",




More information about the lede-commits mailing list