Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

luci-app-adblock-fast: prepare migration to APK #7009

Merged
merged 1 commit into from
Mar 24, 2024

Conversation

stangri
Copy link
Member

@stangri stangri commented Mar 23, 2024

Maintainer: me
Compile tested: x86_64, Sophos XG-135r3, OpenWrt 23.05.2

Signed-off-by: Stan Grishin <stangri@melmac.ca>
@aparcar
Copy link
Member

aparcar commented Mar 23, 2024

Is there a reason you don't set it to PKG_RELEASE=x?

@stangri stangri merged commit 72da033 into openwrt:master Mar 24, 2024
3 checks passed
@stangri
Copy link
Member Author

stangri commented Mar 24, 2024

Is there a reason you don't set it to PKG_RELEASE=x?

Sorry, missed your comment! Thank you -- first time it's been brought up regarding my luci apps, even when others contributed, so I was not aware of that variable being available for luci apps. I'll update all of the luci apps in my repo now and the fix be merged next time I create a feature PR.

@stangri
Copy link
Member Author

stangri commented Apr 3, 2024

Is there a reason you don't set it to PKG_RELEASE=x?

@aparcar I've changed all my luci packages to include PKG_RELEASE and now I remembered why I didn't do it originally -- the produced IPK file for luci applications doesn't seem to include the PKG_RELEASE in the filename, at least with 23.05 SDK.

So with the same

PKG_VERSION:=1.1.1
PKG_RELEASE:=r7

the produced IPKs are:

adblock-fast_1.1.1-r7_all.ipk
luci-app-adblock-fast_1.1.1_all.ipk

Since you're working on the include files for the APK prep, any chance you could have a look at the luci.mk (or wherever the version number for the resulting IPK file is set) to fix that?

@aparcar
Copy link
Member

aparcar commented Apr 3, 2024

I have no strong opinion here except that I'd prefer to not complicate things. Your current solution seems fine, not needing to use PKG_RELEASE. I wasn't aware that it's ignored by luci.mk.

stangri added a commit to stangri/luci that referenced this pull request Apr 3, 2024
Fixes issue mentioned in openwrt#7009 (comment)
where the IPK filename doesn't contain revision from the luci-app Makefile.

Signed-off-by: Stan Grishin <stangri@melmac.ca>
stangri added a commit to stangri/luci that referenced this pull request Apr 8, 2024
Fixes issue mentioned in openwrt#7009 (comment)
where the IPK filename doesn't contain release from the luci-app Makefile.

Signed-off-by: Stan Grishin <stangri@melmac.ca>
@stangri stangri deleted the master-luci-app-adblock-fast branch May 13, 2024 04:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants