staging/jow/target/imagebuilder, branch main

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

build: fix including busybox, procd and apk/opkg in imagebuilder

2024-11-13T06:12:21Z

Since the image builder pulls package lists from metadata directly, add procd and busybox as depdendencies to base-files. As for the package manager itself, since it can be disabled it needs to be added directly in the image builder makefile Fixes: 44598c233dd9 ("build: remove broken dependency of metadata on toplevel .config variables") Signed-off-by: Felix Fietkau

imagebuilder: fix OPKG package inclusion

2024-11-10T03:27:19Z

In 451e2ce006 the code would only move packages separated by dashes, however OPKG uses underscores to split between package name and version. Result was the lack of such packages in the packed ImageBuilder. Use dashes or underscores depending on the select package manger. Fixes: 451e2ce006 "imagebuilder: fix package inclusion and APK index" Signed-off-by: Paul Spooren

imagebuilder: init APK dirs every time

2024-11-09T15:46:44Z

The `--initdb` command creates basic folders required by APK, previoiusly it would only run a single time when package_index is actually called. Since the function isn't called if nothing changes, `--initdb` doesn't initialize the rootfs again. This commit moves it to package_reload, which runs every time. Signed-off-by: Paul Spooren

imagebuilder: cleanup package inclusion

2024-11-09T15:46:41Z

Previously three different ways to include packages in an ImageBuilder existed: * buildbot: include libc, kernel (and base-files) in $(IB_LDIR) * not buildbot, standalone: include all packages in ./packages/ * not buildbot, not standalone: include libc, kernel (and base-files) in ./packages/ First of, the separation between *buildbot* and *not buildbot, not standalone* is not required, we can just always copy packages to ./packages instead of ever using the special place $(IB_LDIR). Doing so drops the need to handle the extra case and also allows to clean up the OPKG package installation, which no longer requries the `firstword` logic, things are now always at ./packages. Signed-off-by: Paul Spooren