From 3609db7136f452f907d3a7367bb3351b80ff48f4 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 27 Feb 2021 23:50:35 +0100
Subject: [PATCH] - xupnpd: move files to package dir

---
 make/target-tools.mk                                           | 3 +--
 .../xupnpd.init => package/xupnpd/files-skel/etc/init.d/xupnpd | 0
 .../files-skel}/usr/share/xupnpd/playlists/youtube_music.m3u   | 0
 .../xupnpd/files-skel}/usr/share/xupnpd/xupnpd_cfg.lua         | 0
 .../xupnpd/files-skel}/usr/share/xupnpd/xupnpd_feeds.lua       | 0
 .../xupnpd/files-skel}/usr/share/xupnpd/xupnpd_playlist.lua    | 0
 .../xupnpd/files-skel}/var/xupnpd/xupnpd_cfg.lua               | 0
 .../xupnpd/files-skel}/var/xupnpd/xupnpd_feeds.lua             | 0
 .../xupnpd/files-skel}/var/xupnpd/xupnpd_playlist.lua          | 0
 9 files changed, 1 insertion(+), 2 deletions(-)
 rename skel-root/general/scripts/xupnpd.init => package/xupnpd/files-skel/etc/init.d/xupnpd (100%)
 mode change 100644 => 100755
 rename {skel-root/general/xupnpd => package/xupnpd/files-skel}/usr/share/xupnpd/playlists/youtube_music.m3u (100%)
 rename {skel-root/general/xupnpd => package/xupnpd/files-skel}/usr/share/xupnpd/xupnpd_cfg.lua (100%)
 rename {skel-root/general/xupnpd => package/xupnpd/files-skel}/usr/share/xupnpd/xupnpd_feeds.lua (100%)
 rename {skel-root/general/xupnpd => package/xupnpd/files-skel}/usr/share/xupnpd/xupnpd_playlist.lua (100%)
 rename {skel-root/general/xupnpd => package/xupnpd/files-skel}/var/xupnpd/xupnpd_cfg.lua (100%)
 rename {skel-root/general/xupnpd => package/xupnpd/files-skel}/var/xupnpd/xupnpd_feeds.lua (100%)
 rename {skel-root/general/xupnpd => package/xupnpd/files-skel}/var/xupnpd/xupnpd_playlist.lua (100%)

diff --git a/make/target-tools.mk b/make/target-tools.mk
index c03b12e1..b6e59543 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -1624,9 +1624,8 @@ xupnpd: $(XUPNPD_DEPS) | $(TARGET_DIR)
 	$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/xupnpd/xupnpd_neutrino.lua $(TARGET_datadir)/xupnpd/plugins/
 	$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/xupnpd/xupnpd_vimeo.lua $(TARGET_datadir)/xupnpd/plugins/
 	$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGET_datadir)/xupnpd/plugins/
-	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/xupnpd.init $(TARGET_sysconfdir)/init.d/xupnpd
+	$(INSTALL_COPY) $(PKG_FILES_DIR)-skel/* $(TARGET_DIR)/
 	$(UPDATE-RC.D) xupnpd defaults 75 25
-	$(INSTALL_COPY) $(TARGET_FILES)/xupnpd/* $(TARGET_DIR)/
 	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)
 
diff --git a/skel-root/general/scripts/xupnpd.init b/package/xupnpd/files-skel/etc/init.d/xupnpd
old mode 100644
new mode 100755
similarity index 100%
rename from skel-root/general/scripts/xupnpd.init
rename to package/xupnpd/files-skel/etc/init.d/xupnpd
diff --git a/skel-root/general/xupnpd/usr/share/xupnpd/playlists/youtube_music.m3u b/package/xupnpd/files-skel/usr/share/xupnpd/playlists/youtube_music.m3u
similarity index 100%
rename from skel-root/general/xupnpd/usr/share/xupnpd/playlists/youtube_music.m3u
rename to package/xupnpd/files-skel/usr/share/xupnpd/playlists/youtube_music.m3u
diff --git a/skel-root/general/xupnpd/usr/share/xupnpd/xupnpd_cfg.lua b/package/xupnpd/files-skel/usr/share/xupnpd/xupnpd_cfg.lua
similarity index 100%
rename from skel-root/general/xupnpd/usr/share/xupnpd/xupnpd_cfg.lua
rename to package/xupnpd/files-skel/usr/share/xupnpd/xupnpd_cfg.lua
diff --git a/skel-root/general/xupnpd/usr/share/xupnpd/xupnpd_feeds.lua b/package/xupnpd/files-skel/usr/share/xupnpd/xupnpd_feeds.lua
similarity index 100%
rename from skel-root/general/xupnpd/usr/share/xupnpd/xupnpd_feeds.lua
rename to package/xupnpd/files-skel/usr/share/xupnpd/xupnpd_feeds.lua
diff --git a/skel-root/general/xupnpd/usr/share/xupnpd/xupnpd_playlist.lua b/package/xupnpd/files-skel/usr/share/xupnpd/xupnpd_playlist.lua
similarity index 100%
rename from skel-root/general/xupnpd/usr/share/xupnpd/xupnpd_playlist.lua
rename to package/xupnpd/files-skel/usr/share/xupnpd/xupnpd_playlist.lua
diff --git a/skel-root/general/xupnpd/var/xupnpd/xupnpd_cfg.lua b/package/xupnpd/files-skel/var/xupnpd/xupnpd_cfg.lua
similarity index 100%
rename from skel-root/general/xupnpd/var/xupnpd/xupnpd_cfg.lua
rename to package/xupnpd/files-skel/var/xupnpd/xupnpd_cfg.lua
diff --git a/skel-root/general/xupnpd/var/xupnpd/xupnpd_feeds.lua b/package/xupnpd/files-skel/var/xupnpd/xupnpd_feeds.lua
similarity index 100%
rename from skel-root/general/xupnpd/var/xupnpd/xupnpd_feeds.lua
rename to package/xupnpd/files-skel/var/xupnpd/xupnpd_feeds.lua
diff --git a/skel-root/general/xupnpd/var/xupnpd/xupnpd_playlist.lua b/package/xupnpd/files-skel/var/xupnpd/xupnpd_playlist.lua
similarity index 100%
rename from skel-root/general/xupnpd/var/xupnpd/xupnpd_playlist.lua
rename to package/xupnpd/files-skel/var/xupnpd/xupnpd_playlist.lua