staging/blocktrron/target/imagebuilder, branch master

imagebuilder: fix repeated generation of package index when signing is enabled

2025-11-12T13:23:33Z

`$(MAKE) package_index` will generate Packages.sig if signing is enabled, and Packages.sig is always newer than Packages.gz, cause repeated generation of package index on next build. So we should ignore Packages.sig. Signed-off-by: Liangbin Lian

imagebuilder: implement STRIP_ABI option for manifest target

2025-07-03T10:45:59Z

When using apk as the package manager, imagebuilder make command make manifest STRIP_ABI=1 does not strip package names of their ABI-version suffix. The ASU server relies on this to validate builds, so many snapshot build requests are failing. Fix this by using the already existing package data parser in make-index-json.py and augment it to write the result in manifest format. Fixes: https://github.com/openwrt/openwrt/issues/19274 Signed-off-by: Eric Fahlgren Link: https://github.com/openwrt/openwrt/pull/19278 Signed-off-by: Robert Marko

imagebuilder: fix addition of local packages

2025-02-21T09:44:42Z

Since alpinelinux/apk-tools@460d62ee743c, relative paths are no longer accepted in repositories file. Add local repository in APK command instead to fix this issue. Fixes: 83d2d21904e0 ("apk: update to Git HEAD (2025-02-08)") Fixes: https://github.com/openwrt/openwrt/issues/18032 Signed-off-by: Kuan-Yi Li Link: https://github.com/openwrt/openwrt/pull/18048 Signed-off-by: Robert Marko

build: lock versions for special APK packages

2025-02-04T13:48:59Z

The three packages base-files, libc and kernel are special, the former can't be upgraded in place since it's content are modified on startup, the latter two are virtual packages only used as constraints for the package manager. Historically base-files was "locked" via a special OPKG function, the latter two were hidden from the package index and thereby never picked as possible upgrade. Time moved forward and we now have APK and tools like OWUT. The latter compares available packages with installed packages and generates user readable output, requiring versions for libc and kernel, too. At the same time, APK uses a different looking mechanism, which is set during installation instead of part of the package metadata. In short, this patch adds version constraints to the three packages, allowing them to be part of the package index. Fixes: #17774 Fixes: #17775 Fixes: efahl/owut#31 Signed-off-by: Paul Spooren

imagebuilder: fix OPKG package_whatdepends support

2024-11-20T08:49:21Z

Trying to use 'package_whatdepends' feature of the ImageBuilder with OPKG will currently fail as OPKG does not support "list --depends" call at all, it seems that this is a mixup from the original APK support commit. So, lets restore 'package_whatdepends' support for OPKG by calling "whatdepends -A" instead as we used to before APK support. Fixes: d788ab376f85 ("build: add APK package build capabilities") Link: https://github.com/openwrt/openwrt/pull/17022 Signed-off-by: Robert Marko

imagebuilder: fix APK package_depends support

2024-11-20T08:49:21Z

Currently trying to use the 'package_depends' feature of ImageBuilder will result in it trying to call OPKG: make package_depends PACKAGE="usbutils" OK: 26 MiB in 142 packages bash: line 1: openwrt-imagebuilder-qualcommax-ipq807x.Linux-x86_64/staging_dir/host/bin/opkg: No such file or directory make: *** [Makefile:363: package_depends] Error 127 It looks like a copy/paste error when APK support was being added, so lets fix it by calling APK and its "info --depends" command. Fixes: #16996 Fixes: d788ab376f85 ("build: add APK package build capabilities") Link: https://github.com/openwrt/openwrt/pull/17022 Signed-off-by: Robert Marko

imagebuilder: fix APK architecture setting

2024-11-19T18:52:03Z

Currently, when "apk add --initdb" is called it will populate the /etc/apk/arch file with the architecture of the host instead of the target package architecture and this will then make it impossible for new packages to be installed on the device as the target architecture will not match after APK is updated to include [1]. So, lets use override the architecture by passing the target package one by using the "--arch" argument to "apk add". [1] https://gitlab.alpinelinux.org/alpine/apk-tools/-/commit/c1a3e69f24e235fc78f4dddb1f85fdf281464446 Fixes: #16953 Link: https://github.com/openwrt/openwrt/pull/17015 Signed-off-by: Robert Marko

imagebuilder: fix DEFAULT_PACKAGES handling

2024-11-17T19:54:54Z

DEFAULT_PACKAGES handling was moved in commit 40be892a020e ("imagebuilder: move handling of DEFAULT_PACKAGES into shareable place") to `include/default-packages.mk`, but they weren't removed from ImageBuilder's Makefile, so lets remove it now. Once removed, I've noticed, that it stopped working as there is target.mk included later in that file, overriding the DEFAULT_PACKAGES again, so moved it after this target.mk include. Fixes: 40be892a020e ("imagebuilder: move handling of DEFAULT_PACKAGES into shareable place") Signed-off-by: Petr Štetiar

imagebuilder: move handling of DEFAULT_PACKAGES into shareable place

2024-11-17T18:29:06Z

It seems, that handling of DEFAULT_PACKAGES is needed in more places, so lets move it into dedicated include file so it can be easily shared. Signed-off-by: Petr Štetiar Link: https://github.com/openwrt/openwrt/pull/16986 Signed-off-by: Robert Marko

imagebuilder: fix APK keys dir creation

2024-11-13T16:42:04Z

Make keys directory for APK instead of OPKG while adding local key. Signed-off-by: Kuan-Yi Li Link: https://github.com/openwrt/openwrt/pull/16942 Signed-off-by: Christian Marangi