[LEDE-DEV] ath9k SAE mesh causes weird kernel errors

2018-04-15 Thread Daniel Golle 
Hi!

running on ubnt hardware with kmod-mac80211 - 4.9.85+2017-11-01-4
i noticed this error when turning on SAE. everything still seems
to be working fine though...

Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.575772] [ cut 
here ]
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.580724] WARNING: CPU: 0 PID: 
3 at backports-2017-11-01/net/mac80211/wpa.c:431 
ieee80211_crypto_ccmp_encrypt+0x158/0x26c [mac80211]
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.593002] Modules linked in: 
ath9k ath9k_common pppoe ppp_async ath9k_hw ath pppox ppp_generic 
nf_conntrack_netlink nf_conntrack_ipv6 mac80211 iptable_nat ipt_REJECT 
ipt_MASQUERADE cfg80211 xt_time xt_tcpudp xt_state xt_nat xt_multiport xt_mark 
xt_mac xt_limit xt_conntrack xt_comment xt_TCPMSS xt_REDIRECT xt_LOG wireguard 
slhc nfnetlink nf_reject_ipv4 nf_nat_redirect nf_nat_masquerade_ipv4 
nf_conntrack_ipv4 nf_nat_ipv4 nf_nat nf_log_ipv4 nf_defrag_ipv6 nf_defrag_ipv4 
nf_conntrack_rtcache nf_conntrack libcrc32c iptable_mangle iptable_filter 
ip_tables crc_ccitt compat ledtrig_usbport ip6t_REJECT nf_reject_ipv6 
nf_log_ipv6 nf_log_common ip6table_mangle ip6table_filter ip6_tables x_tables 
dummy ip6_udp_tunnel udp_tunnel ip6_tunnel tunnel6 tun ehci_platform ehci_hcd 
gpio_button_hotplug usbcore nls_base
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.665220]  usb_common crc16 
crc32c_generic crypto_hash
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.669334] CPU: 0 PID: 3 Comm: 
ksoftirqd/0 Tainted: GW   4.9.85 #0
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.676753] Stack : 804b765a 
0043  0001 8382ccd4 80449247 803fe4f8 0003
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.685293] 804b37a0 
01af 0008 832db320 83841b98 800a97d4 80403d30 8044
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.693845] 0003 
01af 80401ee8 838419bc 83841b98 800d795c 804b765a 007a
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.702391] 8045aea0 
80220a00      
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.710935]  
      
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.719480] ...
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.721972] Call Trace:
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.724466] [<8006b2c8>] 
show_stack+0x54/0x88
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.728926] [<8007ff40>] 
__warn+0xe4/0x118
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.733090] [<80080008>] 
warn_slowpath_null+0x1c/0x34
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.738349] [<832887f8>] 
ieee80211_crypto_ccmp_encrypt+0x158/0x26c [mac80211]
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.745679] [<832a87ac>] 
ieee80211_probereq_get+0x628/0x1844 [mac80211]
Mon Apr 16 01:45:21 2018 kern.warn kernel: [ 7173.752474] ---[ end trace 
c3aac3f443e6ee95 ]---
Mon Apr 16 01:45:22 2018 kern.warn kernel: [ 7174.375526] [ cut 
here ]
Mon Apr 16 01:45:22 2018 kern.warn kernel: [ 7174.380468] WARNING: CPU: 0 PID: 
3 at backports-2017-11-01/net/mac80211/wpa.c:431 
ieee80211_crypto_ccmp_encrypt+0x158/0x26c [mac80211]
Mon Apr 16 01:45:22 2018 kern.warn kernel: [ 7174.392747] Modules linked in: 
ath9k ath9k_common pppoe ppp_async ath9k_hw ath pppox ppp_generic 
nf_conntrack_netlink nf_conntrack_ipv6 mac80211 iptable_nat ipt_REJECT 
ipt_MASQUERADE cfg80211 xt_time xt_tcpudp xt_state xt_nat xt_multiport xt_mark 
xt_mac xt_limit xt_conntrack xt_comment xt_TCPMSS xt_REDIRECT xt_LOG wireguard 
slhc nfnetlink nf_reject_ipv4 nf_nat_redirect nf_nat_masquerade_ipv4 
nf_conntrack_ipv4 nf_nat_ipv4 nf_nat nf_log_ipv4 nf_defrag_ipv6 nf_defrag_ipv4 
nf_conntrack_rtcache nf_conntrack libcrc32c iptable_mangle iptable_filter 
ip_tables crc_ccitt compat ledtrig_usbport ip6t_REJECT nf_reject_ipv6 
nf_log_ipv6 nf_log_common ip6table_mangle ip6table_filter ip6_tables x_tables 
dummy ip6_udp_tunnel udp_tunnel ip6_tunnel tunnel6 tun ehci_platform ehci_hcd 
gpio_button_hotplug usbcore nls_base
Mon Apr 16 01:45:22 2018 kern.warn kernel: [ 7174.464977]  usb_common crc16 
crc32c_generic crypto_hash
Mon Apr 16 01:45:22 2018 kern.warn kernel: [ 7174.469104] CPU: 0 PID: 3 Comm: 
ksoftirqd/0 Tainted: GW   4.9.85 #0
Mon Apr 16 01:45:22 2018 kern.warn kernel: [ 7174.476523] Stack : 804b765a 
0043  0001 8382ccd4 80449247 803fe4f8 0003
Mon Apr 16 01:45:22 2018 kern.warn kernel: [ 7174.485063] 804b37a0 
01af 0008 832db320 83841b98 800a97d4 80403d30 8044
Mon Apr 16 01:45:22 2018 kern.warn kernel: [ 7174.493625] 0003 
01af 80401ee8 838419bc 83841b98 800d795c 804b765a 007a
Mon Apr 16 01:45:22 2018 kern.warn kernel: [ 7174.502170] 8045aea0 
80220a00      
Mon Apr 16 01:45:22 2018 kern.warn kernel: [ 7174.510714]

Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH 0/4] Gemini forward-port to kernel v4.14

