search

lixingcong / dnscrypt-proxy-openwrt

dnscrypt-proxy patch for openwrt 15.05
2 stars 1 forks source link

打补丁时出错了 #1

Open lersh opened 8 years ago

lersh commented 8 years ago

$ patch package/feeds/packages/dnscrypt-proxy/Makefile < dnscrypt-proxy-openwrt/002-dnscrypt.patch patching file package/feeds/packages/dnscrypt-proxy/Makefile Hunk #1 FAILED at 8. 1 out of 1 hunk FAILED -- saving rejects to file package/feeds/packages/dnscrypt-proxy/Makefile.rej

$ patch package/feeds/packages/libsodium/Makefile < dnscrypt-proxy-openwrt/001-libsodium.patch patching file package/feeds/packages/libsodium/Makefile Hunk #1 FAILED at 12. 1 out of 1 hunk FAILED -- saving rejects to file package/feeds/packages/libsodium/Makefile.rej

lersh commented 8 years ago

应该是我打补丁的原始包和你的不符，请问作者你的原始包是从哪里clone的？

lixingcong commented 8 years ago

Q：作者你的原始包是从哪里clone的？ A：package/feeds/packages/dnscrypt-proxy/Makefile的URL有写啊，是从官网的源码

Q：打补丁的原始包和我的的不符？ A：我的内核树是openwrt 15.05，你用trunk不一定能patch上

lersh commented 8 years ago

厄，可能我没表达清楚，我说的源码是openwrt工程源码是哪里来的，我是clone的这个工程：https://github.com/damianorenfer/dnscrypt-proxy-openwrt 但是打patch就是报错。 最后我是手动改的Makefile，编译通过了