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

编译时发生冲突 #15

Open
Rian-l opened this issue Sep 20, 2022 · 4 comments
Open

编译时发生冲突 #15

Rian-l opened this issue Sep 20, 2022 · 4 comments

Comments

@Rian-l
Copy link

Rian-l commented Sep 20, 2022

如题,在编译mentohust与luci-app-mentohust时发生冲突,都是采用原作者的仓库直接拉取,发现init.d脚本会有冲突,贴上luci-aapp-mentohust仓库地址:https://github.com/kenzok8/small-package/blob/main/luci-app-mentohust/Makefile

大概在40行左右,都有一个对init.d的操作

@Rian-l
Copy link
Author

Rian-l commented Sep 20, 2022

我在别人的软件源仓库发现了修改过的代码https://github.com/tcsr200722/openwrt-luci-app/blob/luci19/mentohust/Makefile

顺便贴上恩山提问的帖子地址https://www.right.com.cn/forum/thread-8254589-1-1.html

@KyleRicardo
Copy link
Owner

前段时间合并了一个关于mentohust自启动的PR,由于我已经没有测试环境,所以就直接合并了。你如果有更好的思路,欢迎PR。

@Rian-l
Copy link
Author

Rian-l commented Sep 21, 2022

https://github.com/KyleRicardo/MentoHUST-OpenWrt-ipk/blob/master/Makefile

将58、57行代码注释掉,就可以在交叉编译的时候与luci-app-mentohust不发生冲突。如果直接拉取两个原版库进行编译会发生冲突,我不知道是不是我设备的问题,我是用的是lede的源码。感谢您之前的付出。

@Rian-l
Copy link
Author

Rian-l commented Sep 21, 2022

前段时间合并了一个关于mentohust自启动的PR,由于我已经没有测试环境,所以就直接合并了。你如果有更好的思路,欢迎PR。

说错了,是58、59行

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

No branches or pull requests

2 participants