2018-04-15 Thread Roman Yeryomin 

On 2018-04-12 00:37, Roman Yeryomin wrote:

On 2018-04-11 00:51, Linus Walleij wrote:
On Mon, Apr 9, 2018 at 12:38 PM, Roman Yeryomin  
wrote:



I have tested them quickly yesterday on nas4220b board. Although I've
managed to boot it (had to fix rootfs image) ethernet and usb didn't 
work.

And I didn't check anything else.
I didn't yet look at the code but before I dive there I have a 
question: did
you have a chance to test it yourself on any of the boards? And if 
yes,

which one?


Hm I tested mostly the rootfs and that the kernel would get to prompt.
But for my D-Link devices I tested mostly with kernel v4.16 because
I'm working close to mainline. Testing now it seems network is not
coming up here either :/ as it works like a charm on v4.16 it must
be some minor issue.


Looking at your tree...
I don't see any (affecting) differences in ethernet driver itself.
Probably it's something else.. MDIO?



After looking into ethernet I've found several issues.
1. skew delay settings were not ported from old driver to dts for 
nas4220b board

2. kernel config in you patches (accidentally?) disabled bridge support
3. driver crashes if you try to disable unused gmac in dts because of 
access to uninitialized port(0|1) member of struct gemini_ethernet


So after fixing all above ethernet on nas4220b is working ok.

Can you confirm that after enabling bridge support back (just remove 
CONFIG_BRIDGE from gemini kernel config and rebuild) ethernet comes up 
on D-link boards? That is with default network config.



Regards,
Roman

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] ar71xx: Add userspace support for Mikrotik rb-2011iLS

2018-04-15 Thread Simon Paterson 
Kernel support already present.
Patch adds userspace for the 'iLS' suffix model of the RB2011 family.
Enables correct initial switch settings, sysupgrade, etc.

https://mikrotik.com/product/RB2011iLS-IN

Signed-off-by: Simon Paterson 

diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds
b/target/linux/ar71xx/base-files/etc/board.d/01_leds
index cf24e465a3..906c4b715f 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -616,6 +616,7 @@ rb-962uigs-5hact2hnt)
 ucidef_set_led_timer "user" "USER/SFP" "rb:green:user" "1000" "1000"
 ;;
 rb-2011il|\
+rb-2011ils|\
 rb-2011l|\
 rb-2011uas|\
 rb-2011uas-2hnd|\
diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network
b/target/linux/ar71xx/base-files/etc/board.d/02_network
index dfe97e8133..cbbcf53946 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -315,12 +315,14 @@ ar71xx_setup_interfaces()
 ;;
 db120|\
 rb-2011il|\
+    rb-2011ils|\
 rb-2011l|\
 rb-2011uas|\
 rb-2011uas-2hnd|\
 rb-2011uias|\
 rb-2011uias-2hnd)
     case "$board" in
+        rb-2011ils|\
     rb-2011uas*|\
     rb-2011uias|\
     rb-2011uias-2hnd)
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
b/target/linux/ar71xx/base-files/etc/diag.sh
index 797c30f8a5..19dd4c2a13 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -335,6 +335,7 @@ get_status_led() {
     status_led="$board:green:wan"
     ;;
 rb-2011il|\
+    rb-2011ils|\
 rb-2011l|\
 rb-2011uas|\
 rb-2011uas-2hnd)
diff --git
a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
index 29fdde40a0..0388fb6dc9 100644
---
a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
+++
b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
@@ -86,6 +86,7 @@ rb-450)
 
 db120|\
 rb-2011il|\
+rb-2011ils|\
 rb-2011l|\
 rb-2011uas-2hnd)
 migrate_switch_name "eth0" "switch0"
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 7249cb6151..95314a2881 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -944,6 +944,9 @@ ar71xx_board_detect() {
 *"RouterBOARD 2011iL")
     name="rb-2011il"
     ;;
