staging/jow/include/package-pack.mk, branch main

include/package-pack: remove leading whitespace from install scripts

2025-01-10T09:50:34Z

Strip off initial leading blanks and tabs from scripts and script fragments that are supplied by the package's Makefile. Specifically, the script included in the postrm must be left justified so that the shebang is in the first column. Fixes: https://github.com/openwrt/openwrt/issues/17439 Signed-off-by: Eric Fahlgren Link: https://github.com/openwrt/openwrt/pull/17440 Signed-off-by: Robert Marko

include/package-pack: add support for postrm with APK

2024-11-21T16:20:43Z

Currently, postrm scripts are not being executed when package is removed with APK since they are not being included at all. So, lets use APK-s support for post-deinstall scripts and ship our postrm scripts if packages define them. Fixes: d788ab376f85 ("build: add APK package build capabilities") Link: https://github.com/openwrt/openwrt/pull/17023 Signed-off-by: Robert Marko

include/package-pack: actually call default_postinist/prerm when using APK

2024-11-21T16:20:43Z

Currently, when you install a package that ships uci-defaults scripts they are not getting executed during package installation. For example, if you install a new LuCI theme it ships a uci-defaults script to add it to the UCI LuCI config so the theme is actually selectable but that does not happen until the device is rebooted so that uci-defaults script is actually executed. It turns out that the recipe for post-install is the issue since it will include contents of postinst-pkg before the call to default_postinist. This is an issue since postinst-pkg will exit with code 0 before we ever reach the call to default_postinist. So, lets simply make the call to default_postinist before postinst-pkg inclusion which is what OPKG based installation does. The same issue affects pre-deinstall script but its not actually being hit since we dont seem to be actually even generating prerm-pkg scripts but lets fix this theoretical issue as well. Fixes: #16987 Fixes: d788ab376f85 ("build: add APK package build capabilities") Link: https://github.com/openwrt/openwrt/pull/17023 Signed-off-by: Robert Marko

include/package-pack: translate PKGARCH for APK

2024-11-19T18:52:03Z

We have a lot of script-only packages that are universal for all arch-s and those set PKGARCH:=all to indicate it. Unfortunately, APK expects architecture to be set to "noarch" instead to indicate that its universal so instead of having to update all packages that set PKGARCH:=all and thus break OPKG lets simply translate "all" to "noarch" when generating the APK package. This will be required as soon we update APK to include [1] as it will start enforcing package architecture checks. [1] https://gitlab.alpinelinux.org/alpine/apk-tools/-/commit/c1a3e69f24e235fc78f4dddb1f85fdf281464446 Suggested-by: Jonas Gorski Link: https://github.com/openwrt/openwrt/pull/17015 Signed-off-by: Robert Marko

include/package-pack: add default 'provider_priority' for APK packages

2024-11-19T10:24:07Z

Currently, trying to use APK to install a package that has a dependency on a virtual package that needs to be resolved via 'provides' it will fail if package does not have 'DEFAULT_VARIANT:=1' like: apk add usbutils ERROR: unable to select packages: libudev (virtual): note: please select one of the 'provided by' packages explicitly provided by: libudev-zero required by: usbutils-017-r1[libudev] Issue is that we dont set 'provider_priority' that APK uses to break ties when choosing a virtual package to satisfy a dependency and thus despite only one package providing the dependency it will still end up with a tie and just error out. So, lets simply fix this by providing a default value for 'provider_priority' when 'DEFAULT_VARIANT' is not set and then APK will be able to resolve dependencies. Fixes: #16976 Link: https://github.com/openwrt/openwrt/pull/17008 Signed-off-by: Robert Marko

include/package-pack: escape package description for APK mkpkg

2024-11-17T18:09:31Z

Escape special char for package description for APK mkpkg as the description is passed as an args to mkpkg with --info option and can easily escape from the "". Currently escaped char `, $, ", \. Signed-off-by: Christian Marangi

build: Honor DEFAULT_VARIANT for APK packages

2024-10-30T13:17:33Z

Previously APK would complain as it wasn't sure which package to install by default when multiple packages would provide the same name. Now, give the package a higher provider priority to make APK automatically select the "default" package. Signed-off-by: Paul Spooren

include/package-pack: drop version from provides

2024-10-28T23:07:55Z

Adding a version to the provides causes it to conflict with other packages that provides the same package, further details are available here: https://gitlab.alpinelinux.org/alpine/apk-tools/-/blob/master/doc/apk-package.5.scd#L199 This was intitally done, if I remember correctly, to support depending on the specific kernel modules. Due to patches to APK, versions containing hashes work now, too, so this is no longer required. Only add the version to packages that define an ABI version since other packages depend against the package name plus ABI version. While at it, format the now rather complex call. Fixes: https://github.com/openwrt/openwrt/issues/16795 Signed-off-by: Paul Spooren

include/package-pack: Set missing Maintainer and URL for APK

2024-10-24T10:46:47Z

Set missing Maintainer and URL info for .apk creation. Fixes: d788ab376f85 ("build: add APK package build capabilities") Signed-off-by: Christian Marangi

include/package-pack: remove whitespace for Description info for APK

2024-10-24T10:46:26Z

Remove whitespace for Description info for .apk creation Fixes: b6bbc76c0b2a ("include/package-pack: set missing Description on .apk creation") Signed-off-by: Christian Marangi