From f4a3afe8fb1b82f41ee97f271306efd2d1281782 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 23 Jul 2021 19:48:58 +0200
Subject: [PATCH] treewide: correctly specify conffiles (#2276)

Specify conffiles for our packages, so they aren't overwritten during
opkg updates. While this only matters during development, it is
unintended to have different behaviour for opkg update and full firmware
updates.
---
 package/gluon-core/Makefile        | 5 +++++
 package/gluon-node-info/Makefile   | 4 ++++
 package/gluon-setup-mode/Makefile  | 4 ++++
 package/gluon-wan-dnsmasq/Makefile | 4 ++++
 4 files changed, 17 insertions(+)

diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile
index e8f695353..764affb7e 100644
--- a/package/gluon-core/Makefile
+++ b/package/gluon-core/Makefile
@@ -27,6 +27,11 @@ config GLUON_MINIFY
 	default y
 endef
 
+define Package/gluon-core/conffiles
+/etc/config/gluon
+/etc/config/gluon-core
+endef
+
 define Package/gluon-core/install
 	$(Gluon/Build/Install)
 
diff --git a/package/gluon-node-info/Makefile b/package/gluon-node-info/Makefile
index 7718fa2b7..79503a155 100644
--- a/package/gluon-node-info/Makefile
+++ b/package/gluon-node-info/Makefile
@@ -11,4 +11,8 @@ define Package/gluon-node-info
   DEPENDS:=+gluon-core +libgluonutil
 endef
 
+define Package/gluon-node-info/conffiles
+/etc/config/gluon-node-info
+endef
+
 $(eval $(call BuildPackageGluon,gluon-node-info))
diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile
index dfc1717a6..8efa2a4c6 100644
--- a/package/gluon-setup-mode/Makefile
+++ b/package/gluon-setup-mode/Makefile
@@ -17,6 +17,10 @@ define Package/gluon-setup-mode/description
 	Offline mode to perform basic setup in a secure manner.
 endef
 
+define Package/gluon-setup-mode/conffiles
+/etc/config/gluon-setup-mode
+endef
+
 init_links := \
 	K89log \
 	K98boot \
diff --git a/package/gluon-wan-dnsmasq/Makefile b/package/gluon-wan-dnsmasq/Makefile
index adbe0f788..b8dfa71c1 100644
--- a/package/gluon-wan-dnsmasq/Makefile
+++ b/package/gluon-wan-dnsmasq/Makefile
@@ -14,4 +14,8 @@ define Package/gluon-wan-dnsmasq/description
 	Gluon community wifi mesh firmware framework: Support for a secondary DNS server using the WAN interface
 endef
 
+define Package/gluon-wan-dnsmasq/conffiles
+/etc/config/gluon-wan-dnsmasq
+endef
+
 $(eval $(call BuildPackageGluon,gluon-wan-dnsmasq))
-- 
GitLab