luci.mk: don't run uci-defaults scripts ourself 5100/head
authorSven Roederer <devel-sven@geroedel.de>
Fri, 4 Jun 2021 21:04:37 +0000 (23:04 +0200)
committerGitHub <noreply@github.com>
Fri, 4 Jun 2021 21:04:37 +0000 (23:04 +0200)
Do not run the uci-defaults scripts of a package in the package-postinst, but leave this
for the default_postinst() of the OpenWrt base-files package.

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
luci.mk

diff --git a/luci.mk b/luci.mk
index 636cf316ec3fdaf154685750760210a447e46969..fb49da0eeed5f4e603a41ed25b4bd323c9be418c 100644 (file)
--- a/luci.mk
+++ b/luci.mk
@@ -206,8 +206,7 @@ endef
 
 ifndef Package/$(PKG_NAME)/postinst
 define Package/$(PKG_NAME)/postinst
-[ -n "$${IPKG_INSTROOT}" ] || {$(foreach script,$(LUCI_DEFAULTS),
-       (. /etc/uci-defaults/$(script)) && rm -f /etc/uci-defaults/$(script))
+[ -n "$${IPKG_INSTROOT}" ] || { \
        rm -f /tmp/luci-indexcache
        rm -rf /tmp/luci-modulecache/
        killall -HUP rpcd 2>/dev/null