From: Florian Eckert <redacted>
Date: Tue, 5 Mar 2024 11:59:23 +0000 (+0100)
Subject: modemmanager: moving the openwrt related files to subdirectories
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=dab2cdc44c1db81d1384a495c5e0ca7774c497cf;p=openwrt-packages.git

modemmanager: moving the openwrt related files to subdirectories

Moving the openwrt related files to subdirectories as they are installed
on the system. This change makes it immediately apparent during development
where the file is to be installed in the running system.

Signed-off-by: Florian Eckert <redacted>
---

diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile
index c4c9e8af4..bdd55817a 100644
--- a/net/modemmanager/Makefile
+++ b/net/modemmanager/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=modemmanager
 PKG_SOURCE_VERSION:=1.22.0
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
@@ -101,7 +101,8 @@ define Package/modemmanager/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmm-glib.so.* $(1)/usr/lib
 
 	$(INSTALL_DIR) $(1)/usr/lib/ModemManager/connection.d
-	$(INSTALL_BIN) ./files/10-report-down $(1)/usr/lib/ModemManager/connection.d
+	$(INSTALL_BIN) ./files/usr/lib/ModemManager/connection.d/10-report-down \
+		$(1)/usr/lib/ModemManager/connection.d
 
 	$(INSTALL_DIR) $(1)/etc/dbus-1/system.d
 	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/org.freedesktop.ModemManager1.conf $(1)/etc/dbus-1/system.d
@@ -111,25 +112,31 @@ define Package/modemmanager/install
 
 	$(INSTALL_DIR) $(1)/usr/share/ModemManager
 	$$(if $$(wildcard $(PKG_INSTALL_DIR)/usr/share/ModemManager/*.conf),$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ModemManager/*.conf $(1)/usr/share/ModemManager,)
-	$(INSTALL_DATA) ./files/modemmanager.common $(1)/usr/share/ModemManager
+	$(INSTALL_DATA) ./files/usr/share/ModemManager/modemmanager.common \
+		$(1)/usr/share/ModemManager
 
 	$(INSTALL_DIR) $(1)/usr/share/ModemManager/fcc-unlock.available.d
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ModemManager/fcc-unlock.available.d/* $(1)/usr/share/ModemManager/fcc-unlock.available.d
 
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/modemmanager.init $(1)/etc/init.d/modemmanager
+	$(INSTALL_BIN) ./files/etc/init.d/modemmanager \
+		$(1)/etc/init.d/modemmanager
 
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/net
-	$(INSTALL_DATA) ./files/25-modemmanager-net $(1)/etc/hotplug.d/net
+	$(INSTALL_DATA) ./files/etc/hotplug.d/net/25-modemmanager-net \
+		$(1)/etc/hotplug.d/net
 
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/tty
-	$(INSTALL_DATA) ./files/25-modemmanager-tty $(1)/etc/hotplug.d/tty
+	$(INSTALL_DATA) ./files/etc/hotplug.d/tty/25-modemmanager-tty \
+		$(1)/etc/hotplug.d/tty
 
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/wwan
-	$(INSTALL_DATA) ./files/25-modemmanager-wwan $(1)/etc/hotplug.d/wwan
+	$(INSTALL_DATA) ./files/etc/hotplug.d/wwan/25-modemmanager-wwan \
+		$(1)/etc/hotplug.d/wwan
 
 	$(INSTALL_DIR) $(1)/lib/netifd/proto
-	$(INSTALL_BIN) ./files/modemmanager.proto $(1)/lib/netifd/proto/modemmanager.sh
+	$(INSTALL_BIN) ./files/lib/netifd/proto/modemmanager.sh \
+		$(1)/lib/netifd/proto
 endef
 
 $(eval $(call BuildPackage,modemmanager))
diff --git a/net/modemmanager/files/25-modemmanager-net b/net/modemmanager/files/etc/hotplug.d/net/25-modemmanager-net
similarity index 100%
rename from net/modemmanager/files/25-modemmanager-net
rename to net/modemmanager/files/etc/hotplug.d/net/25-modemmanager-net
diff --git a/net/modemmanager/files/25-modemmanager-tty b/net/modemmanager/files/etc/hotplug.d/tty/25-modemmanager-tty
similarity index 100%
rename from net/modemmanager/files/25-modemmanager-tty
rename to net/modemmanager/files/etc/hotplug.d/tty/25-modemmanager-tty
diff --git a/net/modemmanager/files/25-modemmanager-wwan b/net/modemmanager/files/etc/hotplug.d/wwan/25-modemmanager-wwan
similarity index 100%
rename from net/modemmanager/files/25-modemmanager-wwan
rename to net/modemmanager/files/etc/hotplug.d/wwan/25-modemmanager-wwan
diff --git a/net/modemmanager/files/modemmanager.init b/net/modemmanager/files/etc/init.d/modemmanager
old mode 100755
new mode 100644
similarity index 100%
rename from net/modemmanager/files/modemmanager.init
rename to net/modemmanager/files/etc/init.d/modemmanager
diff --git a/net/modemmanager/files/modemmanager.proto b/net/modemmanager/files/lib/netifd/proto/modemmanager.sh
old mode 100755
new mode 100644
similarity index 100%
rename from net/modemmanager/files/modemmanager.proto
rename to net/modemmanager/files/lib/netifd/proto/modemmanager.sh
diff --git a/net/modemmanager/files/10-report-down b/net/modemmanager/files/usr/lib/ModemManager/connection.d/10-report-down
old mode 100755
new mode 100644
similarity index 100%
rename from net/modemmanager/files/10-report-down
rename to net/modemmanager/files/usr/lib/ModemManager/connection.d/10-report-down
diff --git a/net/modemmanager/files/modemmanager.common b/net/modemmanager/files/usr/share/ModemManager/modemmanager.common
similarity index 100%
rename from net/modemmanager/files/modemmanager.common
rename to net/modemmanager/files/usr/share/ModemManager/modemmanager.common