+    *"RouterBOARD 2011iLS")
+        name="rb-2011ils"
+        ;;
 *"RouterBOARD 2011L")
     name="rb-2011l"
     ;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 376984a14a..702d97a8ed 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -550,6 +550,7 @@ platform_check_image() {
 rb-951ui-2hnd|\
 rb-2011l|\
 rb-2011il|\
+    rb-2011ils|\
 rb-2011uas|\
 rb-2011uas-2hnd|\
 rb-2011uias|\
@@ -843,6 +844,7 @@ platform_do_upgrade() {
 rb-951g-2hnd|\
 rb-951ui-2hnd|\
 rb-2011il|\
+    rb-2011ils|\
 rb-2011l|\
 rb-2011uas|\
 rb-2011uas-2hnd|\


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] mbedtls: change libmbedcrypto.so soversion back to 0

2018-04-15 Thread Syrone Wong 
Why? the lib version bump means ABI incompatibility. The correct way
is to bump release to rebuild instead of decreasing it.


Best Regards,
Syrone Wong


On Mon, Apr 16, 2018 at 6:57 AM, Hauke Mehrtens  wrote:
> mbedtls changed in version 2.7.0 the soversion of the libmbedcrypto.so
> library, use the old version again to be able to use the new library
> with binaries compiled against the old mbedtls library.
>
> Some binaries got rebuild to for the 2.7.0 release and are now using
> libmbedcrypto.so.1, the older ones are still using libmbedcrypto.so.0.
> Go back to libmbedcrypto.so.0 and make the system rebuild the binaries
> which were rebuild for 2.7.0 again.
>
> This should make the libmbedcrypto.so library be compatible with the old
> version shipped with 17.01.
>
> Fixes: 75c5ab4ca ("mbedtls: update to version 2.7.0")
> Signed-off-by: Hauke Mehrtens 
> ---
>  package/libs/mbedtls/Makefile  |  2 +-
>  .../patches/300-soversion-compatibility.patch  | 26 
> ++
>  package/libs/ustream-ssl/Makefile  |  2 +-
>  package/network/services/openvpn/Makefile  |  2 +-
>  package/network/utils/curl/Makefile|  2 +-
>  package/utils/px5g/Makefile|  2 +-
>  6 files changed, 31 insertions(+), 5 deletions(-)
>  create mode 100644 
> package/libs/mbedtls/patches/300-soversion-compatibility.patch
>
> diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
> index 8ac4e3b13e..6b9f6d73bd 100644
> --- a/package/libs/mbedtls/Makefile
> +++ b/package/libs/mbedtls/Makefile
> @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
>
>  PKG_NAME:=mbedtls
>  PKG_VERSION:=2.8.0
> -PKG_RELEASE:=1
> +PKG_RELEASE:=2
>  PKG_USE_MIPS16:=0
>
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
> diff --git a/package/libs/mbedtls/patches/300-soversion-compatibility.patch 
> b/package/libs/mbedtls/patches/300-soversion-compatibility.patch
> new file mode 100644
> index 00..159257abab
> --- /dev/null
> +++ b/package/libs/mbedtls/patches/300-soversion-compatibility.patch
> @@ -0,0 +1,26 @@
> +mbedtls changed in version 2.7.0 and 2.7.2 the soversion of the
> +libmbedcrypto.so library, use the old version again to be able to use
> +the new library with binaries compiled against the old library.
> +
> +--- a/library/CMakeLists.txt
>  b/library/CMakeLists.txt
> +@@ -141,7 +141,7 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
> +
> + if(USE_SHARED_MBEDTLS_LIBRARY)
> + add_library(mbedcrypto SHARED ${src_crypto})
> +-set_target_properties(mbedcrypto PROPERTIES VERSION 2.8.0 SOVERSION 1)
> ++set_target_properties(mbedcrypto PROPERTIES VERSION 2.8.0 SOVERSION 0)
> + target_link_libraries(mbedcrypto ${libs})
> +
> + add_library(mbedx509 SHARED ${src_x509})
> +--- a/library/Makefile
>  b/library/Makefile
> +@@ -33,7 +33,7 @@ endif
> +
> + SOEXT_TLS=so.10
> + SOEXT_X509=so.0
> +-SOEXT_CRYPTO=so.1
> ++SOEXT_CRYPTO=so.0
> +
> + DLEXT=so
> + # OSX shared library extension:
> diff --git a/package/libs/ustream-ssl/Makefile 
> b/package/libs/ustream-ssl/Makefile
> index b5e773ba7f..1a8e0e78b0 100644
> --- a/package/libs/ustream-ssl/Makefile
> +++ b/package/libs/ustream-ssl/Makefile
> @@ -1,7 +1,7 @@
>  include $(TOPDIR)/rules.mk
>
>  PKG_NAME:=ustream-ssl
> -PKG_RELEASE:=2
> +PKG_RELEASE:=3
>
>  PKG_SOURCE_PROTO:=git
>  PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git
> diff --git a/package/network/services/openvpn/Makefile 
> b/package/network/services/openvpn/Makefile
> index 552ed158b3..374e14f7bd 100644
> --- a/package/network/services/openvpn/Makefile
> +++ b/package/network/services/openvpn/Makefile
> @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
>  PKG_NAME:=openvpn
>
>  PKG_VERSION:=2.4.5
> -PKG_RELEASE:=3
> +PKG_RELEASE:=4
>
>  PKG_SOURCE_URL:=\
> https://build.openvpn.net/downloads/releases/ \
> diff --git a/package/network/utils/curl/Makefile 
> b/package/network/utils/curl/Makefile
> index 77af54fae8..e521e99b92 100644
> --- a/package/network/utils/curl/Makefile
> +++ b/package/network/utils/curl/Makefile
> @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
>
>  PKG_NAME:=curl
>  PKG_VERSION:=7.59.0
> -PKG_RELEASE:=1
> +PKG_RELEASE:=2
>
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
>  PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
> diff --git a/package/utils/px5g/Makefile b/package/utils/px5g/Makefile
> index 8d1f04d60f..4ea495867c 100644
> --- a/package/utils/px5g/Makefile
> +++ b/package/utils/px5g/Makefile
> @@ -8,7 +8,7 @@
>  include $(TOPDIR)/rules.mk
>
>  PKG_NAME:=px5g
> -PKG_RELEASE:=4
> +PKG_RELEASE:=5
>  PKG_LICENSE:=LGPL-2.1
>  PKG_BUILD_DIR:=$(BUILD_DIR)/px5g-$(BUILD_VARIANT)
>
> --
> 2.11.0
>
>
> ___
> Lede-dev mailing list
> Lede-dev@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev

___
Lede-dev mailing list
Lede-dev@lists.infradead.org

[LEDE-DEV] [PATCH] mbedtls: change libmbedcrypto.so soversion back to 0

2018-04-15 Thread Hauke Mehrtens 
mbedtls changed in version 2.7.0 the soversion of the libmbedcrypto.so
library, use the old version again to be able to use the new library
with binaries compiled against the old mbedtls library.

Some binaries got rebuild to for the 2.7.0 release and are now using
libmbedcrypto.so.1, the older ones are still using libmbedcrypto.so.0.
Go back to libmbedcrypto.so.0 and make the system rebuild the binaries
which were rebuild for 2.7.0 again.

This should make the libmbedcrypto.so library be compatible with the old
version shipped with 17.01.

Fixes: 75c5ab4ca ("mbedtls: update to version 2.7.0")
Signed-off-by: Hauke Mehrtens 
---
 package/libs/mbedtls/Makefile  |  2 +-
 .../patches/300-soversion-compatibility.patch  | 26 ++
 package/libs/ustream-ssl/Makefile  |  2 +-
 package/network/services/openvpn/Makefile  |  2 +-
 package/network/utils/curl/Makefile|  2 +-
 package/utils/px5g/Makefile|  2 +-
 6 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 
package/libs/mbedtls/patches/300-soversion-compatibility.patch

diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 8ac4e3b13e..6b9f6d73bd 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mbedtls
 PKG_VERSION:=2.8.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_USE_MIPS16:=0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
diff --git a/package/libs/mbedtls/patches/300-soversion-compatibility.patch 
b/package/libs/mbedtls/patches/300-soversion-compatibility.patch
new file mode 100644
index 00..159257abab
--- /dev/null
+++ b/package/libs/mbedtls/patches/300-soversion-compatibility.patch
@@ -0,0 +1,26 @@
+mbedtls changed in version 2.7.0 and 2.7.2 the soversion of the
+libmbedcrypto.so library, use the old version again to be able to use
+the new library with binaries compiled against the old library.
+
+--- a/library/CMakeLists.txt
 b/library/CMakeLists.txt
+@@ -141,7 +141,7 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
+ 
+ if(USE_SHARED_MBEDTLS_LIBRARY)
+ add_library(mbedcrypto SHARED ${src_crypto})
+-set_target_properties(mbedcrypto PROPERTIES VERSION 2.8.0 SOVERSION 1)
++set_target_properties(mbedcrypto PROPERTIES VERSION 2.8.0 SOVERSION 0)
+ target_link_libraries(mbedcrypto ${libs})
+ 
+ add_library(mbedx509 SHARED ${src_x509})
+--- a/library/Makefile
 b/library/Makefile
+@@ -33,7 +33,7 @@ endif
+ 
+ SOEXT_TLS=so.10
+ SOEXT_X509=so.0
+-SOEXT_CRYPTO=so.1
++SOEXT_CRYPTO=so.0
+ 
+ DLEXT=so
+ # OSX shared library extension:
diff --git a/package/libs/ustream-ssl/Makefile 
b/package/libs/ustream-ssl/Makefile
index b5e773ba7f..1a8e0e78b0 100644
--- a/package/libs/ustream-ssl/Makefile
+++ b/package/libs/ustream-ssl/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ustream-ssl
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git
diff --git a/package/network/services/openvpn/Makefile 
b/package/network/services/openvpn/Makefile
index 552ed158b3..374e14f7bd 100644
--- a/package/network/services/openvpn/Makefile
+++ b/package/network/services/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openvpn
 
 PKG_VERSION:=2.4.5
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL:=\
https://build.openvpn.net/downloads/releases/ \
diff --git a/package/network/utils/curl/Makefile 
b/package/network/utils/curl/Makefile
index 77af54fae8..e521e99b92 100644
--- a/package/network/utils/curl/Makefile
+++ b/package/network/utils/curl/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=curl
 PKG_VERSION:=7.59.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
diff --git a/package/utils/px5g/Makefile b/package/utils/px5g/Makefile
index 8d1f04d60f..4ea495867c 100644
--- a/package/utils/px5g/Makefile
+++ b/package/utils/px5g/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=px5g
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_LICENSE:=LGPL-2.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/px5g-$(BUILD_VARIANT)
 
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] ath10k-ct: make it depend on PCI support again

