From 408989ae8425988533122f4032766336aba563b3 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 21 Jul 2021 18:54:17 +0200 Subject: [PATCH] treewide: correctly specify conffiles 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 e8f69535..764affb7 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 7718fa2b..79503a15 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 dfc1717a..8efa2a4c 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 adbe0f78..b8dfa71c 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))