buildbot/phase2, branch v21

phase1,phase2: GitPoller: fix deprecated API warning for pollinterval

2024-10-12T08:03:30Z

Fixes following warning: gitpoller.py:103: buildbot.warnings.DeprecatedApiWarning: [3.11.3 and later] pollinterval has been deprecated: please use pollInterval Signed-off-by: Petr Štetiar

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

2024-10-12T08:01:42Z

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

phase2: signpack: code format

2024-10-12T08:01:41Z

So its more readable and diffs of changes are more clear, thus easier to review. Signed-off-by: Petr Štetiar

add APK signing logic

2024-08-10T11:19:10Z

With this commit it's possible to sign APK package indexes (packages.adb) via the `signall.sh` script, which is run on the buildmaster. As a consequence `apk` must be available on the buildmaster. This is the final step to replace OPKG with APK. Signed-off-by: Paul Spooren

phase1,phase2: s/master/main for phase{1,2}

2024-04-13T04:52:44Z

More and more projects are switching their repositories to use the 'main' branch instead of the 'master' branch. This also includes many Linux upstream trees as well. Some trees are even removing their 'master' branches already. I think this is becoming more and more mainstream and expected of projects, so we should do the same. References: https://openwrt.org/voting/2023-02-27 Signed-off-by: Paul Spooren Signed-off-by: Petr Štetiar [commit facelift]

phase2: fix relative paths for scripts and files

2024-04-13T04:17:49Z

Currently `buildlist` step fails with following: ../../../sha2rsync.pl ../../arch-sha256sums bin/packages/aarch64_generic/sha256sums rsynclist in dir /builder/aarch64_generic/build/sdk (timeout 1200 secs) watching logfiles {} argv: [b'../../../sha2rsync.pl', b'../../arch-sha256sums', b'bin/packages/aarch64_generic/sha256sums', b'rsynclist'] environment: ... PWD=/builder/aarch64_generic/build/sdk ... Upon execvpe b'../../../sha2rsync.pl' [b'../../../sha2rsync.pl', b'../../arch-sha256sums', b'bin/packages/aarch64_generic/sha256sums', b'rsynclist'] in environment id 139847367136832 :Traceback (most recent call last): ... FileNotFoundError: [Errno 2] No such file or directory: b'../../../sha2rsync.pl' due to relative paths being off by one: worker work dir = /builder/aarch64_cortex-a72/build workerdest = "../sha2rsync.pl" is absolute path /builder/aarch64_cortex-a72/sha2rsync.pl thus relative path from: FileNotFoundError: [Errno 2] No such file or directory: b'../../../sha2rsync.pl' in following context: PWD=/builder/aarch64_generic/build/sdk b'../../../sha2rsync.pl' is wrong absolute path `/builder/sha2rsync.pl` by one directory level, thus adjust all those paths accordingly. Fixes: c3ddb0db167d ("phase2: use sha2rsync.pl for 'targetupload'") Signed-off-by: Petr Štetiar

requirements-dev: use black 23.12.1 and ruff 0.1.9

2024-04-13T04:17:49Z

Fix ruff's recommendation: phase2/master.cfg:328:16: E721 Do not compare types, use `isinstance()` "Unlike a direct type comparison, isinstance will also check if an object is an instance of a class or a subclass thereof." Signed-off-by: Petr Štetiar

phase2: fix invalid escape sequence flake8 warning in checksums step

2024-04-13T04:17:49Z

Resolved a flake8 linting warning related to an invalid escape sequence in the ShellCommand for calculating checksums: phase2/master.cfg:739:28: W605 invalid escape sequence '$' phase2/master.cfg:739:32: W605 invalid escape sequence '$' phase2/master.cfg:739:35: W605 invalid escape sequence '$' phase2/master.cfg:739:39: W605 invalid escape sequence '$' The warning was caused by the use of unescaped parentheses in a regular expression within a sed command. Use a raw string (with an 'r' prefix) to treat backslashes as literal characters, ensuring that the regular expression is correctly interpreted and flake8 does not raise a warning. This fix ensures that the code adheres to Python's string handling best practices and maintains the integrity of the regular expression functionality. Fixes: f0faed2970dd ("phase2: compute checksums") Signed-off-by: Petr Štetiar

phase2: checksums: split long command line

2024-04-13T04:17:49Z

To make it more readable, diffs smaller, easier to review etc. Signed-off-by: Petr Štetiar

phase2: fix stray closing parenthesis

2024-04-13T04:17:49Z

Due to the stray closing parenthesis introduced in commit f0faed2970dd ("phase2: compute checksums") we have currently we've failing checksum step in phase2: argv: b'cd bin/packages/mipsel_24kc_24kf; find . -type f -not -name \'sha256sums\' -printf "%P\n" | sort | xargs -r ../../../staging_dir/host/bin/mkhash -n sha256 | sed -ne \'s!^\$.*\$ \$.*\$$!\x01 *\x02!p\' > sha256sums)' environment: ...snip... using PTY: False /bin/sh: 2: Syntax error: ")" unexpected program finished with exit code 2 Fixes: f0faed2970dd ("phase2: compute checksums") Reported-by: Hannu Nyman Signed-off-by: Petr Štetiar