diff options
| author | Robert Marko | 2024-11-20 12:51:53 +0000 |
|---|---|---|
| committer | Robert Marko | 2024-11-21 16:20:43 +0000 |
| commit | 5b6f8353fe2af6c270a30dc8c38791cf03fd265d (patch) | |
| tree | 1308eda5f43498e81229ee03e7f04f81bb1f4257 | |
| parent | 52519a59a859d349f154ed79e0a3d63457b6aa6a (diff) | |
| download | openwrt-5b6f8353fe2af6c270a30dc8c38791cf03fd265d.tar.gz | |
include/package-pack: actually call default_postinist/prerm when using APK
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 <robimarko@gmail.com>
| -rw-r--r-- | include/package-pack.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/package-pack.mk b/include/package-pack.mk index 3ac7a036f9..1f1b8c73f9 100644 --- a/include/package-pack.mk +++ b/include/package-pack.mk @@ -294,8 +294,8 @@ else echo 'export root="$$$${IPKG_INSTROOT}"'; \ echo 'export pkgname="$(1)"'; \ echo "add_group_and_user"; \ - [ ! -f $$(ADIR_$(1))/postinst-pkg ] || cat "$$(ADIR_$(1))/postinst-pkg"; \ echo "default_postinst"; \ + [ ! -f $$(ADIR_$(1))/postinst-pkg ] || cat "$$(ADIR_$(1))/postinst-pkg"; \ ) > $$(ADIR_$(1))/post-install; ( \ @@ -304,8 +304,8 @@ else echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ echo 'export root="$$$${IPKG_INSTROOT}"'; \ echo 'export pkgname="$(1)"'; \ - [ ! -f $$(ADIR_$(1))/prerm-pkg ] || cat "$$(ADIR_$(1))/prerm-pkg"; \ echo "default_prerm"; \ + [ ! -f $$(ADIR_$(1))/prerm-pkg ] || cat "$$(ADIR_$(1))/prerm-pkg"; \ ) > $$(ADIR_$(1))/pre-deinstall; if [ -n "$(USERID)" ]; then echo $(USERID) > $$(IDIR_$(1))/lib/apk/packages/$(1).rusers; fi; |