2018-04-15 Thread Hauke Mehrtens 
The missing dependency causes build problems on systems without PCI
support.
The ath10k_pci kernel module depends on PCI support so this dependency
should be added. ath10k now also supported the ahb interface on the
IPQ4019 SoC, but this SoC also has PCI support so this extra dependency
is not as problem.

Fixes: d0f3dd5b9f34176 ("ath10k-ct: update to latest version, enable AHB.")
Signed-off-by: Hauke Mehrtens 
---
 package/kernel/ath10k-ct/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kernel/ath10k-ct/Makefile 
b/package/kernel/ath10k-ct/Makefile
index 1725bb7d17..9c69dee72f 100644
--- a/package/kernel/ath10k-ct/Makefile
+++ b/package/kernel/ath10k-ct/Makefile
@@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk
 define KernelPackage/ath10k-ct
   SUBMENU:=Wireless Drivers
   TITLE:=ath10k-ct driver optimized for CT ath10k firmware
-  DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT 
+@DRIVER_11W_SUPPORT +kmod-hwmon-core
+  DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT 
+@DRIVER_11W_SUPPORT @PCI_SUPPORT +kmod-hwmon-core
   FILES:=\
$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_pci.ko \
$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_core.ko
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] tools/libressl: update to version 2.7.2

2018-04-15 Thread Hauke Mehrtens 
Libressl version 2.7.0 and later implement more of the OpenSSL 1.1 API
and this needs some modifications of the code using it.

Signed-off-by: Hauke Mehrtens 
---
 .../patches/120-curl-fix-libressl-linking.patch|  6 +-
 tools/cmake/patches/140-curl-fix-libressl.patch| 68 ++
 .../patches/150-libarchive-fix-libressl.patch  | 37 
 tools/libressl/Makefile|  4 +-
 4 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 tools/cmake/patches/140-curl-fix-libressl.patch
 create mode 100644 tools/cmake/patches/150-libarchive-fix-libressl.patch

diff --git a/tools/cmake/patches/120-curl-fix-libressl-linking.patch 
b/tools/cmake/patches/120-curl-fix-libressl-linking.patch
index ad5b89750e..a345a8c16a 100644
--- a/tools/cmake/patches/120-curl-fix-libressl-linking.patch
+++ b/tools/cmake/patches/120-curl-fix-libressl-linking.patch
@@ -20,7 +20,7 @@ Signed-off-by: Jo-Philipp Wich 
 ---
 --- a/Utilities/cmcurl/CMakeLists.txt
 +++ b/Utilities/cmcurl/CMakeLists.txt
-@@ -461,6 +461,10 @@ if(CMAKE_USE_OPENSSL)
+@@ -461,6 +461,14 @@ if(CMAKE_USE_OPENSSL)
set(USE_OPENSSL ON)
set(HAVE_LIBCRYPTO ON)
set(HAVE_LIBSSL ON)
@@ -28,6 +28,10 @@ Signed-off-by: Jo-Philipp Wich 
 +  if(HAVE_LIBRT)
 +list(APPEND OPENSSL_LIBRARIES rt)
 +  endif()
++  check_library_exists("pthread" pthread_once "" HAVE_PTHREAD)
++  if(HAVE_PTHREAD)
++list(APPEND OPENSSL_LIBRARIES pthread)
++  endif()
list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})
include_directories(${OPENSSL_INCLUDE_DIR})
set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
diff --git a/tools/cmake/patches/140-curl-fix-libressl.patch 
b/tools/cmake/patches/140-curl-fix-libressl.patch
new file mode 100644
index 00..9caed96f53
--- /dev/null
+++ b/tools/cmake/patches/140-curl-fix-libressl.patch
@@ -0,0 +1,68 @@
+From 7c90c93c0b061da81f69fabdd57125b2783c15fb Mon Sep 17 00:00:00 2001
+From: Bernard Spil 
+Date: Mon, 2 Apr 2018 19:04:06 +0200
+Subject: [PATCH] openssl: fix build with LibreSSL 2.7
+
+ - LibreSSL 2.7 implements (most of) OpenSSL 1.1 API
+
+Fixes #2319
+Closes #2447
+Closes #2448
+
+Signed-off-by: Bernard Spil 
+---
+ lib/vtls/openssl.c | 15 +--
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+--- a/Utilities/cmcurl/lib/vtls/openssl.c
 b/Utilities/cmcurl/lib/vtls/openssl.c
+@@ -104,7 +104,8 @@
+ #endif
+ 
+ #if (OPENSSL_VERSION_NUMBER >= 0x1010L) && /* OpenSSL 1.1.0+ */ \
+-  !defined(LIBRESSL_VERSION_NUMBER)
++!(defined(LIBRESSL_VERSION_NUMBER) && \
++  LIBRESSL_VERSION_NUMBER < 0x2070L)
+ #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
+ #define HAVE_X509_GET0_EXTENSIONS 1 /* added in 1.1.0 -pre1 */
+ #define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */
+@@ -128,7 +129,8 @@ static unsigned long OpenSSL_version_num
+ #endif
+ 
+ #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \
+-  !defined(LIBRESSL_VERSION_NUMBER)
++!(defined(LIBRESSL_VERSION_NUMBER) && \
++  LIBRESSL_VERSION_NUMBER < 0x2070L)
+ #define HAVE_X509_GET0_SIGNATURE 1
+ #endif
+ 
+@@ -147,7 +149,7 @@ static unsigned long OpenSSL_version_num
+  * Whether SSL_CTX_set_keylog_callback is available.
+  * OpenSSL: supported since 1.1.1 https://github.com/openssl/openssl/pull/2287
+  * BoringSSL: supported since d28f59c27bac (committed 2015-11-19)
+- * LibreSSL: unsupported in at least 2.5.1 (explicitly check for it since it
++ * LibreSSL: unsupported in at least 2.7.2 (explicitly check for it since it
+  *   lies and pretends to be OpenSSL 2.0.0).
+  */
+ #if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \
+@@ -259,7 +261,9 @@ static void tap_ssl_key(const SSL *ssl,
+   if(!session || !keylog_file_fp)
+ return;
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && \
++!(defined(LIBRESSL_VERSION_NUMBER) && \
++  LIBRESSL_VERSION_NUMBER < 0x2070L)
+   /* ssl->s3 is not checked in openssl 1.1.0-pre6, but let's assume that
+* we have a valid SSL context if we have a non-NULL session. */
+   SSL_get_client_random(ssl, client_random, SSL3_RANDOM_SIZE);
+@@ -2082,8 +2086,7 @@ static CURLcode ossl_connect_step1(struc
+   case CURL_SSLVERSION_TLSv1_2:
+   case CURL_SSLVERSION_TLSv1_3:
+ /* it will be handled later with the context options */
+-#if (OPENSSL_VERSION_NUMBER >= 0x1010L) && \
+-!defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x1010L)
+ req_method = TLS_client_method();
+ #else
+ req_method = SSLv23_client_method();
diff --git a/tools/cmake/patches/150-libarchive-fix-libressl.patch 
b/tools/cmake/patches/150-libarchive-fix-libressl.patch
new file mode 100644
index 00..ad8a0969a8
--- /dev/null
+++ b/tools/cmake/patches/150-libarchive-fix-libressl.patch
@@ -0,0 +1,37 @@
+From

[LEDE-DEV] [PATCH 3/5] tools/mtd-utils: update to version 2.0.1

2018-04-15 Thread Hauke Mehrtens 
This version now uses autotools to configure the build system. They are
also using the newly added zlib package.

Signed-off-by: Hauke Mehrtens 
---
 tools/Makefile |   2 +-
 tools/mtd-utils/Makefile   |  42 +++-
 tools/mtd-utils/patches/100-sscanf_fix.patch   |   6 +-
 tools/mtd-utils/patches/110-portability.patch  |  45 
 .../mtd-utils/patches/120-include_sysmacros.patch  |  25 -
 tools/mtd-utils/patches/130-lzma_jffs2.patch   |  65 +--
 .../patches/135-mkubifs_optional_lzo.patch | 119 -
 ...igen-add-ubigen_write_terminator-function.patch |   8 +-
 .../201-ubinize-add-terminator-support.patch   |  23 ++--
 .../patches/310-add-static-linking-option.patch|  43 
 .../patches/320-mkfs.jffs2-SOURCE_DATE_EPOCH.patch |  16 +--
 11 files changed, 95 insertions(+), 299 deletions(-)
 delete mode 100644 tools/mtd-utils/patches/120-include_sysmacros.patch
 delete mode 100644 tools/mtd-utils/patches/135-mkubifs_optional_lzo.patch
 delete mode 100644 tools/mtd-utils/patches/310-add-static-linking-option.patch

diff --git a/tools/Makefile b/tools/Makefile
index 8dfab9892b..d2b5daf18c 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -50,7 +50,7 @@ $(curdir)/automake/compile := $(curdir)/m4/compile 
$(curdir)/autoconf/compile $(
 $(curdir)/gmp/compile := $(curdir)/libtool/compile
 $(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile
 $(curdir)/mpfr/compile := $(curdir)/gmp/compile
-$(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/compile 
$(curdir)/zlib/compile
+$(curdir)/mtd-utils/compile := $(curdir)/libtool/compile 
$(curdir)/e2fsprogs/compile $(curdir)/zlib/compile
 $(curdir)/mklibs/compile := $(curdir)/libtool/compile
 $(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile
 $(curdir)/upslug2/compile := $(curdir)/libtool/compile
diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index 7b4a91a73d..c94de3acf8 100644
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -7,44 +7,30 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtd-utils
-PKG_VERSION:=1.5.2
+PKG_VERSION:=2.0.1
 
-PKG_SOURCE_VERSION:=aea36417067dade75192bafa03af70b6eb2677b1
+PKG_SOURCE_VERSION:=81049e599775bac4238361752f659a86f67328e6
 PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
 PKG_SOURCE_PROTO:=git
-PKG_MIRROR_HASH:=e11b342b85a36b2e438a8412ec52f87621d3046aec1a93039f8c72de9990b2a7
+PKG_MIRROR_HASH:=a79784eb52c77dbc73a08863ce6651b3d22931e7c670cd1782168f9bba13f5a8
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
-CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) 
-L$(STAGING_DIR_HOST)/lib -DNO_NATIVE_SUPPORT
-ifneq ($(HOST_OS),Linux)
-CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include endian.h 
-I$(CURDIR)/include -include fls.h
-MTD_STATIC := 0
-else
-MTD_STATIC := 1
-endif
-
-MTD_MAKEOPTS = \
-   CFLAGS="$(CFLAGS)" \
-   LDFLAGS="$(HOST_LDFLAGS)" \
-   WITHOUT_LZO=1 WITHOUT_XATTR=1 \
-   SUBDIRS="" \
-   BUILDDIR="$(HOST_BUILD_DIR)" \
-   STATIC=$(MTD_STATIC) \
-   V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1)
-
-define Host/Compile
-   $(MAKE) -C $(HOST_BUILD_DIR) \
-   $(MTD_MAKEOPTS) \
-   TARGETS="mkfs.jffs2 ubi-utils/ubinize mkfs.ubifs/mkfs.ubifs"
-endef
+
+HOST_CONFIGURE_VARS+= \
+   UUID_CFLAGS="-I$(STAGING_DIR_HOST)/include/e2fsprogs/uuid"
+
+HOST_CONFIGURE_ARGS+= \
+   --disable-tests \
+   --without-xattr \
+   --without-lzo
 
 define Host/Install
$(CP) \
$(HOST_BUILD_DIR)/mkfs.jffs2 \
-   $(HOST_BUILD_DIR)/mkfs.ubifs/mkfs.ubifs \
-   $(HOST_BUILD_DIR)/ubi-utils/ubinize \
+   $(HOST_BUILD_DIR)/mkfs.ubifs \
+   $(HOST_BUILD_DIR)/ubinize \
$(STAGING_DIR_HOST)/bin/
 endef
 
diff --git a/tools/mtd-utils/patches/100-sscanf_fix.patch 
b/tools/mtd-utils/patches/100-sscanf_fix.patch
index 0af583f4cb..ae6f86722b 100644
--- a/tools/mtd-utils/patches/100-sscanf_fix.patch
+++ b/tools/mtd-utils/patches/100-sscanf_fix.patch
@@ -1,6 +1,6 @@
 a/mkfs.jffs2.c
-+++ b/mkfs.jffs2.c
-@@ -422,7 +422,7 @@ static int interpret_table_entry(struct
+--- a/jffsX-utils/mkfs.jffs2.c
 b/jffsX-utils/mkfs.jffs2.c
+@@ -427,7 +427,7 @@ static int interpret_table_entry(struct
  
if (sscanf (line, "%" SCANF_PREFIX "s %c %lo %lu %lu %lu %lu %lu %lu 
%lu",
SCANF_STRING(name), , , , , 
, ,
diff --git a/tools/mtd-utils/patches/110-portability.patch 
b/tools/mtd-utils/patches/110-portability.patch
index c4cdab928a..033c865830 100644
--- a/tools/mtd-utils/patches/110-portability.patch
+++ b/tools/mtd-utils/patches/110-portability.patch
@@ -1,5 +1,5 @@
 a/compr_lzo.c
-+++ b/compr_lzo.c
+--- a/jffsX-utils/compr_lzo.c
 b/jffsX-utils/compr_lzo.c

[LEDE-DEV] [PATCH 2/5] tools/mtd-utils: Mark some lzma functions as static

2018-04-15 Thread Hauke Mehrtens 
These functions are not declared in any header file and only used in
same compile unit, mark them as static to remove one gcc warning and
make it easier for the compiler to optimize them out.

This also fixes some style problems to make this patch match the version
in the packages folder.

This is copied from this commit to the mtd-utils we pack into the image:
56d0dd56e9c6efa79 ("mtd-utils: Mark some lzma functions as static")

Signed-off-by: Hauke Mehrtens 
---
 tools/mtd-utils/patches/130-lzma_jffs2.patch | 74 ++--
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/tools/mtd-utils/patches/130-lzma_jffs2.patch 
b/tools/mtd-utils/patches/130-lzma_jffs2.patch
index b04f019922..05ced4f42c 100644
--- a/tools/mtd-utils/patches/130-lzma_jffs2.patch
+++ b/tools/mtd-utils/patches/130-lzma_jffs2.patch
@@ -26,7 +26,7 @@
jffs2_lzo_init();
  #endif
 +#ifdef CONFIG_JFFS2_LZMA
-+jffs2_lzma_init();
++  jffs2_lzma_init();
 +#endif
return 0;
  }
@@ -36,7 +36,7 @@
jffs2_lzo_exit();
  #endif
 +#ifdef CONFIG_JFFS2_LZMA
-+jffs2_lzma_exit();
++  jffs2_lzma_exit();
 +#endif
return 0;
  }
@@ -119,7 +119,7 @@
 +  return -1;
 +  }
 +
-+return 0;
++  return 0;
 +}
 +
 +STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char 
*cpage_out,
@@ -175,26 +175,26 @@
 +
 +int INIT jffs2_lzma_init(void)
 +{
-+int ret;
++  int ret;
 +  CLzmaEncProps props;
 +  LzmaEncProps_Init();
 +
-+props.dictSize = LZMA_BEST_DICT(0x2000);
-+props.level = LZMA_BEST_LEVEL;
-+props.lc = LZMA_BEST_LC;
-+props.lp = LZMA_BEST_LP;
-+props.pb = LZMA_BEST_PB;
-+props.fb = LZMA_BEST_FB;
++  props.dictSize = LZMA_BEST_DICT(0x2000);
++  props.level = LZMA_BEST_LEVEL;
++  props.lc = LZMA_BEST_LC;
++  props.lp = LZMA_BEST_LP;
++  props.pb = LZMA_BEST_PB;
++  props.fb = LZMA_BEST_FB;
 +
 +  ret = lzma_alloc_workspace();
-+if (ret < 0)
-+return ret;
++  if (ret < 0)
++  return ret;
 +
 +  ret = jffs2_register_compressor(_lzma_comp);
 +  if (ret)
 +  lzma_free_workspace();
 +  
-+return ret;
++  return ret;
 +}
 +
 +void jffs2_lzma_exit(void)
@@ -245,7 +245,7 @@
 +  #define LZMA_FREE free
 +  #define PRINT_ERROR(msg) fprintf(stderr, msg)
 +  #define INIT
-+  #define STATIC
++  #define STATIC static
 +#endif
 +
 +#include "lzma/LzmaDec.h"
@@ -261,16 +261,16 @@
 +
 +static void *p_lzma_malloc(void *p, size_t size)
 +{
-+if (size == 0)
-+return NULL;
++  if (size == 0)
++  return NULL;
 +
-+return LZMA_MALLOC(size);
++  return LZMA_MALLOC(size);
 +}
 +
 +static void p_lzma_free(void *p, void *address)
 +{
-+if (address != NULL)
-+LZMA_FREE(address);
++  if (address != NULL)
++  LZMA_FREE(address);
 +}
 +
 +static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
@@ -949,9 +949,9 @@
 +}
 +
 +Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; 
}
-+Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return 
p->buffer[index]; }
++static Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return 
p->buffer[index]; }
 +
-+UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return 
p->streamPos - p->pos; }
++static UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return 
p->streamPos - p->pos; }
 +
 +void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
 +{
@@ -2357,7 +2357,7 @@
 +  p->needFlush = 0;
 +}
 +
-+void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState) 
++static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool 
initState) 
 +{ 
 +  p->needFlush = 1; 
 +  p->remainLen = 0; 
@@ -2777,7 +2777,7 @@
 +#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
 +#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
 +
-+void LzmaEnc_FastPosInit(Byte *g_FastPos)
++static void LzmaEnc_FastPosInit(Byte *g_FastPos)
 +{
 +  int c = 2, slotFast;
 +  g_FastPos[0] = 0;
@@ -3031,7 +3031,7 @@
 +  CSaveState saveState;
 +} CLzmaEnc;
 +
-+void LzmaEnc_SaveState(CLzmaEncHandle pp)
++static void LzmaEnc_SaveState(CLzmaEncHandle pp)
 +{
 +  CLzmaEnc *p = (CLzmaEnc *)pp;
 +  CSaveState *dest = >saveState;
@@ -3057,7 +3057,7 @@
 +  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
 +}
 +
-+void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++static void LzmaEnc_RestoreState(CLzmaEncHandle pp)
 +{
 +  CLzmaEnc *dest = (CLzmaEnc *)pp;
 +  const CSaveState *p = >saveState;
@@ -3300,7 +3300,7 @@
 +  while (symbol < 0x1);
 +}
 +
-+void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++static void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
 +{
 +  UInt32 i;
 +  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 <<

[LEDE-DEV] [PATCH 5/5] mtd-utils: activate --gc-sections

2018-04-15 Thread Hauke Mehrtens 
This reduces the size of the binary a bit:

old:
 37556 bin/targets/lantiq/xrx200/packages/nand-utils_2.0.1-1_mips_24kc.ipk
 81697 bin/targets/lantiq/xrx200/packages/ubi-utils_2.0.1-1_mips_24kc.ipk

new:
 27450 bin/targets/lantiq/xrx200/packages/nand-utils_2.0.1-1_mips_24kc.ipk
 71796 bin/targets/lantiq/xrx200/packages/ubi-utils_2.0.1-1_mips_24kc.ipk

Signed-off-by: Hauke Mehrtens 
---
 package/utils/mtd-utils/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/utils/mtd-utils/Makefile b/package/utils/mtd-utils/Makefile
index a9905e4207..b9c3c19568 100644
--- a/package/utils/mtd-utils/Makefile
+++ b/package/utils/mtd-utils/Makefile
@@ -62,6 +62,9 @@ CONFIGURE_ARGS += \
--without-xattr \
--without-lzo
 
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections
+
 define Package/ubi-utils/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) \
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH 1/5] tools/zlib: move zlib build to tools

2018-04-15 Thread Hauke Mehrtens 
This allows us to link the other tools against our libz and we do not
need the system zlib any more.

Only the static linked library is copied to the staging directory so we
have a statically linked library on all systems and not only on Linux.
This also adds the new dependencies of the packages which are depending
on zlib.

Signed-off-by: Hauke Mehrtens 
---
 include/prereq-build.mk |  5 
 package/libs/zlib/Makefile  |  2 --
 tools/Makefile  | 14 +
 tools/lzma-old/Makefile |  2 ++
 tools/lzma-old/patches/120-add-cflags.patch | 11 +++
 tools/make-ext4fs/Makefile  |  8 +
 tools/make-ext4fs/patches/100-add-ldflags.patch | 11 +++
 tools/squashfs4/Makefile|  2 +-
 tools/zlib/Makefile | 40 +
 9 files changed, 75 insertions(+), 20 deletions(-)
 create mode 100644 tools/lzma-old/patches/120-add-cflags.patch
 create mode 100644 tools/make-ext4fs/patches/100-add-ldflags.patch
 create mode 100644 tools/zlib/Makefile

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 6917716342..5b9a7e049d 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -76,11 +76,6 @@ else
   zlib_link_flags := -lz
 endif
 
