luci-app-socat: fix file conflicts #205
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: jjm2473 <[email protected]>
1715173329
reviewed
Aug 16, 2022
applications/luci-app-socat/Makefile
Outdated
| @@ -5,11 +5,15 @@ | |||
|
|
|||
| include $(TOPDIR)/rules.mk | |||
|
|
|||
| PKG_VERSION:=20220816-1 | |||
There was a problem hiding this comment.
I don't like this hack anyway.
Simply comment out this line and your issue should be solved:
https://github.com/immortalwrt/packages/blob/e896f65ee49be10b5c748e65c73b0db86ca6fc8f/net/socat/Makefile#L88
There was a problem hiding this comment.
PKG_VERSION如果要兼容luci17到luci21，就只能这样hack。
之所以不改上游或者第一方的软件包，是因为我打算依赖官方的软件仓库，如果三方的软件包文件跟一方的软件包冲突，自然是改三方的，而且改了也没任何副作用。
There was a problem hiding this comment.
如果要让用户方便地使用多个软件仓库，自然是要解决这些文件冲突的。总之我们的仓库已经更新了没冲突的版本，如果你们不需要这个patch就关闭吧
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
修复luci-app-socat与socat冲突的文件
Signed-off-by: jjm2473 [email protected]