[LEDE-DEV] [PATCH] ath79: u-boot partitions should be read-only in dts
Some of the new ath79 device trees were missing read-only tags on the u-boot partitions. This adds the tags where previously missing. Signed-off-by: Russell Senior --- target/linux/ath79/dts/ar7241_ubnt-unifi.dts | 1 + target/linux/ath79/dts/ar7241_ubnt-xm.dtsi | 1 + target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts | 1 + 3 files changed, 3 insertions(+) diff --git a/target/linux/ath79/dts/ar7241_ubnt-unifi.dts b/target/linux/ath79/dts/ar7241_ubnt-unifi.dts index aaafb08424..9c8c86cb97 100644 --- a/target/linux/ath79/dts/ar7241_ubnt-unifi.dts +++ b/target/linux/ath79/dts/ar7241_ubnt-unifi.dts @@ -71,6 +71,7 @@ partition@0 { label = "u-boot"; reg = <0x00 0x04>; + read-only; }; partition@1 { diff --git a/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi index cd7da2089b..983c446783 100644 --- a/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi +++ b/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi @@ -80,6 +80,7 @@ partition@0 { label = "u-boot"; reg = <0x00 0x04>; + read-only; }; partition@1 { diff --git a/target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts b/target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts index 9589925eb5..42bcc6967e 100644 --- a/target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts +++ b/target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts @@ -97,6 +97,7 @@ partition@0 { label = "u-boot"; reg = <0x00 0x02>; + read-only; }; partition@1 { -- 2.17.0 -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] custom files not working?
>>>>> "Koen" == Koen Vandeputte writes: Koen> On 2018-04-26 20:16, Hannu Nyman wrote: >> Custom files work quite normally for me. Just compiled and flashed >> r6763-746c590882, and I can see my custom files quite normally in >> /etc. >> >> At the first glance I do not see any obvious mistake in your >> workflow. >> Koen> Firstly: Koen> Testing this in detail shows the actual issue: Koen> Adding these files: - etc/config/testfile (contains a comment Koen> line) - etc/config/network (Altered config file, intended to Koen> overwrite the existing one) - etc/config/wireless (Altered config Koen> file, intended to overwrite the existing one) Koen> The 1st file is properly added The 2nd file is properly altered Koen> The 3rd file seems to be ignored/overwritten again somewhere in Koen> the process. It's not possible to provide a custom "wireless" Koen> file Koen> summarized: Adding new files seems to work, altering used files Koen> ... not always You might take a look at the scripts in /rom/etc/uci-defaults to see if they are altering what you put in the files overlay. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Ubnt Bullet M2 flashing ?
>>>>> "Bill" == Bill Moffitt writes: Etienne> Is it still possible to flash latest ubnt bullet m2 with Etienne> OpenWRT? (AirOS 6.X) Is it possible to downgrade to 5.5.10 Etienne> from the 6.X versions ? is it still required ? Bill> I have not been able to figure out a way to do it. It seems to be possible to flash an older bootloader with an external programmer. It is possible to obtain the older bootloader from another device. It should be possible (but isn't due to apparently GPL violation, at least, the last time I checked) to obtain the 5.5.x u-boot source from Ubiquiti. -- Russell Senior russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] openvpn: fix interface with mbedtls_sha256
Between mbedtls 2.6.0 and 2.7.0, the void returning mbedtls_MODULE* functions were deprecated in favor of functions returning an int error code. Use the new function mbedtls_sha256_ret(). Signed-off-by: Russell Senior --- .../300-mbedtls_dont_use_deprecated_sha256_function.patch | 11 +++ 1 file changed, 11 insertions(+) create mode 100644 package/network/services/openvpn/patches/300-mbedtls_dont_use_deprecated_sha256_function.patch diff --git a/package/network/services/openvpn/patches/300-mbedtls_dont_use_deprecated_sha256_function.patch b/package/network/services/openvpn/patches/300-mbedtls_dont_use_deprecated_sha256_function.patch new file mode 100644 index 00..b9201a599a --- /dev/null +++ b/package/network/services/openvpn/patches/300-mbedtls_dont_use_deprecated_sha256_function.patch @@ -0,0 +1,11 @@ +--- a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c +@@ -803,7 +803,7 @@ tls_ctx_personalise_random(struct tls_ro + { + mbedtls_x509_crt *cert = ctx->crt_chain; + +-mbedtls_sha256(cert->tbs.p, cert->tbs.len, sha256_hash, false); ++mbedtls_sha256_ret(cert->tbs.p, cert->tbs.len, sha256_hash, false); + if (0 != memcmp(old_sha256_hash, sha256_hash, sizeof(sha256_hash))) + { + mbedtls_ctr_drbg_update(cd_ctx, sha256_hash, 32); -- 2.16.1 -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] curl: fix interface with mbedtls_sha256
Between mbedtls 2.6.0 and 2.7.0, the void returning mbedtls_MODULE* functions were deprecated in favor of functions returning an int error code. Use the new function mbedtls_sha256_ret(). Signed-off-by: Russell Senior --- .../320-mbedtls_dont_use_deprecated_sha256_function.patch | 11 +++ 1 file changed, 11 insertions(+) create mode 100644 package/network/utils/curl/patches/320-mbedtls_dont_use_deprecated_sha256_function.patch diff --git a/package/network/utils/curl/patches/320-mbedtls_dont_use_deprecated_sha256_function.patch b/package/network/utils/curl/patches/320-mbedtls_dont_use_deprecated_sha256_function.patch new file mode 100644 index 00..5c4c18c2a4 --- /dev/null +++ b/package/network/utils/curl/patches/320-mbedtls_dont_use_deprecated_sha256_function.patch @@ -0,0 +1,11 @@ +--- a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c +@@ -1029,7 +1029,7 @@ static void Curl_mbedtls_sha256sum(const + size_t sha256len UNUSED_PARAM) + { + (void)sha256len; +- mbedtls_sha256(input, inputlen, sha256sum, 0); ++ mbedtls_sha256_ret(input, inputlen, sha256sum, 0); + } + + static void *Curl_mbedtls_get_internals(struct ssl_connect_data *connssl, -- 2.16.1 -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] tools: update patch to v2.7.6
Removes a redundant patch with a fix already upstream. Build tested on apm821xx (PPC). Signed-off-by: Russell Senior --- tools/patch/Makefile | 4 ++-- tools/patch/patches/001-fix-macos-vasnprintf.patch | 25 -- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 tools/patch/patches/001-fix-macos-vasnprintf.patch diff --git a/tools/patch/Makefile b/tools/patch/Makefile index 9866e2055d..4c4c09bc08 100644 --- a/tools/patch/Makefile +++ b/tools/patch/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=patch -PKG_VERSION:=2.7.5 +PKG_VERSION:=2.7.6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/patch -PKG_HASH:=fd95153655d6b95567e623843a0e77b81612d502ecf78a489a4aed7867caa299 +PKG_HASH:=ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd HOST_BUILD_PARALLEL := 1 diff --git a/tools/patch/patches/001-fix-macos-vasnprintf.patch b/tools/patch/patches/001-fix-macos-vasnprintf.patch deleted file mode 100644 index e41315d34e..00 --- a/tools/patch/patches/001-fix-macos-vasnprintf.patch +++ /dev/null @@ -1,25 +0,0 @@ a/lib/vasnprintf.c -+++ b/lib/vasnprintf.c -@@ -4858,7 +4858,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if ! (((__GLIBC__ > 2 \ -+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ -+ && !defined __UCLIBC__)\ -+|| (defined __APPLE__ && defined __MACH__) \ -+|| ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; -@@ -4872,6 +4876,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * -in format strings in writable memory may crash the program -(if compiled with _FORTIFY_SOURCE=2), so we should avoid it -in this situation. */ -+/* macOS 10.13 High Sierra behaves like glibc with -+ _FORTIFY_SOURCE=2, and older macOS releases -+ presumably do not need %n. */ - /* On native Windows systems (such as mingw), we can avoid using -%n because: - - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, -- 2.16.1 -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Debugging steps for FS#1246 - Ubnt Nanostation Loco M2 - WDS link drops out after a few hours
>>>>> "Aaron" == Aaron Z writes: Aaron> I opened a ticket in late Dec but haven't heard anything. Does Aaron> anyone have any suggestions on where to go next to troubleshoot Aaron> this issue? My wife is getting very tired of the internet Aaron> randomly dropping out on our WDS link. Aaron> Ticket: Aaron> https://bugs.openwrt.org/index.php?do=details&task_id=1246 [...] Aaron> Anyone have any suggestions on where to look next to figure out Aaron> why this is happening? You could try not using WDS, maybe batman-adv instead. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] New lede->openwrt build, missing ubifs firmware build
>>>>> "Arjen" == Arjen de Korte writes: Arjen> May I kindly suggest your read the git commit logs before Arjen> posting? The reasons for dropping this are described in the Arjen> commit that removed support for ubifs. Or subscribe to the commit Arjen> messages, so that you're informed about changes being made. Arjen> If you're using the development snapshot, you're supposed to keep Arjen> track of changes yourself. There will be no announcements other Arjen> than the commit messages about things that have changed. Fwiw, as a general principle, I don't think it is entirely unreasonable to expect some kind of public discussion before removing features, which would give people a chance to make a case for keeping it. Maybe that happened, I wasn't paying attention (and don't particularly care) in this case. -- Russell Senior russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCHv2] iproute2: update to v4.14.1
Preserves optionality of libmnl by letting configuration script follow the HAVE_MNL environment variable. Signed-off-by: Russell Senior --- package/network/utils/iproute2/Makefile| 5 ++-- .../utils/iproute2/patches/007-no_arpd.patch | 6 ++-- .../utils/iproute2/patches/008-no_netem.patch | 2 +- .../patches/009-keep_libmnl_optional.patch | 11 .../iproute2/patches/120-libnetlink-pic.patch | 7 ++--- ...pi-libc-compat.h-do-not-rely-on-__GLIBC__.patch | 20 ++--- ...er.h-prevent-redefinition-of-struct-ethhd.patch | 16 +-- .../utils/iproute2/patches/300-ip_tiny.patch | 22 +++ .../iproute2/patches/900-drop_FAILED_POLICY.patch | 33 +++--- .../iproute2/patches/950-add-cake-to-tc.patch | 8 +++--- 10 files changed, 64 insertions(+), 66 deletions(-) create mode 100644 package/network/utils/iproute2/patches/009-keep_libmnl_optional.patch diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index c2771f0b59..3e1db33258 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=4.13.0 +PKG_VERSION:=4.14.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 -PKG_HASH:=9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50 +PKG_HASH:=d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=iptables PKG_LICENSE:=GPL-2.0 @@ -21,6 +21,7 @@ PKG_CPE_ID:=cpe:/a:iproute2_project:iproute2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/package.mk define Package/iproute2/Default diff --git a/package/network/utils/iproute2/patches/007-no_arpd.patch b/package/network/utils/iproute2/patches/007-no_arpd.patch index 94fb197a45..ac216ba825 100644 --- a/package/network/utils/iproute2/patches/007-no_arpd.patch +++ b/package/network/utils/iproute2/patches/007-no_arpd.patch @@ -2,7 +2,7 @@ +++ b/misc/Makefile @@ -5,9 +5,9 @@ TARGETS=ss nstat ifstat rtacct lnstat - include ../Config + include ../config.mk -ifeq ($(HAVE_BERKELEY_DB),y) - TARGETS += arpd @@ -11,5 +11,5 @@ +# TARGETS += arpd +#endif - ifeq ($(HAVE_SELINUX),y) - LDLIBS += $(shell $(PKG_CONFIG) --libs libselinux) + all: $(TARGETS) + diff --git a/package/network/utils/iproute2/patches/008-no_netem.patch b/package/network/utils/iproute2/patches/008-no_netem.patch index 64896387f9..2e088f1993 100644 --- a/package/network/utils/iproute2/patches/008-no_netem.patch +++ b/package/network/utils/iproute2/patches/008-no_netem.patch @@ -1,7 +1,7 @@ --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ WFLAGS += -Wmissing-declarations -Wold-s - CFLAGS := $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(CFLAGS) + CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS) YACCFLAGS = -d -t -v -SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man diff --git a/package/network/utils/iproute2/patches/009-keep_libmnl_optional.patch b/package/network/utils/iproute2/patches/009-keep_libmnl_optional.patch new file mode 100644 index 00..7a5a702237 --- /dev/null +++ b/package/network/utils/iproute2/patches/009-keep_libmnl_optional.patch @@ -0,0 +1,11 @@ +--- a/configure b/configure +@@ -292,7 +292,7 @@ check_selinux() + + check_mnl() + { +- if ${PKG_CONFIG} libmnl --exists ++ if [ "${HAVE_MNL}" = "y" ] && ${PKG_CONFIG} libmnl --exists + then + echo "HAVE_MNL:=y" >>$CONFIG + echo "yes" diff --git a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch index ebe122e005..83ce66d976 100644 --- a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch +++ b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch @@ -1,11 +1,10 @@ --- a/lib/Makefile +++ b/lib/Makefile -@@ -12,7 +12,7 @@ ifeq ($(HAVE_MNL),y) - CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags) - endif +@@ -1,6 +1,6 @@ + include ../config.mk -CFLAGS += -fPIC +CFLAGS += $(FPIC) UTILOBJ = utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o \ - inet_proto.o namespace.o json_writer.o \ + inet_proto.o namespace.o json_writer.o json_print.o \ diff --git a/package/network/utils/iproute2/patches/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch b/package/network/utils/iproute2/patches/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch index b0ed599196..e3364ad059 100644 --- a/package/network/utils/iproute2/patches/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch +++ b/package/network/utils/iproute2/patches/271-uapi-libc-
Re: [LEDE-DEV] [PATCH] iproute2: update to v4.14.1
On Mon, Nov 27, 2017 at 12:47 AM, Hans Dedecker wrote: > On Mon, Nov 27, 2017 at 9:29 AM, Russell Senior > wrote: >> >> Signed-off-by: Russell Senior >> --- >> package/network/utils/iproute2/Makefile| 18 ++-- >> .../utils/iproute2/patches/007-no_arpd.patch | 6 ++-- >> .../utils/iproute2/patches/008-no_netem.patch | 2 +- >> .../iproute2/patches/120-libnetlink-pic.patch | 7 ++--- >> ...pi-libc-compat.h-do-not-rely-on-__GLIBC__.patch | 4 +-- >> ...er.h-prevent-redefinition-of-struct-ethhd.patch | 8 +++--- >> .../utils/iproute2/patches/300-ip_tiny.patch | 22 +++ >> .../iproute2/patches/900-drop_FAILED_POLICY.patch | 33 >> +++--- >> .../iproute2/patches/950-add-cake-to-tc.patch | 8 +++--- >> 9 files changed, 47 insertions(+), 61 deletions(-) >> >> diff --git a/package/network/utils/iproute2/Makefile >> b/package/network/utils/iproute2/Makefile >> index c2771f0b59..bec435d894 100644 >> --- a/package/network/utils/iproute2/Makefile >> +++ b/package/network/utils/iproute2/Makefile >> @@ -8,12 +8,12 @@ >> include $(TOPDIR)/rules.mk >> >> PKG_NAME:=iproute2 >> -PKG_VERSION:=4.13.0 >> +PKG_VERSION:=4.14.1 >> PKG_RELEASE:=1 >> >> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz >> PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 >> -PKG_HASH:=9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50 >> +PKG_HASH:=d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067 >> PKG_BUILD_PARALLEL:=1 >> PKG_BUILD_DEPENDS:=iptables >> PKG_LICENSE:=GPL-2.0 >> @@ -37,7 +37,7 @@ $(call Package/iproute2/Default) >> VARIANT:=tiny >> PROVIDES:=ip >> ALTERNATIVES:=200:/sbin/ip:/sbin/ip-tiny >> - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl >> + DEPENDS:=+libnl-tiny +libmnl > Dependency on libmnl makes the usage of packages such as > ip-tiny/ip-full/tc/genl/ip-bridge version more bloated. > In the previous upstep to 4.13.0 I noticed libmnl support is rather > optional than required for these packages; I would like to keep it > that way Hmm. Upstream iproute2 changed the way it configures itself since v4.13.0. It is currently happily finding libmnl is the STAGING_DIR and configuring to use it. I'll need to dig a little deeper. > > Hans >> endef >> >> define Package/ip-full >> @@ -46,37 +46,37 @@ $(call Package/iproute2/Default) >> VARIANT:=full >> PROVIDES:=ip >> ALTERNATIVES:=300:/sbin/ip:/sbin/ip-full >> - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl >> + DEPENDS:=+libnl-tiny +libmnl >> endef >> >> define Package/tc >> $(call Package/iproute2/Default) >>TITLE:=Traffic control utility >> - DEPENDS:=+kmod-sched-core +(PACKAGE_devlink||PACKAGE_rdma):libmnl >> + DEPENDS:=+kmod-sched-core +libmnl >> endef >> >> define Package/genl >> $(call Package/iproute2/Default) >>TITLE:=General netlink utility frontend >> - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl >> + DEPENDS:=+libnl-tiny +libmnl >> endef >> >> define Package/ip-bridge >> $(call Package/iproute2/Default) >>TITLE:=Bridge configuration utility from iproute2 >> - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl >> + DEPENDS:=+libnl-tiny +libmnl >> endef >> >> define Package/ss >> $(call Package/iproute2/Default) >>TITLE:=Socket statistics utility >> - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl >> + DEPENDS:=+libnl-tiny +libmnl >> endef >> >> define Package/nstat >> $(call Package/iproute2/Default) >>TITLE:=Network statistics utility >> - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl >> + DEPENDS:=+libnl-tiny +libmnl >> endef >> >> define Package/devlink >> diff --git a/package/network/utils/iproute2/patches/007-no_arpd.patch >> b/package/network/utils/iproute2/patches/007-no_arpd.patch >> index 94fb197a45..ac216ba825 100644 >> --- a/package/network/utils/iproute2/patches/007-no_arpd.patch >> +++ b/package/network/utils/iproute2/patches/007-no_arpd.patch >> @@ -2,7 +2,7 @@ >> +++ b/misc/Makefile >> @@ -5,9 +5,9 @@ TARGETS=ss nstat ifstat rtacct lnstat >> >> - include ../Config >> + include ../config.mk >> >> -ifeq ($(HAVE_BERKELEY_DB),y) >> - TARGETS += arpd >> @@ -11,5 +11,5 @@ >> +# TARGETS += arpd >> +#endif >> >> - ifeq ($(HAVE_S
[LEDE-DEV] [PATCH] iproute2: update to v4.14.1
Signed-off-by: Russell Senior --- package/network/utils/iproute2/Makefile| 18 ++-- .../utils/iproute2/patches/007-no_arpd.patch | 6 ++-- .../utils/iproute2/patches/008-no_netem.patch | 2 +- .../iproute2/patches/120-libnetlink-pic.patch | 7 ++--- ...pi-libc-compat.h-do-not-rely-on-__GLIBC__.patch | 4 +-- ...er.h-prevent-redefinition-of-struct-ethhd.patch | 8 +++--- .../utils/iproute2/patches/300-ip_tiny.patch | 22 +++ .../iproute2/patches/900-drop_FAILED_POLICY.patch | 33 +++--- .../iproute2/patches/950-add-cake-to-tc.patch | 8 +++--- 9 files changed, 47 insertions(+), 61 deletions(-) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index c2771f0b59..bec435d894 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=4.13.0 +PKG_VERSION:=4.14.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 -PKG_HASH:=9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50 +PKG_HASH:=d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=iptables PKG_LICENSE:=GPL-2.0 @@ -37,7 +37,7 @@ $(call Package/iproute2/Default) VARIANT:=tiny PROVIDES:=ip ALTERNATIVES:=200:/sbin/ip:/sbin/ip-tiny - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl + DEPENDS:=+libnl-tiny +libmnl endef define Package/ip-full @@ -46,37 +46,37 @@ $(call Package/iproute2/Default) VARIANT:=full PROVIDES:=ip ALTERNATIVES:=300:/sbin/ip:/sbin/ip-full - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl + DEPENDS:=+libnl-tiny +libmnl endef define Package/tc $(call Package/iproute2/Default) TITLE:=Traffic control utility - DEPENDS:=+kmod-sched-core +(PACKAGE_devlink||PACKAGE_rdma):libmnl + DEPENDS:=+kmod-sched-core +libmnl endef define Package/genl $(call Package/iproute2/Default) TITLE:=General netlink utility frontend - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl + DEPENDS:=+libnl-tiny +libmnl endef define Package/ip-bridge $(call Package/iproute2/Default) TITLE:=Bridge configuration utility from iproute2 - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl + DEPENDS:=+libnl-tiny +libmnl endef define Package/ss $(call Package/iproute2/Default) TITLE:=Socket statistics utility - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl + DEPENDS:=+libnl-tiny +libmnl endef define Package/nstat $(call Package/iproute2/Default) TITLE:=Network statistics utility - DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl + DEPENDS:=+libnl-tiny +libmnl endef define Package/devlink diff --git a/package/network/utils/iproute2/patches/007-no_arpd.patch b/package/network/utils/iproute2/patches/007-no_arpd.patch index 94fb197a45..ac216ba825 100644 --- a/package/network/utils/iproute2/patches/007-no_arpd.patch +++ b/package/network/utils/iproute2/patches/007-no_arpd.patch @@ -2,7 +2,7 @@ +++ b/misc/Makefile @@ -5,9 +5,9 @@ TARGETS=ss nstat ifstat rtacct lnstat - include ../Config + include ../config.mk -ifeq ($(HAVE_BERKELEY_DB),y) - TARGETS += arpd @@ -11,5 +11,5 @@ +# TARGETS += arpd +#endif - ifeq ($(HAVE_SELINUX),y) - LDLIBS += $(shell $(PKG_CONFIG) --libs libselinux) + all: $(TARGETS) + diff --git a/package/network/utils/iproute2/patches/008-no_netem.patch b/package/network/utils/iproute2/patches/008-no_netem.patch index 64896387f9..2e088f1993 100644 --- a/package/network/utils/iproute2/patches/008-no_netem.patch +++ b/package/network/utils/iproute2/patches/008-no_netem.patch @@ -1,7 +1,7 @@ --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ WFLAGS += -Wmissing-declarations -Wold-s - CFLAGS := $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(CFLAGS) + CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS) YACCFLAGS = -d -t -v -SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man diff --git a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch index ebe122e005..83ce66d976 100644 --- a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch +++ b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch @@ -1,11 +1,10 @@ --- a/lib/Makefile +++ b/lib/Makefile -@@ -12,7 +12,7 @@ ifeq ($(HAVE_MNL),y) - CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags) - endif +@@ -1,6 +1,6 @@ + include ../config.mk -CFLAGS += -fPIC +CFLAGS += $(FPIC) UTILOBJ = utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o \ - inet_proto.o namespace.o json_writer.o \ + inet_proto.o namespace.o json_writer.o json_print.o \ diff --git a/package/network/utils/iproute2/patches/271-uapi
Re: [LEDE-DEV] Updating Perl to 5.26.1
>>>>> "Philip" == Philip Prindeville >>>>> writes: Philip> Hi. I’m trying to update Perl from 5.24.1 to 5.26.1 but running Philip> into some issues. Philip> We don’t use ./Configure to build the target versions (just the Philip> host version), so when new settings are added, we need to figure Philip> out what they are… and what the appropriate settings are for all Philip> processors. Philip> And word is from upstream that 5.28.1 will have even more stuff Philip> that we need to add to get it to build. Philip> Wondering if there isn’t an easier way to figure out Philip> automatically what those settings should be. Philip> Obviously we can’t compile and run for other platforms, but we Philip> can compile and extract information from those images (with Philip> objdump, nm, etc). Philip> A lot of the tests that get run during Configure (grep ‘$run Philip> ./try’ Configure) are run just to dump out information about the Philip> result of compilation… most of which could also be extracted Philip> just by examining the generated object (such as with objdump Philip> -d). Philip> Anyone have any suggestions for things we can try to make Philip> ./Configure work for cross-compiles as well? Philip> Because doing version updates seems to involve a fair amount of Philip> guesswork about what the correct values are for a whole gamut of Philip> platforms, and this seems error-prone. A long time ago, I tracked down a bug in the perl builds on a brcm47xx device by installing a native toolchain in an nfs-mounted rootfs and, over about 24 hours, running the auto configuration script on the target device. I have no idea if the situation has improved since then, maybe 10 years ago. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Archer c7 corrupted firmware bootloop - tftp aborting - serial not working
>>>>> "Alberto" == Alberto Bursi writes: Alberto> On 06/04/2017 02:54 PM, QWeRKUS qwErkus wrote: >> Thank you for your reply. JTAG seems even trickier than serial. So >> far all my attempts to scan for a valid JTAG chain end up with: >> >> Error: JTAG scan chain interrogation failed: all zeroes >> >> There a just too many variables to check for a newbie like myself, so >> I guess I'll go with the spi programmer. Turns out this is another >> thing the pi can do (via flashrom) so no need for new hardware. Are >> you sure you need to desolder the chip though ? Shouldn't this be >> working with a 8 pin SOIC clamp and and external 3.3V power source (I >> have an old ATX PSU doing the job) ? >> >> Alberto> It should, but in some cases it does not (depends from how the Alberto> board was designed) and in those situations you need to Alberto> desolder the chip. I got most of these "cases where it does not Alberto> work" in PC and laptop boards though. If the CPU is trying to access the SPI bus at the same time, it can be problematic. On a TP Link WDR3600 board, I had to figure out how to hold the CPU in reset. You might be able to do that from the JTAG nSRST pin. Make sure it's connected. On the WDR3600 board, there was a shunt resistor missing. http://www.jtagtest.com/pinouts/ejtag Tie nSRST to ground with a jumper wire or similar, attach your SOIC clip, and run flashrom. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Archer c7 corrupted firmware bootloop - tftp aborting - serial not working
>>>>> "QWeRKUS" == QWeRKUS qwErkus writes: QWeRKUS> Thank you for your replies. Turns out the problem was the QWeRKUS> ground connection, and serial nowworks with QWeRKUS> pl2303. Unfortunately I mixed up 2 addresses when flashing the QWeRKUS> new firmware, and erased from 0x9f00 on instead of QWeRKUS> 0x9f02. As a result, my boot loader is corrupt. Now I'm QWeRKUS> trying some last resort salvage over JTAG, using an rpi with QWeRKUS> openocd as JTAG dongle. Assuming I manage to compile openocd QWeRKUS> with ath79 support (which currently fails), can I use the QWeRKUS> u-boot from pepe2k to restore my uboot ? I yes, how does it QWeRKUS> work: just copying the bin to flash from 0x9f00 onwards ? Another approach is to write the flash with an external programmer. You might need to desolder the flash chip, if you can't figure out how to hold the CPU in reset. It looks like the c7 has a regular SPI flash chip. It is probably just an 8-pin part, and not too hard to desolder, if you need to. Solder wick is handy for cleaning up the pads after you remove it. I have recently used a bus pirate or a teensy 3.1 with the flashrom program to read/write spi flash. Likely to be Way easier that trying to figure out JTAG. Make *very* sure you have a (or several) complete backup of the flash part before writing over it. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Archer c7 corrupted firmware bootloop - tftp aborting - serial not working
>>>>> "QWeRKUS" == QWeRKUS qwErkus writes: QWeRKUS> Hello, Something went wrong with my last flash of an archer c7 QWeRKUS> v2, and now the device refuses to boot. I'm trying to unbrick QWeRKUS> it without success since. QWeRKUS> 2. I tried to get a serial access to the device, unfortunately QWeRKUS> all I get is gibberish. Tried 115200 and 9600 baudrates, 8 bit, QWeRKUS> no parity, 1 stop bit, no flow control with either CP2102 or QWeRKUS> PL2303 usb uart dongles. Also, I can't boot the device with QWeRKUS> the ground wire from either uart plugged in. Lights turns on, QWeRKUS> and just freeze. QWeRKUS> Wasted tons of hours on this, and would really be thankful for QWeRKUS> any advice/pointers. Sounds like you are connecting your serial wrong. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] ramips: remove fictional LEDs from AsiaRF AWM00x device tree
Neither the AsiaRF AWM002 or AWM003 actually has an LED on the module board. The ld1 and ld2 do not represent actual LEDs. These pins might connect to LEDS on an eval board or other carrier board, but that is outside the scope of this device tree file. Signed-off-by: Russell Senior --- target/linux/ramips/dts/AWM002.dtsi | 14 -- 1 file changed, 14 deletions(-) diff --git a/target/linux/ramips/dts/AWM002.dtsi b/target/linux/ramips/dts/AWM002.dtsi index 9ff64917ea..00a4ddbcf1 100644 --- a/target/linux/ramips/dts/AWM002.dtsi +++ b/target/linux/ramips/dts/AWM002.dtsi @@ -3,20 +3,6 @@ / { compatible = "AWM002", "ralink,rt5350-soc"; model = "AsiaRF AWM002"; - - gpio-leds { - compatible = "gpio-leds"; - - ld1 { - label = "awm002:green:ld1"; - gpios = <&gpio0 0 1>; - }; - - ld2 { - label = "awm002:green:ld2"; - gpios = <&gpio0 1 1>; - }; - }; }; &spi0 { -- 2.13.0 -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] ar71xx: re-enable wifi leds on buffalo wzr600dhp
Commit 1f5ea4eae46e46a87353a751637ccb5d5cd5f60b disable the ath9k-phy led's which caused the wifi LEDs on this board to remain dark. This commit re-enables them using the target/linux/ar71xx/base-files/etc/board.d/01_leds using the ucidef_set_led_wlan. The LEDs do not illuminate until firstboot finishes after flashing, so they will not illuminate as quickly as they did before commit 1f5ea4ea. Signed-off-by: Russell Senior --- target/linux/ar71xx/base-files/etc/board.d/01_leds | 2 ++ 1 file changed, 2 insertions(+) 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 44d06fc1e1..9efbb0d5a6 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -847,6 +847,8 @@ wpn824n) wzr-hp-ag300h) ucidef_set_led_default "diag" "DIAG" "buffalo:red:diag" "0" ucidef_set_led_netdev "router" "ROUTER" "buffalo:green:router" "eth1" + ucidef_set_led_wlan "wlan2g" "WLAN2G" "buffalo:amber:band2g" "phy0tpt" + ucidef_set_led_wlan "wlan5g" "WLAN5G" "buffalo:amber:band5g" "phy1tpt" ucidef_set_led_usbdev "usb" "USB" "buffalo:green:usb" "1-1" ;; wzr-hp-g300nh) -- 2.12.2 -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] ramips: add support for AsiaRF AWM688
>Hey Russell, >thanks a lot for your contribution. Find my comments inline. > >2017-04-05 5:38 GMT+02:00 Russell Senior : >> >> Add initial support for an mtk7688 board from Asia RF. >> >> It boots, flashes and runs. >> >> Signed-off-by: Russell Senior > >As you wrote initial support, what does not work? Thanks for the feedback. It isn't thoroughly tested. These were the minimal changes I needed to get it to boot and flash. The DTS was copied from the LinkIt7688 and tweaked minimally. > >Would you please add a brief description of the hardware and outline how >LEDE can be installed on the board. Have a look at the recent ramips >board additions for some good examples. I booted an initramfs image and sysupgraded. I'll have a look at recent ramips additions. > >> --- >> >> diff --git a/package/boot/uboot-envtools/files/ramips >> b/package/boot/uboot-envtools/files/ramips >> index 3216b300c1..9327bcbcf4 100644 >> --- a/package/boot/uboot-envtools/files/ramips >> +++ b/package/boot/uboot-envtools/files/ramips >> @@ -19,6 +19,7 @@ all0256n|\ >> all5002) >> ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1" "0x1" >> ;; >> +awm688|\ >> br-6425|\ >> linkits7688|\ >> linkits7688d|\ > >Why is access to the u-boot env from userspace required? I'm not sure it is. > >> diff --git a/target/linux/ramips/base-files/etc/board.d/02_network >> b/target/linux/ramips/base-files/etc/board.d/02_network >> index 7bdebbe97f..19ff14df83 100755 >> --- a/target/linux/ramips/base-files/etc/board.d/02_network >> +++ b/target/linux/ramips/base-files/etc/board.d/02_network >> @@ -44,6 +44,7 @@ ramips_setup_interfaces() >> all0256n|\ >> all5002|\ >> all5003|\ >> + awm688|\ >> broadway|\ >> dcs-930|\ >> dcs-930l-b1|\ >> diff --git a/target/linux/ramips/base-files/lib/ramips.sh >> b/target/linux/ramips/base-files/lib/ramips.sh >> index 786aecb99b..cd944ed207 100755 >> --- a/target/linux/ramips/base-files/lib/ramips.sh >> +++ b/target/linux/ramips/base-files/lib/ramips.sh >> @@ -79,6 +79,9 @@ ramips_board_detect() { >> *"AWM003 EVB") >> name="awm003-evb" >> ;; >> + *"AWM688") >> + name="awm688" >> + ;; >> *"BC2") >> name="bc2" >> ;; >> diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh >> b/target/linux/ramips/base-files/lib/upgrade/platform.sh >> index 08fa45ad98..6360fe83a0 100755 >> --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh >> +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh >> @@ -29,6 +29,7 @@ platform_check_image() { >> awapn2403|\ >> awm002-evb|\ >> awm003-evb|\ >> + awm688|\ >> bc2|\ >> broadway|\ >> carambola|\ >> diff --git a/target/linux/ramips/dts/AWM688.dts >> b/target/linux/ramips/dts/AWM688.dts >> new file mode 100644 >> index 00..1c5230ed84 >> --- /dev/null >> +++ b/target/linux/ramips/dts/AWM688.dts >> @@ -0,0 +1,183 @@ >> +/dts-v1/; >> + >> +#include "mt7628an.dtsi" >> + >> +#include > >Please include dt-bindings/gpio/gpio.h here as well and keep >alphabetical order. > >Use the GPIO_ACTIVE_LOW and GPIO_ACTIVE_HIGH macros afterwards instead >of 1 and 0 in the gpio parameters. > >Check the recent ramips board additions for examples. Okay. > >> + >> +/ { >> + compatible = "mediatek,awm688", "mediatek,mt7628an-soc"; >> + model = "AsiaRF AWM688"; >> + >> + chosen { >> + bootargs = "console=ttyS0,57600"; >> + }; >> + >> + aliases { >> + serial0 = &uart1; >> + }; >> + >> + memory@0 { >> + device_type = "memory"; >> + reg = <0x0 0x400>; >> + }; >> + >> + bootstrap { >> + compatible = "mediatek,awm688"; >> + >> + status = "okay"; >> + }; >> + >> + gpio-leds { >> + compatible = "gpio-leds"; >> + >> + wifi { >> + label = "
[LEDE-DEV] [PATCH] ramips: add support for AsiaRF AWM688
Add initial support for an mtk7688 board from Asia RF. It boots, flashes and runs. Signed-off-by: Russell Senior --- diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips index 3216b300c1..9327bcbcf4 100644 --- a/package/boot/uboot-envtools/files/ramips +++ b/package/boot/uboot-envtools/files/ramips @@ -19,6 +19,7 @@ all0256n|\ all5002) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1" "0x1" ;; +awm688|\ br-6425|\ linkits7688|\ linkits7688d|\ diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index 7bdebbe97f..19ff14df83 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -44,6 +44,7 @@ ramips_setup_interfaces() all0256n|\ all5002|\ all5003|\ + awm688|\ broadway|\ dcs-930|\ dcs-930l-b1|\ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 786aecb99b..cd944ed207 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -79,6 +79,9 @@ ramips_board_detect() { *"AWM003 EVB") name="awm003-evb" ;; + *"AWM688") + name="awm688" + ;; *"BC2") name="bc2" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 08fa45ad98..6360fe83a0 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -29,6 +29,7 @@ platform_check_image() { awapn2403|\ awm002-evb|\ awm003-evb|\ + awm688|\ bc2|\ broadway|\ carambola|\ diff --git a/target/linux/ramips/dts/AWM688.dts b/target/linux/ramips/dts/AWM688.dts new file mode 100644 index 00..1c5230ed84 --- /dev/null +++ b/target/linux/ramips/dts/AWM688.dts @@ -0,0 +1,183 @@ +/dts-v1/; + +#include "mt7628an.dtsi" + +#include + +/ { + compatible = "mediatek,awm688", "mediatek,mt7628an-soc"; + model = "AsiaRF AWM688"; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + aliases { + serial0 = &uart1; + }; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x400>; + }; + + bootstrap { + compatible = "mediatek,awm688"; + + status = "okay"; + }; + + gpio-leds { + compatible = "gpio-leds"; + + wifi { + label = "mediatek:orange:wifi"; + gpios = <&wgpio 0 0>; + default-state = "on"; + }; + }; + + gpio-keys-polled { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + wps { + label = "reset"; + gpios = <&gpio1 6 1>; + linux,code = ; + }; + }; + + wgpio: gpio-wifi { + compatible = "mediatek,gpio-wifi"; + #address-cells = <1>; + #size-cells = <0>; + gpio-controller; + #gpio-cells = <2>; + }; +}; + +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "gpio"; + ralink,function = "gpio"; + }; + + perst { + ralink,group = "perst"; + ralink,function = "gpio"; + }; + + refclk { + ralink,group = "refclk"; + ralink,function = "gpio"; + }; + + i2s { + ralink,group = "i2s"; + ralink,function = "gpio"; + }; + + spis { + ralink,group = "spis"; + ralink,function = "gpio"; + }; + + wled_kn { + ralink,group = "wled_kn"; + ralink,function = "gpio"; + }; + + wled_an { + ralink,group = "wled_an"; + ralink,function
Re: [LEDE-DEV] [RFC] iproute2: update to v4.10.0
>>>>> "Syrone" == Syrone Wong writes: Syrone> either runtime dependency ``` DEPENDS:=+kmod-sched-core Syrone> +iptables ``` Syrone> or build-time dependency Syrone> ``` PKG_BUILD_DEPENDS:=iptables ``` Syrone> Don't add both of them. That does not fix the problem. With the runtime dependency and without the BUILD_DEPENDS, I still get: $ make defconfig Collecting package info: done tmp/.config-package.in:53710:error: recursive dependency detected! For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:53710: symbol PACKAGE_iptables is selected by PACKAGE_tc For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:59483: symbol PACKAGE_tc is selected by PACKAGE_luci-app-splash For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:35320: symbol PACKAGE_luci-app-splash is selected by PACKAGE_luci-mod-freifunk-community For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:34418: symbol PACKAGE_luci-mod-freifunk-community depends on PACKAGE_firewall For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:246: symbol PACKAGE_firewall is selected by PACKAGE_luci-app-firewall For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:34775: symbol PACKAGE_luci-app-firewall is selected by PACKAGE_luci-app-p2pblock For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:35066: symbol PACKAGE_luci-app-p2pblock depends on PACKAGE_iptables # # configuration written to .config # Documentation/kbuild/kconfig-language.txt (from the kernel tree) suggests changing all the dependencies to either "selected by" or "depends on". That would seem to mean touching the luci packages. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC] iproute2: update to v4.10.0
>>>>> "Russell" == Russell Senior writes: >>>>> "Syrone" == Syrone Wong writes: Syrone> It seems this chunk is redundant - DEPENDS:=+kmod-sched-core + Syrone> DEPENDS:=+kmod-sched-core iptables Syrone> If you really want to add iptables as runtime dependency, it Syrone> should be `+iptables`. Russell> Syrone, afaict, tc dlopen()'s iptables .so's, which implies Russell> that iptables is needed at runtime, at least to support the Russell> associated features. Russell> I didn't get circular dependency problems with this either. Argh. Yes I did. $ make defconfig Collecting package info: done tmp/.config-package.in:53710:error: recursive dependency detected! For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:53710: symbol PACKAGE_iptables is selected by PACKAGE_tc For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:59483: symbol PACKAGE_tc is selected by PACKAGE_luci-app-splash For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:35320: symbol PACKAGE_luci-app-splash is selected by PACKAGE_luci-mod-freifunk-community For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:34418: symbol PACKAGE_luci-mod-freifunk-community depends on PACKAGE_iptables # # configuration written to .config # Suggestions? -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC] iproute2: update to v4.10.0
>>>>> "Syrone" == Syrone Wong writes: Syrone> It seems this chunk is redundant - DEPENDS:=+kmod-sched-core + Syrone> DEPENDS:=+kmod-sched-core iptables Syrone> If you really want to add iptables as runtime dependency, it Syrone> should be `+iptables`. Syrone, afaict, tc dlopen()'s iptables .so's, which implies that iptables is needed at runtime, at least to support the associated features. I didn't get circular dependency problems with this either. Please test: diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 65ae5cb457..17f28f0d16 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -19,6 +19,7 @@ PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPL-2.0 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DEPENDS:=iptables include $(INCLUDE_DIR)/package.mk @@ -44,7 +45,7 @@ Package/ip-full:=$(call Package/iproute2/Default,full,Full,ip) define Package/tc $(call Package/iproute2/Default) TITLE:=Traffic control utility - DEPENDS:=+kmod-sched-core + DEPENDS:=+kmod-sched-core +iptables endef define Package/genl -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC] iproute2: update to v4.10.0
>>>>> "Russell" == Russell Senior writes: Please test: diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 65ae5cb457..3a4b114039 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -19,6 +19,7 @@ PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPL-2.0 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DEPENDS:=iptables include $(INCLUDE_DIR)/package.mk @@ -44,7 +45,7 @@ Package/ip-full:=$(call Package/iproute2/Default,full,Full,ip) define Package/tc $(call Package/iproute2/Default) TITLE:=Traffic control utility - DEPENDS:=+kmod-sched-core + DEPENDS:=+kmod-sched-core iptables endef define Package/genl ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC] iproute2: update to v4.10.0
>>>>> "Russell" == Russell Senior writes: >>>>> "Russell" == Russell Senior writes: Russell> There may also be a missing depends. I had temporary -j16 Russell> build failures due to a missing iptables header file. Russell> Restarting worked, presumably because the header had by then Russell> appeared where expected. I am not sure what, exactly, was Russell> providing the header. Russell> ../include/xtables.h:34:29: fatal error: xtables-version.h: No Russell> such file or directory Russell> This seems to fix the missing header problem. The last version's @@ line got wrapped. This version should apply as a patch. diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 65ae5cb457..a561b0b5af 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -44,7 +44,7 @@ Package/ip-full:=$(call Package/iproute2/Default,full,Full,ip) define Package/tc $(call Package/iproute2/Default) TITLE:=Traffic control utility - DEPENDS:=+kmod-sched-core + DEPENDS:=+kmod-sched-core +iptables endef define Package/genl -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC] iproute2: update to v4.10.0
>>>>> "Russell" == Russell Senior writes: Russell> There may also be a missing depends. I had temporary -j16 Russell> build failures due to a missing iptables header file. Russell> Restarting worked, presumably because the header had by then Russell> appeared where expected. I am not sure what, exactly, was Russell> providing the header. Russell> ../include/xtables.h:34:29: fatal error: xtables-version.h: No Russell> such file or directory This seems to fix the missing header problem. diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 65ae5cb457..a561b0b5af 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -44,7 +44,7 @@ Package/ip-full:=$(call Package/iproute2/Default,full,Full,ip) define Package/tc $(call Package/iproute2/Default) TITLE:=Traffic control utility - DEPENDS:=+kmod-sched-core + DEPENDS:=+kmod-sched-core +iptables endef define Package/genl -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC] iproute2: update to v4.10.0
>>>>> "Russell" == Russell Senior writes: >>>>> "Kevin" == Kevin Darbyshire-Bryant writes: Kevin> On 20/03/17 12:35, Yousong Zhou wrote: >>> On 19 March 2017 at 20:38, Russell Senior wrote: >>>> >>>> Thanks to Syrone Wong for the pointer to >>>> UAPI fixes. This builds now, at least on x86/geode. It would be >>>> nice to have some testing. >>>> >>>> Signed-off-by: Russell Senior --- >>> >>> Tested-by: Yousong Zhou >>> >>> CC jogo, can we have these two patches in generic dir (271, 272) >>> upstreamed? >>> >>> Regards, yousong Kevin> Was this tested on a 4.4 kernel? When I tried it wouldn't Kevin> compile (but it was a quick 5 seconds before I had to run out the Kevin> door type test, so I could have done summit stooopid) Russell> I tested ip-tiny on a Buffalo WZR600DHP (ar71xx): Russell> root@hostname:/# uname -a Linux hostname 4.4.53 #0 Sun Mar 19 Russell> 12:42:50 2017 mips GNU/Linux root@hostname:/# ip -V ip utility, Russell> iproute2-ss4.10.0-1-lede Russell> The new ip-tiny ipk is 20k bigger than the old version (~79k vs Russell> ~100k). There may be some additional pruning possible to get Russell> it back down to a similar size. There may also be a missing depends. I had temporary -j16 build failures due to a missing iptables header file. Restarting worked, presumably because the header had by then appeared where expected. I am not sure what, exactly, was providing the header. ../include/xtables.h:34:29: fatal error: xtables-version.h: No such file or directory -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC] iproute2: update to v4.10.0
>>>>> "Kevin" == Kevin Darbyshire-Bryant writes: Kevin> On 20/03/17 12:35, Yousong Zhou wrote: >> On 19 March 2017 at 20:38, Russell Senior wrote: >>> >>> Thanks to Syrone Wong for the pointer to >>> UAPI fixes. This builds now, at least on x86/geode. It would be >>> nice to have some testing. >>> >>> Signed-off-by: Russell Senior --- >> >> Tested-by: Yousong Zhou >> >> CC jogo, can we have these two patches in generic dir (271, 272) >> upstreamed? >> >> Regards, yousong Kevin> Was this tested on a 4.4 kernel? When I tried it wouldn't Kevin> compile (but it was a quick 5 seconds before I had to run out the Kevin> door type test, so I could have done summit stooopid) I tested ip-tiny on a Buffalo WZR600DHP (ar71xx): root@hostname:/# uname -a Linux hostname 4.4.53 #0 Sun Mar 19 12:42:50 2017 mips GNU/Linux root@hostname:/# ip -V ip utility, iproute2-ss4.10.0-1-lede The new ip-tiny ipk is 20k bigger than the old version (~79k vs ~100k). There may be some additional pruning possible to get it back down to a similar size. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [RFC] iproute2: update to v4.10.0
Thanks to Syrone Wong for the pointer to UAPI fixes. This builds now, at least on x86/geode. It would be nice to have some testing. Signed-off-by: Russell Senior --- package/network/utils/iproute2/Makefile| 8 +- .../utils/iproute2/patches/006-no_sctp.patch | 4 +- .../utils/iproute2/patches/008-no_netem.patch | 6 +- .../utils/iproute2/patches/010-type_fixes.patch| 396 - .../iproute2/patches/100-allow_pfifo_fast.patch| 2 +- .../utils/iproute2/patches/110-extra-ccopts.patch | 2 +- .../iproute2/patches/130-missing_include.patch | 20 -- ...pi-libc-compat.h-do-not-rely-on-__GLIBC__.patch | 107 ++ ...er.h-prevent-redefinition-of-struct-ethhd.patch | 67 .../utils/iproute2/patches/300-ip_tiny.patch | 14 +- .../iproute2/patches/900-drop_FAILED_POLICY.patch | 4 +- .../patches/910-sanitize_headers_for_musl.patch| 10 - .../iproute2/patches/911-fix_in_h_include.patch| 30 -- .../iproute2/patches/950-add-cake-to-tc.patch | 13 +- ...ix-ip-monitor-can-t-work-when-NET_NS-is-n.patch | 40 --- 15 files changed, 199 insertions(+), 524 deletions(-) delete mode 100644 package/network/utils/iproute2/patches/010-type_fixes.patch delete mode 100644 package/network/utils/iproute2/patches/130-missing_include.patch create mode 100644 package/network/utils/iproute2/patches/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch create mode 100644 package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch delete mode 100644 package/network/utils/iproute2/patches/910-sanitize_headers_for_musl.patch delete mode 100644 package/network/utils/iproute2/patches/911-fix_in_h_include.patch delete mode 100644 package/network/utils/iproute2/patches/960-ipmonitor-fix-ip-monitor-can-t-work-when-NET_NS-is-n.patch diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 1c1ee3f24e..65ae5cb457 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -6,14 +6,15 @@ # include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iproute2 -PKG_VERSION:=4.4.0 -PKG_RELEASE:=9 +PKG_VERSION:=4.10.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 -PKG_HASH:=bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 +PKG_HASH:=22b1e1c1fc704ad35837e5a66103739727b8b48ac90b48c13f79b7367ff0a9a8 PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPL-2.0 @@ -89,6 +90,7 @@ MAKE_FLAGS += \ SHARED_LIBS="" \ LDFLAGS="$(TARGET_LDFLAGS) -Wl,--gc-sections" \ IP_CONFIG_TINY=$(IP_CONFIG_TINY) \ + IPT_LIB_DIR=/usr/lib/iptables \ FPIC="$(FPIC)" define Build/Compile diff --git a/package/network/utils/iproute2/patches/006-no_sctp.patch b/package/network/utils/iproute2/patches/006-no_sctp.patch index 6805468d81..d4552fe7fb 100644 --- a/package/network/utils/iproute2/patches/006-no_sctp.patch +++ b/package/network/utils/iproute2/patches/006-no_sctp.patch @@ -1,6 +1,6 @@ --- a/ip/ipxfrm.c +++ b/ip/ipxfrm.c -@@ -470,7 +470,6 @@ void xfrm_selector_print(struct xfrm_sel +@@ -465,7 +465,6 @@ void xfrm_selector_print(struct xfrm_sel switch (sel->proto) { case IPPROTO_TCP: case IPPROTO_UDP: @@ -8,7 +8,7 @@ case IPPROTO_DCCP: default: /* XXX */ if (sel->sport_mask) -@@ -1341,7 +1340,6 @@ static int xfrm_selector_upspec_parse(st +@@ -1322,7 +1321,6 @@ static int xfrm_selector_upspec_parse(st switch (sel->proto) { case IPPROTO_TCP: case IPPROTO_UDP: diff --git a/package/network/utils/iproute2/patches/008-no_netem.patch b/package/network/utils/iproute2/patches/008-no_netem.patch index fce16e02df..47ffd9946d 100644 --- a/package/network/utils/iproute2/patches/008-no_netem.patch +++ b/package/network/utils/iproute2/patches/008-no_netem.patch @@ -1,11 +1,11 @@ --- a/Makefile +++ b/Makefile -@@ -41,7 +41,7 @@ WFLAGS += -Wmissing-declarations -Wold-s +@@ -52,7 +52,7 @@ WFLAGS += -Wmissing-declarations -Wold-s CFLAGS := $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(CFLAGS) YACCFLAGS = -d -t -v --SUBDIRS=lib ip tc bridge misc netem genl tipc man -+SUBDIRS=lib ip tc bridge misc genl tipc man +-SUBDIRS=lib ip tc bridge misc netem genl tipc devlink man ++SUBDIRS=lib ip tc bridge misc genl tipc devlink man LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a LDLIBS += $(LIBNETLINK) diff --git a/package/network/utils/iproute2/patches/010-type_fixes.patch b/package/network/utils/iproute2/patches/010-type_fixes.patch deleted file mode 100644 index e0055fce71..00 --- a/package/network/utils/iproute2/patches/010-type_fixes.patch +++ /dev/null @@ -1,396 +0,0 @@ a/include/iptables_common.h -+++ b/include/iptables_common.h -@@ -2,6 +2,8 @@ - #define _IPTABLES_C
Re: [LEDE-DEV] [PATCH] iproute2: fix ip monitor can't work when NET_NS is not enabled
>>>>> "Yousong" == Yousong Zhou writes: Florian> On 03/17/2017 09:51 PM, Yousong Zhou wrote: >>>> The bug appeared in v4.1.0 and was fixed since v4.8.0 >>>> >>>> Fixes FS#620 >>>> >>>> Signed-off-by: Yousong Zhou Florian> Is there a reason not to upgrade to a newer iproute2 then? Florian> Maybe not for the 17.01 branch but for the master branch would Florian> not that be preferred? -- Florian >> There are some unresolved (at least I haven't resolved them) UAPI >> problems. I have taken a few runs at it, thus far unsuccessful. Any >> help on that would be welcome. Yousong> Fixing the issue at hand was my intention. Yousong> To be honest, I did not think much about bumping the version ;) Yousong> but can you elaborate what's the UAPI issue with that? This is the build log from my last run at the problem: http://sprunge.us/ceIL It was a build for alix2 on the 4.9 kernel using iproute2-4.10, with updated patches. -- Russell Senior russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] iproute2: fix ip monitor can't work when NET_NS is not enabled
>>>>> "Florian" == Florian Fainelli writes: Florian> On 03/17/2017 09:51 PM, Yousong Zhou wrote: >> The bug appeared in v4.1.0 and was fixed since v4.8.0 >> >> Fixes FS#620 >> >> Signed-off-by: Yousong Zhou Florian> Is there a reason not to upgrade to a newer iproute2 then? Florian> Maybe not for the 17.01 branch but for the master branch would Florian> not that be preferred? -- Florian There are some unresolved (at least I haven't resolved them) UAPI problems. I have taken a few runs at it, thus far unsuccessful. Any help on that would be welcome. -- Russell Senior russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] LEDE v17.01.0 schedule adjusted
>>>>> "David" == David Woodhouse writes: David> On Wed, 2017-02-15 at 14:03 -0800, Russell Senior wrote: >> >> I just tried r3499 (master branch), and it works too, David> Nice. Do you want to reinstate the default configuration for it, David> which was removed in commit 9e0759ea2? See how I've just done it David> for Geos. Wha t is in /tmp/sysinfo/board_name? There is no /tmp/sysinfo on my test alix. Furthermore, it seems to be populated from target/linux/x86/base-files/lib/preinit/20_sysinfo, which asks files in /sys/devices/virtual/dmi/id/, but my alix doesn't have a /sys/devices/virtual/dmi, either, which probably explains the former. David> You can configure the baud rate in the Alix2 BIOS, can't you? I suppose I could, but I have 20-odd of these in the field, which makes that route a bit tedious. Or I could override it in my build .config stub. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] LEDE v17.01.0 schedule adjusted
>>>>> "Russell" == Russell Senior writes: >>>>> "Russell" == Russell Senior writes: >>>>> "David" == David Woodhouse writes: David> On Wed, 2017-02-15 at 12:52 -0800, Russell Senior wrote: >>>> I last built on February 1, circa r3226, and that works. David> But not with an out-of-the-box configuration anyway, right? Russell> Pretty much. This was my .config stub: Russell> CONFIG_TARGET_x86=y CONFIG_TARGET_x86_geode=y CONFIG_DEVEL=y Russell> CONFIG_BUILD_LOG=y Also, tried 17.01-SNAPSHOT, r3180-dbb8e04472 it "works" too, afaict. No stack trace, which I assume is related to the 4.9.x kernel in master, somehow. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] LEDE v17.01.0 schedule adjusted
>>>>> "Russell" == Russell Senior writes: >>>>> "David" == David Woodhouse writes: David> On Wed, 2017-02-15 at 12:52 -0800, Russell Senior wrote: >>> I last built on February 1, circa r3226, and that works. David> But not with an out-of-the-box configuration anyway, right? Russell> Pretty much. This was my .config stub: Russell> CONFIG_TARGET_x86=y CONFIG_TARGET_x86_geode=y CONFIG_DEVEL=y Russell> CONFIG_BUILD_LOG=y I just tried r3499 (master branch), and it works too, although I do see this stack trace during boot: [...] [ 10.578574] kmodloader: loading kernel modules from /etc/modules.d/* [ 10.600627] [ cut here ] [ 10.614641] WARNING: CPU: 0 PID: 674 at drivers/base/dd.c:344 driver_probe_device+0x58/0x1a5 [ 10.640008] Modules linked in: geode_aes(+) cbc button_hotplug aead cryptomgr crypto_null [ 10.665186] CPU: 0 PID: 674 Comm: kmodloader Not tainted 4.9.8 #0 [ 10.683549] c102aed4 0158 0009 cf8d1064 d0884794 0001 d0884794 [ 10.707317] c102af54 0009 c11988e7 cf8d1064 d0884794 cf8d1098 [ 10.731207] c13f5a00 c1198a89 d0884794 c11977f3 cf81ea0c cf9077b0 [ 10.755074] Call Trace: [ 10.762538] [] ? __warn+0xa9/0xc0 [ 10.775470] [] ? warn_slowpath_null+0xf/0x13 [ 10.791246] [] ? driver_probe_device+0x58/0x1a5 [ 10.807742] [] ? __driver_attach+0x55/0x70 [ 10.823014] [] ? bus_for_each_dev+0x47/0x63 [ 10.838547] [] ? driver_attach+0x11/0x13 [ 10.853314] [] ? driver_probe_device+0x1a5/0x1a5 [ 10.870084] [] ? bus_add_driver+0xa7/0x17f [ 10.885353] [] ? 0xd0886000 [ 10.896710] [] ? driver_register+0x6c/0x9d [ 10.911921] [] ? do_one_initcall+0x85/0x110 [ 10.927447] [] ? call_usermodehelper_exec+0xc5/0xd0 [ 10.945058] [] ? free_vmap_area_noflush+0x26/0x63 [ 10.962170] [] ? kmem_cache_alloc+0x58/0x7c [ 10.977650] [] ? do_init_module+0x42/0x18d [ 10.992925] [] ? load_module+0x12a1/0x161f [ 11.008186] [] ? SyS_init_module+0x8c/0xa3 [ 11.023392] [] ? do_fast_syscall_32+0x83/0xe1 [ 11.039475] [] ? sysenter_past_esp+0x47/0x75 [ 11.055232] ---[ end trace fd70a030d2f480e5 ]--- [ 11.069901] Geode LX AES :00:01.2: GEODE AES engine enabled. [...] -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] LEDE v17.01.0 schedule adjusted
>>>>> "David" == David Woodhouse writes: David> On Wed, 2017-02-15 at 12:52 -0800, Russell Senior wrote: >> I last built on February 1, circa r3226, and that works. David> But not with an out-of-the-box configuration anyway, right? Pretty much. This was my .config stub: CONFIG_TARGET_x86=y CONFIG_TARGET_x86_geode=y CONFIG_DEVEL=y CONFIG_BUILD_LOG=y -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] LEDE v17.01.0 schedule adjusted
>>>>> "David" == David Woodhouse writes: David> On Wed, 2017-02-15 at 12:24 -0800, Russell Senior wrote: >> >> David> In the same PR#840: >> David> b5bec324fb6eecc483e093a231d7d3fc050bf344 x86: Set default baud David> rate on Geode images to 115200 >> >> The alix2 (also a Geode) uses 38400 in the BIOS. David> Hm. The Geos uses 115200 in the BIOS. Does the alix2 actually David> work? David> It looks like via-rhine Ethernet support was dropped when the David> Geode subtargets were merged, and never added back again until I David> did it today. Which means that the default images won't work for David> alix2 anyway, right? They do for Geos... I last built on February 1, circa r3226, and that works. David> The three Geode-based targets that got merged all had *different* David> default baud rates. We just need to pick one, and picking the one David> that's default on most boards, most useful, and matches the board David> that is actively (if sporadically) being maintained does seem David> like it's not the worst idea... I've only ever seen the alix, so I'm biased. ;-) -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] LEDE v17.01.0 schedule adjusted
>>>>> "David" == David Woodhouse writes: David> On Wed, 2017-02-15 at 17:14 +, David Woodhouse wrote: >> I'd like to change the default serial baud rate to 115200 too... will >> do that shortly. David> In the same PR#840: David> b5bec324fb6eecc483e093a231d7d3fc050bf344 x86: Set default baud David> rate on Geode images to 115200 The alix2 (also a Geode) uses 38400 in the BIOS. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] [OpenWrt-Users] Talks between OpenWrt and LEDE
>>>>> "John" == John Crispin writes: >> IMHO if you want to add "freshness" and still leverage the old brand >> you do something like, e.g., Pepsi Zero. You do "The OpenWRT LEDE >> Edition!". >> >> Just a thought. >> John> certainly an interesting idea worth considering. FWIW, when our CWN was considering a rebranding (we still are, on the back burner), the advice we got was to phase in name changes over time scales of a year or so, with co-branding during the transition, very gradually increasing emphasis on the new name and decreasing emphasis on the old name. All names have upsides and downsides. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] Talks between OpenWrt and LEDE
>>>>> "Val" == Val Kulkov writes: >> Not that a choice on a name, with taste and discretion, isn't going >> to be needed, but I can't help but think of this: >> >> https://en.wikipedia.org/wiki/Law_of_triviality >> >> >> PS: OpenLEDE. ;-) Val> Now, please try to explain how to pronounce OpenLEDE and make sure Val> the correct pronunciation sticks :-) It doesn't matter how they pronounce it, as long as they can find the IRC channel ;-) -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] Talks between OpenWrt and LEDE
>>>>> "Florian" == Florian Fainelli writes: >> However, I also agree with Dave, Alberto and Stefan that a name >> change may be a really smart way to communicate the fresh start of >> the project, a reboot, especially if the new name rides on the >> popularity of "OpenWRT". It could be for example "OpenLD" (LD for >> Linux Device) or "LibreWRT". Of course this is all conditional on the >> merge of OpenWRT and LEDE. If the projects do not merge, the OpenWRT >> folks and SPI may have a claim against the use of OpenLD or LibreWRT >> or alike. Florian> The point was that OpenWrt is already registered and managed by Florian> SPI, so we may as well keep using it, and that is just what I Florian> meant to say here, nothing more. -- Florian Not that a choice on a name, with taste and discretion, isn't going to be needed, but I can't help but think of this: https://en.wikipedia.org/wiki/Law_of_triviality PS: OpenLEDE. ;-) -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] FCC killing open platforms and inovations
>>>>> "Simon" == Simon Wunderlich writes: Simon> You are right, the FCC doesn't explicitly requires to prevent Simon> third-party firmware loading anymore. However, they still require Simon> to explain how a vendor makes sure that US RF limits are not Simon> violated [1]. Since a third-party firmware can be anything Simon> including a firmware with a patched ath9k where DFS is disabled Simon> etc, we (as Open-Mesh) can't really prevent that those RF limits Simon> are violated. Thus we can not give a convincing explanation Simon> there, and the situation stays the same. Simon> If you have any constructive idea, I would love to propose it Simon> internally. Am I correct that since all 802.11ac radios (such as those supported by ath10k, etc) require firmware blobs, that solves the FCC problem? It is only the 100 million existing already-sold devices that will still be able to interfere with the radars? ;-) -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] How do you develop (compile) LEDE efficiently?
>>>>> "Rafał" == Rafał Miłecki writes: Rafał> On 7 November 2016 at 00:40, Russell Senior wrote: >> I have a 16-core build box which I connect to over ssh. I use scp to >> move images to devices. I have a testbed with ethernet connections >> to the build box and serial consoles on most if not all of them. Rafał> But what about development with modifying files in build_dir? Rafał> That's the most tricky part for me. I ssh into the build machine and use whatever my favorite editor of the moment is (vi or emancs) and modify files. I don't understand the problem. I've even been known to load emacs with X11 over a dialup connection with ssh X forwarding (20 years ago). It took a while to start up, but was generally pretty responsive once started. In an environment with flakey network, that could be painful. GNU screen and persistent/reconnectable screen sessions on the build machine can help smooth things out. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] How do you develop (compile) LEDE efficiently?
>>>>> "Rafał" == Rafał Miłecki writes: Rafał> Hey, So far I was always using my notebook for the Rafał> development. My requirements were Intel i7 quad core + AMD GPU. I Rafał> was using some Samsung but it's GPU has died and I can't replace Rafał> it (stupid 216-0811000 chipset). Rafał> I'm looking for a new notebook, but I can't find anything with i7 Rafał> quad core + AMD GPU. I may need to buy something with i7-6500U or Rafał> i7-7500U which may be too slow for compiling LEDE. Rafał> How do you develop LEDE? Do you work on some powerful machine, or Rafał> do you compile it remotely somehow? If you do it remotely, do you Rafał> mount remote filesystem? I need a very good access to the Rafał> build_dir for my needs. I have a 16-core build box which I connect to over ssh. I use scp to move images to devices. I have a testbed with ethernet connections to the build box and serial consoles on most if not all of them. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] replacing files in base system from a package?
>>>>> "Karl" == Karl Palsson writes: Karl> What's the "new" way of doing this? In the past, in OpenWrt CC and Karl> before, a package could install files like /etc/banner and Karl> /etc/inittab that were provided by the base-files package. It was Karl> always listed as "unreliable" as apparently you couldn't rely on Karl> the order. In practice it actually worked just fine. Fwiw, I ran into trouble with things busybox provides by default, but where I've add packages with fuller versions. In my case it is procps-ng from the packages feed. In order to stop it complaining, I need to de-select the conflicting busybox options. What I've done instead, locally, is just revert this commit: 021b96d7c5c668fbcb5375c65cee90832bb2854f Hopefully, nothing significant breaks as a result. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC 7/7] ramips: set blocksize for dch-m225/dir-860l-b1
> Signed-off-by: Mathias Kresin > --- > target/linux/ramips/image/mt7620.mk | 6 -- > target/linux/ramips/image/mt7621.mk | 6 -- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/target/linux/ramips/image/mt7620.mk > b/target/linux/ramips/image/mt7620.mk > index 00dd4f2..1df806b 100644 > --- a/target/linux/ramips/image/mt7620.mk > +++ b/target/linux/ramips/image/mt7620.mk > @@ -422,14 +422,16 @@ TARGET_DEVICES += tiny-ac > dch_m225_mtd_size=7012352 > define Device/dch-m225 >DTS := DCH-M225 > + BLOCKSIZE := 4k >IMAGES += factory.bin >IMAGE_SIZE := $(dch_m225_mtd_size) >IMAGE/sysupgrade.bin := \ > - append-kernel | pad-offset 65536 64 | append-rootfs | \ > + append-kernel | pad-offset (BLOCKSIZE) 64 | append-rootfs | \ > seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \ > pad-rootfs | check-size (IMAGE_SIZE) >IMAGE/factory.bin := \ > - append-kernel | pad-offset 65536 64 | append-rootfs | pad-rootfs -x 64 > | \ > + append-kernel | pad-offset (BLOCKSIZE) 64 | \ > + append-rootfs | pad-rootfs -x 64 | \ > seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \ > seama-seal -m "signature=wapn22_dlink.2013gui_dap1320b" | \ > check-size (IMAGE_SIZE) > diff --git a/target/linux/ramips/image/mt7621.mk > b/target/linux/ramips/image/mt7621.mk > index e602dfb..acc17c3 100644 > --- a/target/linux/ramips/image/mt7621.mk > +++ b/target/linux/ramips/image/mt7621.mk > @@ -65,15 +65,17 @@ TARGET_DEVICES += wsr-1166 > > define Device/dir-860l-b1 >DTS := DIR-860L-B1 > + BLOCKSIZE := 4k >IMAGES += factory.bin >KERNEL := kernel-bin | patch-dtb | relocate-kernel | lzma | uImage lzma >IMAGE_SIZE := $(ralink_default_fw_size_16M) >IMAGE/sysupgrade.bin := \ > - append-kernel | pad-offset 65536 64 | append-rootfs | \ > + append-kernel | pad-offset (BLOCKSIZE) 64 | append-rootfs | \ > seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \ > pad-rootfs | check-size (IMAGE_SIZE) >IMAGE/factory.bin := \ > - append-kernel | pad-offset 65536 64 | append-rootfs | pad-rootfs -x 64 > | \ > + append-kernel | pad-offset (BLOCKSIZE) 64 | \ > + append-rootfs | pad-rootfs -x 64 | \ > seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \ > seama-seal -m "signature=wrgac13_dlink.2013gui_dir860lb" | \ > check-size (IMAGE_SIZE) > -- > 2.7.4 This patch broke dir-860l-b1. Changing BLOCKSIZE for dir-860l-b1 to 64k makes it work again. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Documentation for router support means the famous Table of Hardware
>>>>> "Jan-Tarek" == Jan-Tarek Butt writes: Jan-Tarek> Also I wish we can establish a reviewing and applying Jan-Tarek> process. But I dont know how we can resolv this inside a Jan-Tarek> wiki The traditional wiki approach is to let people make edits freely and to revert bad changes. That way, general progress isn't held up by overloaded reviewers. Again, see the history of Nupedia. "Before it ceased operating, Nupedia produced 25 approved articles" In contrast, in the first year, Wikipedia produced 18,000 articles. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Documentation for router support means the famous Table of Hardware
>>>>> "Eric" == Eric Schultz writes: Eric> I think the idea of having the hardware support documentation Eric> managed by experts is a good idea. Non-experts can, and should, Eric> have plenty of areas to contribute but I don't see this area as Eric> one of them. I want to push back on this a little bit. Jimmy Wales had similar ideas, once upon a time (see https://en.wikipedia.org/wiki/Nupedia), and he was proven wrong, empirically. The beauty of wikis is that people are empowered to contribute what they know. Without that empowerment, the vehicles for sharing what they know is much more scattered and diffused. Yes, wikis are a shit storm of inconsistency. If people want more consistency what is really needed is people to garden the manure into neat rows. I can't begin to count the vast utility I have derived from the steaming heaps of barely coherent crap that has been dumped into OpenWrt wiki. If you close that vehicle off, what you will end up with is a whole lot of nothing, which I argue is vastly worse. If you want something that's pretty, hire someone to watch RecentChanges and clean stuff up. If the experts had the time and raw information to do it, we wouldn't be talking about this. The reality is that they don't. I argue for letting the rabble continue to contribute as they can. If you don't like what it looks like, that discomfort is trying to tell you what to do next: click the edit button and make it better. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] lede forum
>>>>> "Rich" == Rich Brown writes: Rich> Another thought: I strongly recommend that any forum software we Rich> choose support Markdown. BBcode was astonishing in the last 90's Rich> when it first came out. But requiring BBcode to to make decent Rich> formatting for messages is a big disincentive 15 years later. The most frustrating thing I find about forums is the need for all the clicking. Being able to load an entire thread in one page (instead of 10 or whatever posts per page) so that my browser can search for keywords would be a big plus. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] DHCP via bridge in case of IPv4
>>>>> "Alexey" == Alexey Brodkin writes: Alexey> Hi Aaron, Alexey> On Sat, 2016-07-09 at 07:47 -0400, Aaron Z wrote: >> On Sat, Jul 9, 2016 at 4:37 AM, Alexey Brodkin >> wrote: >> > >> > Hello, >> > >> > I was playing with quite simple bridged setup on different boards >> with > very recent kernels (4.6.3 as of this writing) and found one >> interesting > behavior that I cannot yet understand and googling >> din't help here as well. >> > >> > My setup is pretty simple: > >> - -- - >> > > >> > > HOST | | "Dumb AP" | | Wireless >> client | > > with DHCP |<->(eth0) (wlan0)<->| >> attempting to | > > server| |\ br0 >> / | | get settings via DHCP | > >> - -- - >> > >> > * HOST is my laptop with DHCP server that works for sure. > * >> "Dumb AP" is a separate board (I tried ARM-based Wandboard and >> ARC-based > AXS10x boards but results are exactly the same) with >> wired (eth0) and wireless > (wlan0) network controllers bridged >> together (br0). That "br0" bridge flawlessly > gets its settings >> from DHCP server on host. > * Wireless client could be either a >> smatrphone or another laptop etc but > what's important it should >> be configured to get network settings by DHCP as well. >> > >> > So what happens "br0" always gets network settings from DHCP server >> on HOST. > That's fine. But wireless client only reliably gets >> settings from DHCP server > if IPv6 is enabled on "Dumb AP" board. If >> IPv6 is disabled I may see that > wireless client sends "DHCP >> Discover" then server replies with "DHCP Offer" but > that offer >> never reaches wireless client. >> >> >> Do you have WDS enabled? If not, DHCP has issues in that scenario: >> https://wiki.openwrt.org/doc/howto/clientmode If the Dumb AP's wireless interface is in ap-mode, then this shouldn't be an issue. It's only client-mode interfaces that have trouble with bridging. I'd suggest running tcpdump on the Dumb AP's wireless interface and the client's wireless interface and see which of them sees the various parts of the DHCP handshake. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] portal wifi router
>>>>> "David" == David Lang writes: David> unfocused power drops off at the cube of the distance, [...] That should be square of the distance. And that applies to anything with an antenna. It all diverges, for practical purposes. About 6 dB loss for every doubling of the distance. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCHv3 2/2] x86: generalize partition discovery for sysupgrade
adds support for mmc on apu2 also adds /usr/bin/find to the ramdisk during flashing. find is busybox, so the space consequences should be tiny. Signed-off-by: Russell Senior --- package/base-files/files/lib/upgrade/common.sh | 1 + .../x86/base-files/lib/preinit/79_move_config | 6 +- .../linux/x86/base-files/lib/upgrade/platform.sh | 68 +++--- 3 files changed, 52 insertions(+), 23 deletions(-) diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 0383d25..08f7d43 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -55,6 +55,7 @@ run_ramfs() { # [...] /bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir \ /bin/rm /usr/bin/basename /bin/kill /bin/chmod + install_bin /usr/bin/find install_bin /bin/uclient-fetch /bin/wget install_bin /sbin/mtd install_bin /sbin/mount_root diff --git a/target/linux/x86/base-files/lib/preinit/79_move_config b/target/linux/x86/base-files/lib/preinit/79_move_config index 1d4873d..00d1cb5 100644 --- a/target/linux/x86/base-files/lib/preinit/79_move_config +++ b/target/linux/x86/base-files/lib/preinit/79_move_config @@ -4,8 +4,10 @@ move_config() { . /lib/upgrade/platform.sh - if platform_export_bootpart; then - mount -t ext4 -o rw,noatime "$BOOTPART" /mnt + if platform_export_bootdev; then + local bootpart="/dev/$(platform_devname_by_partnum 1)" + + mount -t ext4 -o rw,noatime "$bootpart" /mnt mv -f /mnt/sysupgrade.tgz / umount /mnt fi diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh index 29eac77..8b6598f 100644 --- a/target/linux/x86/base-files/lib/upgrade/platform.sh +++ b/target/linux/x86/base-files/lib/upgrade/platform.sh @@ -1,5 +1,20 @@ -platform_export_bootpart() { +platform_devname_by_partnum() { + local uevent + local MAJOR MINOR DEVNAME DEVTYPE + local offset="$1" + for uevent in /sys/class/block/*/uevent; do +. "$uevent" +if [ $BOOTDEV_MAJOR = $MAJOR -a $((BOOTDEV_MINOR + $offset)) = $MINOR ]; then +echo "$DEVNAME" +break +fi +done +} + +platform_export_bootdev() { local cmdline uuid disk + local uevent + local MAJOR MINOR DEVNAME DEVTYPE if read cmdline < /proc/cmdline; then case "$cmdline" in @@ -17,20 +32,25 @@ platform_export_bootpart() { PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02) uuid="${disk#PARTUUID=}" uuid="${uuid%-02}" - for disk in /dev/*; do - [ -b "$disk" ] || continue + for disk in $(find /dev -type b); do set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "') if [ "$4$3$2$1" = "$uuid" ]; then - export BOOTPART="${disk}1" - return 0 + uevent="/sys/class/block/${disk##*/}/uevent" + break fi done ;; /dev/*) - export BOOTPART="${disk%[0-9]}1" - return 0 + uevent="/sys/class/block/${disk##*/}/uevent" ;; esac + + if [ -e "$uevent" ]; then + . "$uevent" + export BOOTDEV_MAJOR=$MAJOR + export BOOTDEV_MINOR=$MINOR + return 0 + fi fi return 1 @@ -49,8 +69,10 @@ platform_check_image() { } platform_copy_config() { - if [ -b "$BOOTPART" ]; then - mount -t ext4 -o rw,noatime "$BOOTPART" /mnt + local bootpart="/dev/$(platform_devname_by_partnum 1)" + + if [ -b "$bootpart" ]; then + mount -t ext4 -o rw,noatime "$bootpart" /mnt cp -af "$CONF_TAR" /mnt/ umount /mnt fi @@ -87,18 +109,21 @@ get_partitions() { # } platform_do_upgrade() { - platform
Re: [LEDE-DEV] [PATCHv2 2/2] x86: accomodate mmc devices in sysupgrade for apu2
also adds /usr/bin/find to the ramdisk during flashing. find is busybox, so the space consequences should be tiny. Signed-off-by: Russell Senior --- package/base-files/files/lib/upgrade/common.sh | 1 + target/linux/x86/base-files/lib/upgrade/platform.sh | 16 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 0383d25..08f7d43 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -55,6 +55,7 @@ run_ramfs() { # [...] /bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir \ /bin/rm /usr/bin/basename /bin/kill /bin/chmod + install_bin /usr/bin/find install_bin /bin/uclient-fetch /bin/wget install_bin /sbin/mtd install_bin /sbin/mount_root diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh index 29eac77..12c7340 100644 --- a/target/linux/x86/base-files/lib/upgrade/platform.sh +++ b/target/linux/x86/base-files/lib/upgrade/platform.sh @@ -17,11 +17,15 @@ platform_export_bootpart() { PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02) uuid="${disk#PARTUUID=}" uuid="${uuid%-02}" - for disk in /dev/*; do - [ -b "$disk" ] || continue + for disk in $(find /dev -type b); do set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "') if [ "$4$3$2$1" = "$uuid" ]; then - export BOOTPART="${disk}1" + if echo $disk | grep -q mmc ; then + export partdelim="p" + else + export partdelim="" + fi + export BOOTPART="${disk}${partdelim}1" return 0 fi done @@ -88,7 +92,7 @@ get_partitions() { # platform_do_upgrade() { platform_export_bootpart - disk="${BOOTPART%[0-9]}" + disk="${BOOTPART%${partdelim}[0-9]}" if [ -b "$disk" ]; then sync @@ -120,8 +124,8 @@ platform_do_upgrade() { #iterate over each partition from the image and write it to the boot disk while read part start size; do - echo "Writing image to $disk$part..." - get_image "$@" | dd of="$disk$part" ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync + echo "Writing image to ${disk}${partdelim}${part}..." + get_image "$@" | dd of="${disk}${partdelim}${part}" ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync done < /tmp/partmap.image #copy partition uuid -- 2.8.2 -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 2/2] x86: fix sysupgrade to work on mmcblk
Oops, broken. Please wait for v2. run testing++ -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 2/2] x86: fix sysupgrade to work on mmcblk
Reworks block device detection slightly and accomodates the different partition naming scheme, e.g. mmcblk0p1 vs sda1 Signed-off-by: Russell Senior --- target/linux/x86/base-files/lib/upgrade/platform.sh | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh index 29eac77..04508b7 100644 --- a/target/linux/x86/base-files/lib/upgrade/platform.sh +++ b/target/linux/x86/base-files/lib/upgrade/platform.sh @@ -17,11 +17,14 @@ platform_export_bootpart() { PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02) uuid="${disk#PARTUUID=}" uuid="${uuid%-02}" - for disk in /dev/*; do - [ -b "$disk" ] || continue + for disk in $(find /dev -type b); do set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "') if [ "$4$3$2$1" = "$uuid" ]; then - export BOOTPART="${disk}1" + if echo $disk | grep -q mmc - ; then + export BOOTPART="${disk}p1 + else + export BOOTPART="${disk}1" + fi return 0 fi done -- 2.8.2 -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 1/2] x86_64: enable mmc to support booting off sd
Improved support for PCEngines APU Signed-off-by: Russell Senior --- target/linux/x86/64/config-default | 8 1 file changed, 8 insertions(+) diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default index 8b62b86..89a8a4c 100644 --- a/target/linux/x86/64/config-default +++ b/target/linux/x86/64/config-default @@ -141,6 +141,14 @@ CONFIG_MEMORY_BALLOON=y # CONFIG_MEMORY_HOTPLUG is not set CONFIG_MFD_CORE=y # CONFIG_MFD_INTEL_LPSS_ACPI is not set +CONFIG_MMC=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PCI=y +# CONFIG_MMC_SDHCI_PLTFM is not set +# CONFIG_MMC_TIFM_SD is not set +# CONFIG_MMC_WBSD is not set CONFIG_MODULES_USE_ELF_RELA=y # CONFIG_MPSC is not set CONFIG_MUTEX_SPIN_ON_OWNER=y -- 2.8.2 -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH RFC 2/2] x86: lift generic x86-32 target
I built an openwrt image for apu2 back in March. It mostly just worked, with some minor tweaks for running off of mmc, This was my patch then, relative to r49096. diff --git a/target/linux/x86/config-4.4 b/target/linux/x86/config-4.4 index 5b54031..e323fa6 100644 --- a/target/linux/x86/config-4.4 +++ b/target/linux/x86/config-4.4 @@ -270,6 +270,14 @@ CONFIG_M486=y # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set +CONFIG_MMC=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PCI=y +# CONFIG_MMC_SDHCI_PLTFM is not set +# CONFIG_MMC_TIFM_SD is not set +# CONFIG_MMC_WBSD is not set # CONFIG_MODIFY_LDT_SYSCALL is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_MODULES_USE_ELF_REL=y On Wed, May 18, 2016 at 4:17 PM, Stijn Tintel wrote: > On 17-05-16 23:37, Felix Fietkau wrote: >> On 2016-05-17 23:12, Daniel Golle wrote: >>> * build for pentium4 instead of i486 >>> * enable PAE >>> * enable EFI support >>> * enable KVM guest and host support > Is anyone running KVM on a 32bit host? I would leave out KVM host > support here. >> I like this change, but I think I'll wait a bit before applying it to >> see if anybody else has some comments about it. >> > I too think x86 and subtargets need some love, but let's not rush > things. Maybe now is a good time to discus other things related to x86 > as well. > > E.g., a while ago I created a profile for x86/64 for the PCEngines APU2, > but never submitted it, so I put it at [1] now. Last year, on > OpenWrt-Devel, Felix suggested [2] instead. I would like to hear others' > opinions about this too. > > And if any else has other ideas... Looking forward to hear them. > > Stijn > > [1] > https://git.lede-project.org/?p=lede/stintel/staging.git;a=shortlog;h=refs/heads/apu2 > [2] > https://lists.openwrt.org/pipermail/openwrt-devel/2015-November/037035.html > > > > ___ > 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 http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH RFC 2/2] x86: lift generic x86-32 target
>>>>> Felix Fietkau writes: > On 2016-05-17 23:12, Daniel Golle wrote: >> * build for pentium4 instead of i486 * enable PAE * enable EFI >> support * enable KVM guest and host support > I like this change, but I think I'll wait a bit before applying it to > see if anybody else has some comments about it. I have some Soekris net45xx and net48xx boards, did I gather correctly that these would be supported by x86-legacy? Also alix, supported by x86-geode? -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] ath25: update kernel from 3.18 to 4.4
; eth0: Atheros AR231x: 00:12:cf:83:7b:08, irq 4 libphy: ar231x_eth_mii: probed eth0: attached PHY driver [Generic PHY] (mii_bus:phy_addr=0:00) -TCP: cubic registered NET: Registered protocol family 10 NET: Registered protocol family 17 bridge: automatic filtering via arp/ip/ip6tables has been deprecated. Update your scripts to load br_netfilter if you need this. 8021q: 802.1Q VLAN Support v1.8 VFS: Mounted root (squashfs filesystem) readonly on device 31:2. -Freeing unused kernel memory: 136K (8038e000 - 803b) +Freeing unused kernel memory: 148K (803ab000 - 803d) eth0: Configuring MAC for full duplex init: Console is alive init: - watchdog - init: - preinit - ey and hit [enter] to enter failsafe mode [2], [3] or [4] key and hit [enter] to select the debug level -jffs2: notice: (216) jffs2_build_xattr_subsystem: complete building xattr subsystem, 0 of xdatum (0 unchecked, 0 orphan) and 0 of xref (0 dead, 0 orphan) found. +jffs2: notice: (274) jffs2_build_xattr_subsystem: complete building xattr subsystem, 0 of xdatum (0 unchecked, 0 orphan) and 0 of xref (0 dead, 0 orphan) found. mount_root: switching to jffs2 overlay procd: - early - procd: - watchdog - -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] iftop: Update to latest version, and drop patch
>>>>> Bert Vermeulen writes: > The patch made sure the ncursesw library was not selected to save > space, but that library doesn't exist in this distribution at all. This commit message is wrong. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] BUG: gcc build failure of lede-project HEAD for ath25
> Building lede-project HEAD, i.e.: > >$ git describe >reboot-98-g5b64e35 Fixed as of reboot-102-g91f205a. Thanks Matthias! -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] BUG: gcc build failure of lede-project HEAD for ath25
_mips32_gcc-5.3.0_musl-1.1.14/gcc-5.3.0-final' Makefile:77: recipe for target '/home/openwrt/src/lede/build_dir/toolchain-mips_mips32_gcc-5.3.0_musl-1.1.14/gcc-5.3.0-final/.built' failed make[3]: *** [/home/openwrt/src/lede/build_dir/toolchain-mips_mips32_gcc-5.3.0_musl-1.1.14/gcc-5.3.0-final/.built] Error 2 make[3]: Leaving directory '/home/openwrt/src/lede/toolchain/gcc/final' -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] iftop: Update to latest version, and drop patch
>>>>> "Bert" == Bert Vermeulen writes: Bert> On 05/07/2016 12:46 PM, Felix Fietkau wrote: >> On 2016-05-07 12:40, Bert Vermeulen wrote: >>> On 05/07/2016 12:01 PM, Felix Fietkau wrote: >>>> We should probably just move everything to libncursesw and drop >>>> libncurses entirely. >>> >>> Actually I'd gotten this wrong: libncursesw is an extra build option >>> to libncurses, so you only get it if you explicitly want it. In that >>> case though, you specifically DO want your applications to use >>> ncursesw instead of regular ncurses. >> It's a build variant, meaning both can be built and staged at the >> same time. >> >>> So regardless of whether you keep libncurses around or not, I think >>> patches preferring one or the other should be dropped, right? >> What the package ends up using absolutely needs to match the >> dependencies that the package specifies (otherwise you get a build >> error). Allowing the package source build system to simply pick one >> will result in very quirky behavior. Bert> Ok, so will you drop regular libncurses? Or do you need me to Bert> submit a patch to do it? In this particular case, as the author of the patch involved, I would suggest "if it isn't broken, don't fix it". That is, iftop doesn't really need ncursesw, the patch lets it use plain ncurses even if ncursesw is available. I don't see the problem leaving things like that. It means carrying a small patch. Seems like not that big a problem. -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] iftop: Update to latest version, and drop patch
>>>>> "John" == John Crispin writes: > On 05/05/2016 15:16, Bert Vermeulen wrote: >> The patch made sure the ncursesw library was not selected to save >> space, but that library doesn't exist in this distribution at all. > are you sure that ncursesw is not inside any of the feeds either ? Hey, I recognize that patch! ;-) ncursesw does appear to still exist, e.g.: $ git grep ncursesw package/libs/ncurses/Makefile:define Package/libncursesw package/libs/ncurses/Makefile: VARIANT:=libncursesw package/libs/ncurses/Makefile:ifeq ($(BUILD_VARIANT),libncursesw) package/libs/ncurses/Makefile: --includedir="/usr/include/ncursesw" \ package/libs/ncurses/Makefile:define Package/libncursesw/install package/libs/ncurses/Makefile:ifeq ($(BUILD_VARIANT),libncursesw) package/libs/ncurses/Makefile: $(INSTALL_DIR) $(1)/usr/include/ncursesw/ package/libs/ncurses/Makefile: $(CP) $(PKG_INSTALL_DIR)/usr/include/ncursesw/*.h $(1)/usr/include/ncursesw/ package/libs/ncurses/Makefile: $(CP) $(PKG_INSTALL_DIR)/usr/bin/ncursesw5-config $(2)/bin/ package/libs/ncurses/Makefile: $(2)/bin/ncursesw5-config package/libs/ncurses/Makefile: ln -sf $(STAGING_DIR)/host/bin/ncursesw5-config $(1)/usr/bin/ncursesw5-config package/libs/ncurses/Makefile:$(eval $(call BuildPackage,libncursesw)) package/network/utils/iftop/patches/0001-force-ncurses.patch:-for curseslib in ncursesw curses ncurses ; do scripts/config/lxdialog/check-lxdialog.sh: pkg-config --libs ncursesw 2>/dev/null && exit scripts/config/lxdialog/check-lxdialog.sh: for lib in ncursesw ncurses curses ; do scripts/config/lxdialog/check-lxdialog.sh: if pkg-config --cflags ncursesw 2>/dev/null; then scripts/config/lxdialog/check-lxdialog.sh: elif [ -f /usr/include/ncursesw/curses.h ]; then scripts/config/lxdialog/check-lxdialog.sh: echo '-I/usr/include/ncursesw -DCURSES_LOC=""' -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] brcm47xx: fix wgt634u port assignment, broken since openwrt r47866
Signed-off-by: Russell Senior --- target/linux/brcm47xx/base-files/etc/board.d/01_detect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/brcm47xx/base-files/etc/board.d/01_detect b/target/linux/brcm47xx/base-files/etc/board.d/01_detect index 91ac16e..16b81d4 100755 --- a/target/linux/brcm47xx/base-files/etc/board.d/01_detect +++ b/target/linux/brcm47xx/base-files/etc/board.d/01_detect @@ -124,7 +124,7 @@ detect_by_model() { # Netgear WGT634U exception if grep -sqE 'mtd0: 000(6|a)' /proc/mtd; then ucidef_add_switch "switch0" \ - "0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "5@eth0" + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" return fi -- 2.8.2 -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: Suggestion: apply for the Linux Foundation CII program
>>>>> "JoW" == Jo-Philipp Wich writes: JoW> Dear Konstantin, thank you for the offer, I've put it on the agenda JoW> for the next meeting. JoW> Personally I'd very much like to host the wiki and mirrors at JoW> *.kernel.org. Also, consider osuosl.org, which used to host (maybe still does) kernel.org and many others. See: https://osuosl.org/communities -- Russell Senior, President russ...@personaltelco.net ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev