Skip to contentSkip to conversation

shadowsocks-libev: Drop the useless hash.

PATCH New Min Xu 2 participants 6 messages Jun 11, 2018 – Jun 18, 2018

lore
Share & tools
lore

Min Xu

author
#0 lore raw

PATCH v2 1/3 shadowsocks-libev: Drop the useless hash.

---
 package/shadowsocks-libev/shadowsocks-libev.hash | 1 -
 1 file changed, 1 deletion(-)
package/shadowsocks-libev/shadowsocks-libev.hash +0 -1
index e8be8a8..fffe9fd 100644
@@ -5,4 +5,3 @@ sha256 5521cf623a07fd1e393528516a83acd2b66c5d4bb4535a52662806a6a060c606 shadowso
 sha256 736883f97d44dbec288bb82819f18f4f86d02ae3192f6a9abefa00db76bace41  COPYING
 sha256 c41a4bc2c4c43e4daa3051e77e31b2d5c8500498afaeac6d831d55a4bb8de3fb  libbloom/LICENSE
 sha256 4fa2ada54f8c0410ec243265378242ffe862386d5ac517f8dd30a1911d25ae93  libcork/COPYING
-sha256 4b3adc9ce620fa868f1dda328203dbccbd3e9f5fbafb49c581edc386a504ee1a  libipset/LICENSE.txt
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH v2 2/3 shadowsocks-libev: Adding the pthreads dependency

---
 package/shadowsocks-libev/Config.in | 1 +
 1 file changed, 1 insertion(+)
package/shadowsocks-libev/Config.in +1 -0
index d02e5a9..82c88e9 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SHADOWSOCKS_LIBEV
 	bool "shadowsocks-libev"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # require pthreads
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_C_ARES
 	select BR2_PACKAGE_LIBEV
Signature · 1 line
2.11.0
#2 lore raw

PATCH v2 2/3 shadowsocks-libev: Adding the pthreads dependency

Hello,

Quoted 1 line · Min Xu

Here again, the commit log was empty, which is not good. It should have explained *why* you did this change.

Quoted 9 lines
---
 package/shadowsocks-libev/Config.in | 1 +
 1 file changed, 1 insertion(+)
package/shadowsocks-libev/Config.in +0 -0
index d02e5a9..82c88e9 100644

package/shadowsocks-libev/Config.in line 6

Quoted 6 lines
package/shadowsocks-libev/Config.in +1 -0
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SHADOWSOCKS_LIBEV
 	bool "shadowsocks-libev"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # require pthreads
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_C_ARES
 	select BR2_PACKAGE_LIBEV

When you add a dependency on a toolchain option, you need to add the corresponding Config.in comment:

+comment "shadowsocks-libev needs a toolchain w/ threads"
+ depends on BR2_USE_MMU
+ depends on !BR2_TOOLCHAIN_HAS_THREADS

I've added that, extended the commit log and applied.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
author
#3 lore raw

PATCH v2 2/3 shadowsocks-libev: Adding the pthreads dependency

Hi Thomas,

Thank you for your help. I'll keep learning and improving my commit.

MinXu

Quoted 42 lines · Thomas Petazzoni

Hello,

Quoted 1 line · Min Xu

Here again, the commit log was empty, which is not good. It should have explained *why* you did this change.

Review

Quoted 5 lines
---
 package/shadowsocks-libev/Config.in | 1 +
 1 file changed, 1 insertion(+)
(quoted diff) +0 -0

b/package/shadowsocks-libev/Config.in

package/shadowsocks-libev/Config.in line 6

Quoted 10 lines

index d02e5a9..82c88e9 100644

package/shadowsocks-libev/Config.in +1 -0
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SHADOWSOCKS_LIBEV
      bool "shadowsocks-libev"
+     depends on BR2_TOOLCHAIN_HAS_THREADS # require pthreads
      depends on BR2_USE_MMU # fork()
      select BR2_PACKAGE_C_ARES
      select BR2_PACKAGE_LIBEV

When you add a dependency on a toolchain option, you need to add the corresponding Config.in comment:

(quoted diff) +3 -0
+comment "shadowsocks-libev needs a toolchain w/ threads"
+       depends on BR2_USE_MMU
+       depends on !BR2_TOOLCHAIN_HAS_THREADS

I've added that, extended the commit log and applied.

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering
https://bootlin.com

Signature · 6 lines
*Best Regards*

*XuMin's Ready?*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180618/9a8041f3/attachment.html>
author
#4 lore raw

PATCH v2 3/3 shadowsocks-libev: Adding the __sync related dependency

In reply to Min Xu

To fixup libcork linking errors:
"undefined reference to `__sync_val_compare_and_swap_4'" Fixes
http://autobuild.buildroot.net/results/552b09ffe951c429422529c895f4c3ec723cf5ab

http://autobuild.buildroot.net/results/4810526381e15a194767753d324875bfbf5e3dde
http://autobuild.buildroot.net/results/9cb76805c2f2952aa434d143831ee03c7d43aa52

http://autobuild.buildroot.net/results/d00c5f9e1e7a6a40fac5763a06977b351b7875da
http://autobuild.buildroot.net/results/0612f2dc09a8763fdf2111ee8d0c223c8531262a

---
 package/shadowsocks-libev/Config.in | 2 ++
 1 file changed, 2 insertions(+)
package/shadowsocks-libev/Config.in +2 -0
index 82c88e9..972e329 100644
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_SHADOWSOCKS_LIBEV
 	bool "shadowsocks-libev"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # for libcork
+	depends on BR2_TOOLCHAIN_HAS_SYNC_8 || !BR2_ARCH_IS_64 # for libcork
 	depends on BR2_TOOLCHAIN_HAS_THREADS # require pthreads
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_C_ARES
Signature · 1 line
2.11.0
#5 lore raw

PATCH v2 1/3 shadowsocks-libev: Drop the useless hash.

In reply to Min Xu

Hello,

Quoted 4 lines · Min Xu
---
 package/shadowsocks-libev/shadowsocks-libev.hash | 1 -
 1 file changed, 1 deletion(-)

I've applied, but there are a few minor things that could have been done better (yes, even for such a simple patch):

1. Use a small letter to start the commit title, i.e:

shadowsocks-libev: drop the useless patch

2. Remove the final dot in the commit title

3. Add a commit log that explains *why* you're doing this change. I've added the following commit log:

In commit f8d44394777fb9b45befaee3333d974dfe5e745d ("shadowsocks-libev: new package"), when this package was introduced, the hash for a license file that isn't available in upstream's tarball was added to the license file. Obviously, this hash serves no purpose, so drop it.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com