luci-app-package-manager: rename from luci-app-opkg and add APK support #7341

Ansuel · 2024-10-22T23:30:45Z

Rename luci-app-opkg to luci-app-ipkg and add APK support for it.

The idea is to adapt APK to mimic OPKG output to require minimal changes
to the luci app.

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

@jow- @aparcar @hauke

TODO:

What works:

List packages
Update package list

Depends on:
openwrt/openwrt#16759

Fix passing wrong option on opkg update/install. While starting to introduce support for APK in the opkg module, it was notice that --force-removal-of-dependent-packages was always passed even with update and install command. This was probably a leftover/oversight of old one. To fix this, limit this option only on remove and also update the acl.d to support single call to update or install. Fixes: 9b25031 ("luci-app-opkg: rework backend operations") Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

systemcrash · 2024-10-22T23:45:02Z

Does this mean all rpc calls or otherwise to opkg must be updated?

stangri · 2024-10-22T23:56:23Z

Rename luci-app-opkg to luci-app-ipkg and add APK support for it.

Why luci-app-ipkg? Why not luci-app-pkg-manager/luci-app-package-manager for example?

systemcrash · 2024-10-22T23:57:21Z

@stangri

Why luci-app-ipkg? Why not luci-app-pkg-manager/luci-app-package-manager for example?

standard naming convention ig.

Ansuel · 2024-10-23T00:02:05Z

Does this mean all rpc calls or otherwise to opkg must be updated?

all rpc calls -> none

OPKG is enough sensible to wrap it in helper script and we already minimize it to just opkg-call script hence it's all handled there, we don't call opkg directly. But would love some comments by jow confirming this.

Ansuel · 2024-10-23T00:02:46Z

Rename luci-app-opkg to luci-app-ipkg and add APK support for it.

Why luci-app-ipkg? Why not luci-app-pkg-manager/luci-app-package-manager for example?

yes can be an idea but for sure the name needs to be changed to something more generic.

hnyman · 2024-10-23T05:45:57Z

+1 for a clear name that is also understandable by newcomers.

luci-app-packagemanager would be my favorite

lorand-horvath · 2024-10-23T06:29:29Z

luci-app-opm - short for Openwrt Package Manager

luci-app-pm - even shorter

castillofrancodamian · 2024-10-23T20:29:58Z

+1 for a clear name that is also understandable by newcomers.

luci-app-packagemanager would be my favorite

Or luci-app-package-manager. I like it better.

Add APK as detectable feature so that generic luci-app-pkg can detect OPKG or APK package manager. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

systemcrash · 2024-10-23T20:35:03Z

Full names tend to serve better than ambiguous acronyms and abbreviations for first-timers.

I like luci-app-package-manager

Rename luci-app-opkg to luci-app-package-manager and add APK support for it. The idea is to adapt APK to mimik OPKG output to require minimal changes to the luci app. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

Ansuel · 2024-10-23T20:58:38Z

Actually this went pretty fast... Should be finished... Maybe the po file needs some bit of touchup...

systemcrash · 2024-10-23T21:04:02Z

@Ansuel

build/i18n-sync.sh applications/luci-app-package-manager

systemcrash · 2024-10-23T22:11:51Z

Closed by bcd13b9

stokito · 2024-10-23T22:01:20Z

applications/luci-app-package-manager/htdocs/luci-static/resources/view/package-manager.js

