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-pbr: sync with principal package #7267

Merged
merged 1 commit into from
Sep 5, 2024

Conversation

stangri
Copy link
Member

@stangri stangri commented Sep 3, 2024

Depends on openwrt/packages#24920

One update I'd like some feedback for is changing include of luci.mk from relative to an absolute path, that was requested by some users of upstream repo. If it's going to be a problem in OpenWrt repo, please let me know.

@stangri stangri added the depends on PR in other repo PR depends on PR in sister repo e.g. openwrt/packags label Sep 3, 2024
@stangri stangri merged commit 5f2e1bf into openwrt:master Sep 5, 2024
5 checks passed
@@ -24,6 +24,6 @@ help
Version: $(PKG_VERSION)-$(PKG_RELEASE)
endef

include ../../luci.mk
include $(TOPDIR)/feeds/luci/luci.mk
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stangri this change causing that in my local setup (and I'm not even building it):

ERROR: please fix package/feeds/applications/luci-app-pbr/Makefile - see logs/package/feeds/applications/luci-app-pbr/dump.txt for details

My luci.mk lives in openwrt/package/feeds/luci.mk and for all other packages it causes no problem.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the feedback, could you please provide the content of the logs/package/feeds/applications/luci-app-pbr/dump.txt?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here you are:

Makefile:27: /home/krant/openwrt/feeds/luci/luci.mk: No such file or directory
make[2]: *** No rule to make target '/home/krant/openwrt/feeds/luci/luci.mk'.  Stop.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krant thanks for your prompt reply, I'll revert the change

@stangri stangri deleted the master-luci-app-pbr branch September 19, 2024 16:25
stangri added a commit to stangri/luci that referenced this pull request Sep 22, 2024
* fixes the build issue reported by @krant in comments to openwrt#7267

Signed-off-by: Stan Grishin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
depends on PR in other repo PR depends on PR in sister repo e.g. openwrt/packags
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants