From: Florian Eckert <fe@dev.tdt.de>
Date: Wed, 4 Nov 2020 11:07:14 +0000 (+0100)
Subject: mwan3: use common makefile install wrappers
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6834f8e3a6d8f94501500609fda0a82b9a458a19;p=feed%2Fpackages.git

mwan3: use common makefile install wrappers

With this change you can see at a glance which files will be installed on
the system.

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

diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile
index 99990e4cca..c603397dae 100644
--- a/net/mwan3/Makefile
+++ b/net/mwan3/Makefile
@@ -67,8 +67,43 @@ define Build/Compile
 endef
 
 define Package/mwan3/install
-	$(CP) ./files/* $(1)
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/etc/config/mwan3 \
+		$(1)/etc/config/
+
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_DATA) ./files/etc/hotplug.d/iface/15-mwan3 \
+		$(1)/etc/hotplug.d/iface/
+	$(INSTALL_DATA) ./files/etc/hotplug.d/iface/16-mwan3-user \
+		$(1)/etc/hotplug.d/iface/
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/etc/init.d/mwan3 \
+		$(1)/etc/init.d/
+
+	$(INSTALL_DIR) $(1)/lib/mwan3
+	$(INSTALL_DATA) ./files/lib/mwan3/common.sh \
+		$(1)/lib/mwan3/
+	$(INSTALL_DATA) ./files/lib/mwan3/mwan3.sh \
+		$(1)/lib/mwan3/
+
+	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
+	$(INSTALL_BIN) ./files/usr/libexec/rpcd/mwan3 \
+		$(1)/usr/libexec/rpcd/
+
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/usr/sbin/mwan3 \
+		$(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/usr/sbin/mwan3rtmon \
+		$(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/usr/sbin/mwan3track \
+		$(1)/usr/sbin/
+
 	$(CP) $(PKG_BUILD_DIR)/libwrap_mwan3_sockopt.so.1.0 $(1)/lib/mwan3/
+
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DATA) ./files/etc/uci-defaults/mwan3-migrate-flush_conntrack \
+		$(1)/etc/uci-defaults/
 endef
 
 $(eval $(call BuildPackage,mwan3))
diff --git a/net/mwan3/files/etc/init.d/mwan3 b/net/mwan3/files/etc/init.d/mwan3
old mode 100755
new mode 100644
diff --git a/net/mwan3/files/usr/libexec/rpcd/mwan3 b/net/mwan3/files/usr/libexec/rpcd/mwan3
old mode 100755
new mode 100644
diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3
old mode 100755
new mode 100644
diff --git a/net/mwan3/files/usr/sbin/mwan3rtmon b/net/mwan3/files/usr/sbin/mwan3rtmon
old mode 100755
new mode 100644
diff --git a/net/mwan3/files/usr/sbin/mwan3track b/net/mwan3/files/usr/sbin/mwan3track
old mode 100755
new mode 100644