@@ -1133,7 +1146,7 @@ return view.extend({
 			E('h2', {}, _('Software')),

 			E('div', { 'class': 'cbi-map-descr' }, [
-				E('span', _('Install additional software and upgrade existing packages with opkg.')),
+				E('span', _('Install additional software and upgrade existing packages with %s.').format(L.hasSystemFeature('apk') ? 'apk' : 'opkg')),


We also need to replace the opkg in the existing translation keys to not lost them.
But I would rather simplify the sentence to Install additional software and upgrade existing packages

stokito · 2024-10-23T22:05:35Z

applications/luci-app-package-manager/htdocs/luci-static/resources/view/package-manager.js

 						E('button', { 'class': 'btn cbi-button-action', 'click': handleUpload, 'disabled': isReadonlyView }, [ _('Upload Package…') ]), ' ',
-						E('button', { 'class': 'btn cbi-button-neutral', 'click': handleConfig }, [ _('Configure opkg…') ])
+						E('button', { 'class': 'btn cbi-button-neutral', 'click': handleConfig }, [ _('Configure %s').format(L.hasSystemFeature('apk') ? 'apk' : 'opkg') ])


Does the APK also has a plain text config file?
For the opkg we have a window OPKG Configuration with many options that shouldn't be same with APT.

Maybe this can be also simplified to just Configure…

stokito · 2024-10-23T22:07:21Z

applications/luci-app-package-manager/po/templates/package-manager.pot

@@ -0,0 +1,387 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"


(just a wish) It would be great to have a separate commit with the file rename and then with changing of keys to easily see the diff

stokito · 2024-10-23T22:08:47Z

applications/luci-app-package-manager/po/templates/package-manager.pot

+
+#: applications/luci-app-ipkg/htdocs/luci-static/resources/view/package_manager.js:878
+msgid ""
+"Below is a listing of the various configuration files used by <em>ipkg</em>. "


So ipkg or opkg?

stokito · 2024-10-23T22:19:52Z

applications/luci-app-package-manager/root/usr/libexec/package-manager-call

+
+			json_init
+			json_add_int code $code
+			[ -n "$stdout" ] && json_add_string stdout "$stdout"


we can simplify this and always add the field even if empty i.e. just json_add_string stdout "$stdout"

stokito · 2024-10-23T22:21:16Z

applications/luci-app-package-manager/root/usr/libexec/package-manager-call

+		fi
+	;;
+	install|update|remove)
+		(


so big subshell, maybe it's possible to extract a function here?

stokito · 2024-10-23T22:24:50Z

I added some minor comments, you may ignore them since it's merged

Ansuel · 2024-10-23T22:27:26Z

@stokito thanks for the comments I will take care of fixing them

systemcrash · 2024-10-25T20:37:46Z

Yo @Ansuel can this get cherry-picked to 23 or is there stuff it requires from master?

Ansuel · 2024-10-25T20:39:00Z

not at all... 23 doesn't even have working apk. Why should we backport?

systemcrash · 2024-10-25T20:40:27Z

Ah, maybe I can just take the useful fix from #7340 to 23?

Ansuel · 2024-10-25T20:53:06Z

@systemcrash yep that was why it was in a dedicated commit :D

luci-base: add APK as detectable feature

56abbf4

Add APK as detectable feature so that generic luci-app-pkg can detect OPKG or APK package manager. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

Ansuel force-pushed the wip-apk-luci branch 2 times, most recently from 246635b to e0c6c17 Compare October 23, 2024 20:53

Ansuel changed the title ~~luci-app-ipkg: rename from luci-app-opkg and add APK support~~ luci-app-package-manager: rename from luci-app-opkg and add APK support Oct 23, 2024

Ansuel force-pushed the wip-apk-luci branch from e0c6c17 to d25c12b Compare October 23, 2024 20:55

Ansuel force-pushed the wip-apk-luci branch from d25c12b to 2220893 Compare October 23, 2024 20:56

Ansuel marked this pull request as ready for review October 23, 2024 20:58

systemcrash closed this Oct 23, 2024

stokito reviewed Oct 23, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

luci-app-package-manager: rename from luci-app-opkg and add APK support #7341

luci-app-package-manager: rename from luci-app-opkg and add APK support #7341

Ansuel commented Oct 22, 2024 •

edited

Loading

systemcrash commented Oct 22, 2024

stangri commented Oct 22, 2024

systemcrash commented Oct 22, 2024

Ansuel commented Oct 23, 2024 •

edited

Loading

Ansuel commented Oct 23, 2024

hnyman commented Oct 23, 2024

lorand-horvath commented Oct 23, 2024

castillofrancodamian commented Oct 23, 2024

systemcrash commented Oct 23, 2024

Ansuel commented Oct 23, 2024

systemcrash commented Oct 23, 2024 •

edited

Loading

systemcrash commented Oct 23, 2024

stokito Oct 23, 2024

stokito Oct 23, 2024

stokito Oct 23, 2024

stokito Oct 23, 2024

stokito Oct 23, 2024

stokito Oct 23, 2024

stokito commented Oct 23, 2024 •

edited

Loading

Ansuel commented Oct 23, 2024

systemcrash commented Oct 25, 2024

Ansuel commented Oct 25, 2024

systemcrash commented Oct 25, 2024

Ansuel commented Oct 25, 2024

		@@ -0,0 +1,387 @@
		msgid ""
		msgstr "Content-Type: text/plain; charset=UTF-8"

luci-app-package-manager: rename from luci-app-opkg and add APK support #7341

luci-app-package-manager: rename from luci-app-opkg and add APK support #7341

Conversation

Ansuel commented Oct 22, 2024 • edited Loading

systemcrash commented Oct 22, 2024

stangri commented Oct 22, 2024

systemcrash commented Oct 22, 2024

Ansuel commented Oct 23, 2024 • edited Loading

Ansuel commented Oct 23, 2024

hnyman commented Oct 23, 2024

lorand-horvath commented Oct 23, 2024

castillofrancodamian commented Oct 23, 2024

systemcrash commented Oct 23, 2024

Ansuel commented Oct 23, 2024

systemcrash commented Oct 23, 2024 • edited Loading

systemcrash commented Oct 23, 2024

stokito Oct 23, 2024

Choose a reason for hiding this comment

stokito Oct 23, 2024

Choose a reason for hiding this comment

stokito Oct 23, 2024

Choose a reason for hiding this comment

stokito Oct 23, 2024

Choose a reason for hiding this comment

stokito Oct 23, 2024

Choose a reason for hiding this comment

stokito Oct 23, 2024

Choose a reason for hiding this comment

stokito commented Oct 23, 2024 • edited Loading

Ansuel commented Oct 23, 2024

systemcrash commented Oct 25, 2024

Ansuel commented Oct 25, 2024

systemcrash commented Oct 25, 2024

Ansuel commented Oct 25, 2024

Ansuel commented Oct 22, 2024 •

edited

Loading

Ansuel commented Oct 23, 2024 •

edited

Loading

systemcrash commented Oct 23, 2024 •

edited

Loading

stokito commented Oct 23, 2024 •

edited

Loading