From: Christian Marangi <ansuelsmth@gmail.com>
Date: Sat, 16 Nov 2024 17:16:20 +0000 (+0100)
Subject: luci-app-package-manager: support new APK repositories.d configs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F7400%2Fhead;p=project%2Fluci.git

luci-app-package-manager: support new APK repositories.d configs

Support new APK repositories.d configs following OPKG was to better
split distfeeds and customfeeds.

Support for ""legacy"" repositories is kept to support migration period
and to support custom scenario where user use this file instead.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---

diff --git a/applications/luci-app-package-manager/htdocs/luci-static/resources/view/package-manager.js b/applications/luci-app-package-manager/htdocs/luci-static/resources/view/package-manager.js
index 380ee76d82..d79ee985c9 100644
--- a/applications/luci-app-package-manager/htdocs/luci-static/resources/view/package-manager.js
+++ b/applications/luci-app-package-manager/htdocs/luci-static/resources/view/package-manager.js
@@ -865,8 +865,13 @@ function handleConfig(ev)
 	fs.list(base_dir).then(function(partials) {
 		var files = [];
 
-		if (!L.hasSystemFeature('apk'))
-			files.push(base_dir + '.conf')
+		if (L.hasSystemFeature('apk')) {
+                        files.push(base_dir + '/' + 'repositories.d/customfeeds.list',
+                                   base_dir + '/' + 'repositories.d/distfeeds.list'
+                        )
+                } else {
+                        files.push(base_dir + '.conf')
+                }
 
 		for (var i = 0; i < partials.length; i++) {
 			if (partials[i].type == 'file') {
diff --git a/applications/luci-app-package-manager/root/usr/share/rpcd/acl.d/luci-app-package-manager.json b/applications/luci-app-package-manager/root/usr/share/rpcd/acl.d/luci-app-package-manager.json
index e421238959..8d551860e8 100644
--- a/applications/luci-app-package-manager/root/usr/share/rpcd/acl.d/luci-app-package-manager.json
+++ b/applications/luci-app-package-manager/root/usr/share/rpcd/acl.d/luci-app-package-manager.json
@@ -8,7 +8,9 @@
 				"/usr/libexec/package-manager-call list-available": [ "exec" ],
 				"/etc/opkg.conf": [ "read" ],
 				"/etc/opkg/*.conf": [ "read" ],
-				"/etc/apk/repositories": [ "read" ]
+				"/etc/apk/repositories": [ "read" ],
+				"/etc/apk/repositories.d/distfeeds.list": [ "read" ],
+				"/etc/apk/repositories.d/customfeeds.list": [ "read" ]
 			},
 			"ubus": {
 				"luci": [ "getMountPoints" ]
@@ -25,6 +27,8 @@
 				"/etc/opkg.conf": [ "write" ],
 				"/etc/opkg/*.conf": [ "write" ],
 				"/etc/apk/repositories": [ "write" ],
+				"/etc/apk/repositories.d/distfeeds.list": [ "write" ],
+				"/etc/apk/repositories.d/customfeeds.list": [ "write" ],
 				"/tmp/upload.ipk": [ "write" ],
 				"/tmp/upload.apk": [ "write" ]
 			}