-$(eval $(call TestHostCommand,zlib, \
-   Please install a static zlib. (Missing libz.a or zlib.h), \
-   echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' 
| \
-   gcc -include zlib.h -x c -o $(TMP_DIR)/a.out - 
$(zlib_link_flags)))
-
 $(eval $(call TestHostCommand,perl-thread-queue, \
Please install the Perl Thread::Queue module, \
perl -MThread::Queue -e 1))
diff --git a/package/libs/zlib/Makefile b/package/libs/zlib/Makefile
index a7c61f7dd0..4a2a0e53b0 100644
--- a/package/libs/zlib/Makefile
+++ b/package/libs/zlib/Makefile
@@ -21,7 +21,6 @@ PKG_CPE_ID:=cpe:/a:gnu:zlib
 
 PKG_CONFIG_DEPENDS:= CONFIG_ZLIB_OPTIMIZE_SPEED
 
-include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -95,6 +94,5 @@ define Package/zlib-dev/install
  $(1)/usr/lib/pkgconfig/
 endef
 
-$(eval $(call HostBuild))
 $(eval $(call BuildPackage,zlib))
 $(eval $(call BuildPackage,zlib-dev))
diff --git a/tools/Makefile b/tools/Makefile
index 50bd552d75..8dfab9892b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -22,7 +22,7 @@ ifneq 
($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_b43legacy-firmwar
 endif
 
 tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf expat
-tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs
+tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs zlib
 tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage
 tools-y += firmware-utils patch-image quilt padjffs2
 tools-y += mm-macros missing-macros cmake scons bc findutils gengetopt patchelf
@@ -43,16 +43,16 @@ $(curdir)/bison/compile := $(curdir)/flex/compile
 $(curdir)/flex/compile := $(curdir)/libtool/compile
 $(curdir)/libtool/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile 
$(curdir)/automake/compile $(curdir)/missing-macros/compile
 $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
-$(curdir)/squashfs4/compile := $(curdir)/xz/compile
+$(curdir)/squashfs4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
 $(curdir)/quilt/compile := $(curdir)/autoconf/compile 
$(curdir)/findutils/compile
 $(curdir)/autoconf/compile := $(curdir)/m4/compile
 $(curdir)/automake/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile 
$(curdir)/pkg-config/compile $(curdir)/xz/compile
 $(curdir)/gmp/compile := $(curdir)/libtool/compile
 $(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile
 $(curdir)/mpfr/compile := $(curdir)/gmp/compile
-$(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/compile
+$(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/compile 
$(curdir)/zlib/compile
 $(curdir)/mklibs/compile := $(curdir)/libtool/compile
-$(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile
+$(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile
 $(curdir)/upslug2/compile := $(curdir)/libtool/compile
 $(curdir)/mm-macros/compile := $(curdir)/libtool/compile
 $(curdir)/missing-macros/compile := $(curdir)/autoconf/compile
@@ -69,8 +69,12 @@ $(curdir)/patchelf/compile := $(curdir)/libtool/compile
 $(curdir)/dosfstools/compile := $(curdir)/autoconf/compile 
$(curdir)/automake/compile
 $(curdir)/libressl/compile := $(curdir)/pkg-config/compile
 $(curdir)/mkimage/compile += $(curdir)/libressl/compile
-$(curdir)/firmware-utils/compile += $(curdir)/libressl/compile
+$(curdir)/firmware-utils/compile += $(curdir)/libressl/compile 
$(curdir)/zlib/compile
 $(curdir)/cmake/compile += $(curdir)/libressl/compile
+$(curdir)/zlib/compile := $(curdir)/cmake/compile
+$(curdir)/wrt350nv2-builder/compile := $(curdir)/zlib/compile

Re: [LEDE-DEV] [PATCH 0/4] Gemini forward-port to kernel v4.14

2018-04-15 Thread Roman Yeryomin 

On 2018-04-14 20:36, Hans Ulli Kroll wrote:

Hi Roman

On Tue, 10 Apr 2018, Linus Walleij wrote:

On Mon, Apr 9, 2018 at 12:38 PM, Roman Yeryomin  
wrote:


> I have tested them quickly yesterday on nas4220b board. Although I've
> managed to boot it (had to fix rootfs image) ethernet and usb didn't work.
> And I didn't check anything else.
> I didn't yet look at the code but before I dive there I have a question: did
> you have a chance to test it yourself on any of the boards? And if yes,
> which one?



I think the fotg controller gets stalled after a port reset.
Please check attached (untested) patch for openwrt.
I can test this next week by myself

+diff --git a/drivers/usb/host/fotg210-hcd.c 
b/drivers/usb/host/fotg210-hcd.c

+index 2acc51b0be5a..bc9efb49adc7 100644
+--- a/drivers/usb/host/fotg210-hcd.c
 b/drivers/usb/host/fotg210-hcd.c
+@@ -1653,6 +1653,10 @@ static int fotg210_hub_control(struct usb_hcd
*hcd, u16 typeReq, u16 wValue,
+   /* see what we found out */
+   temp = check_reset_complete(fotg210, wIndex, status_reg,
+   fotg210_readl(fotg210, status_reg));
++
++  /* restart schedule */
++  fotg210->command |= CMD_RUN;
++			fotg210_writel(fotg210, fotg210->command, 
>regs->command);

+   }
+
+   if (!(temp & (PORT_RESUME|PORT_RESET))) {
+--
+2.16.2
+


Didn't work for me :(


Regards,
Roman

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] tools/mkimage: update to version 2018.03

2018-04-15 Thread Felix Fietkau 
On 2018-04-15 00:21, Hauke Mehrtens wrote:
> This activates support for fit images and some other new mkimage
> features. Some of the patches were applied upstream and could be
> removed.
> 
> Signed-off-by: Hauke Mehrtens 
> ---
> 
> Could someone please test this with MacOSX.
Works for me.

- Felix

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev