From: Florian Eckert <fe@dev.tdt.de>
Date: Fri, 21 Feb 2020 08:25:00 +0000 (+0100)
Subject: luci.mk: Only install a default post-install script if there is none defined
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b448008b4744a29ad23812ba37c3ec908d7134d9;p=oweals%2Fluci.git

luci.mk: Only install a default post-install script if there is none defined

If a postinst script is defined in the package Makefile, it will
not be included because it will be replaced by the default postinst
script. To solve the problem, we now check, if we have a postinst script.
And if so, it will be installed instead of the default postinst script.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---

diff --git a/luci.mk b/luci.mk
index 6e299aaae..54f3835b4 100644
--- a/luci.mk
+++ b/luci.mk
@@ -231,6 +231,7 @@ define Package/$(PKG_NAME)/postinst
 }
 endef
 else
+ifndef Package/$(PKG_NAME)/postinst
 define Package/$(PKG_NAME)/postinst
 [ -n "$${IPKG_INSTROOT}" ] || {
 	rm -f /tmp/luci-indexcache
@@ -239,6 +240,7 @@ define Package/$(PKG_NAME)/postinst
 }
 endef
 endif
+endif
 
 
 LUCI_BUILD_PACKAGES := $(PKG_NAME)