[PATCH v2] ramips: fix at803x patch again

2021-06-03 Thread DENG Qingfang
Commit 8222f8e1b9be overrides AR8031's PHY features, making its SFP
link status detection unavailable. To fix that, do not override it in
ramips patch.

Commit 6d4ef6792612 also moves .config_aneg to AR8035 by mistake, fix
that as well.

Reported-by: CHEN Minqiang 
Fixes: 8222f8e1b9be ("ath79: fix link mode support list on UniFi AC")
Fixes: 6d4ef6792612 ("kernel: bump 5.4 to 5.4.113")
Signed-off-by: DENG Qingfang 
---
v1 -> v2: do not override .features

 .../ramips/patches-5.10/710-at803x.patch  | 13 ++--
 .../linux/ramips/patches-5.4/991-at803x.patch | 21 ---
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/target/linux/ramips/patches-5.10/710-at803x.patch 
b/target/linux/ramips/patches-5.10/710-at803x.patch
index dab62b7607..1afc266740 100644
--- a/target/linux/ramips/patches-5.10/710-at803x.patch
+++ b/target/linux/ramips/patches-5.10/710-at803x.patch
@@ -9,8 +9,8 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: René van Dorst 
 ---
- drivers/net/phy/at803x.c | 91 
- 1 file changed, 91 insertions(+)
+ drivers/net/phy/at803x.c | 86 +++-
+ 1 file changed, 85 insertions(+), 1 deletion(-)
 
 --- a/drivers/net/phy/at803x.c
 +++ b/drivers/net/phy/at803x.c
@@ -147,3 +147,12 @@ Signed-off-by: René van Dorst 
.flags  = PHY_POLL_CABLE_TEST,
.probe  = at803x_probe,
.remove = at803x_remove,
+@@ -1119,7 +1203,7 @@ static struct phy_driver at803x_driver[]
+   .get_wol= at803x_get_wol,
+   .suspend= at803x_suspend,
+   .resume = at803x_resume,
+-  .features   = PHY_GBIT_FEATURES,
++  /* PHY_GBIT_FEATURES */
+   .read_status= at803x_read_status,
+   .aneg_done  = at803x_aneg_done,
+   .ack_interrupt  = &at803x_ack_interrupt,
diff --git a/target/linux/ramips/patches-5.4/991-at803x.patch 
b/target/linux/ramips/patches-5.4/991-at803x.patch
index 95411211b2..9148687113 100644
--- a/target/linux/ramips/patches-5.4/991-at803x.patch
+++ b/target/linux/ramips/patches-5.4/991-at803x.patch
@@ -9,8 +9,8 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: René van Dorst 
 ---
- drivers/net/phy/at803x.c | 91 
- 1 file changed, 91 insertions(+)
+ drivers/net/phy/at803x.c | 93 +++-
+ 1 file changed, 92 insertions(+), 1 deletion(-)
 
 --- a/drivers/net/phy/at803x.c
 +++ b/drivers/net/phy/at803x.c
@@ -146,11 +146,18 @@ Signed-off-by: René van Dorst 
  static struct phy_driver at803x_driver[] = {
  {
/* ATHEROS 8035 */
-@@ -461,6 +551,7 @@ static struct phy_driver at803x_driver[]
+@@ -485,12 +575,13 @@ static struct phy_driver at803x_driver[]
+   .name   = "Atheros 8031 ethernet",
+   .phy_id_mask= AT803X_PHY_ID_MASK,
+   .probe  = at803x_probe,
++  .config_aneg= at803x_config_aneg,
+   .config_init= at803x_config_init,
+   .set_wol= at803x_set_wol,
+   .get_wol= at803x_get_wol,
.suspend= at803x_suspend,
.resume = at803x_resume,
-   /* PHY_GBIT_FEATURES */
-+  .config_aneg= at803x_config_aneg,
+-  .features   = PHY_GBIT_FEATURES,
++  /* PHY_GBIT_FEATURES */
.read_status= at803x_read_status,
-   .ack_interrupt  = at803x_ack_interrupt,
-   .config_intr= at803x_config_intr,
+   .aneg_done  = at803x_aneg_done,
+   .ack_interrupt  = &at803x_ack_interrupt,
-- 
2.25.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[PATCH v2] ipq806x: fix LAN and WAN port assignments on TP-Link AD7200

2021-06-03 Thread Alex Henrie
LAN port 4 was swapped with the WAN port and the remaining three LAN
ports were numbered in reverse order from their labels on the case.

Fixes: 1a775a4fd033 ("ipq806x: add support for TP-Link Talon AD7200")
Signed-off-by: Alex Henrie 
---
v2: Explicitly assign desired port numbers.
---
 target/linux/ipq806x/base-files/etc/board.d/02_network | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network 
b/target/linux/ipq806x/base-files/etc/board.d/02_network
index abdab89857..3ed3db94fc 100644
--- a/target/linux/ipq806x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -56,7 +56,6 @@ nec,wg2600hp3)
"2:lan" "3:lan" "4:lan" "5:lan" "0@eth1" "1:wan" "6@eth0"
;;
 netgear,r7800 |\
-tplink,ad7200 |\
 tplink,c2600)
ucidef_add_switch "switch0" \
"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "6@eth1" "5:wan" 
"0@eth0"
@@ -71,6 +70,10 @@ qcom,ipq8064-db149)
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "6u@eth1" "5:wan" "0u@eth0"
;;
+tplink,ad7200)
+   ucidef_add_switch "switch0" \
+   "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "6@eth1" "1:wan" 
"0@eth0"
+   ;;
 ubnt,unifi-ac-hd)
ucidef_set_interface_lan "eth0 eth1"
;;
-- 
2.31.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[PATCH] ramips: fix at803x patch again

2021-06-03 Thread DENG Qingfang
Commit 8222f8e1b9be overrides AR8031's PHY features, making its fibre
feature unavailable. To fix that, override it again with the correct
features flag in ramips patch.

Reported-by: CHEN Minqiang 
Fixes: 8222f8e1b9be ("ath79: fix link mode support list on UniFi AC")
Signed-off-by: DENG Qingfang 
---
 .../ramips/patches-5.10/710-at803x.patch  | 13 ++--
 .../linux/ramips/patches-5.4/991-at803x.patch | 21 ---
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/target/linux/ramips/patches-5.10/710-at803x.patch 
b/target/linux/ramips/patches-5.10/710-at803x.patch
index dab62b7607..f4d92a53e1 100644
--- a/target/linux/ramips/patches-5.10/710-at803x.patch
+++ b/target/linux/ramips/patches-5.10/710-at803x.patch
@@ -9,8 +9,8 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: René van Dorst 
 ---
- drivers/net/phy/at803x.c | 91 
- 1 file changed, 91 insertions(+)
+ drivers/net/phy/at803x.c | 86 +++-
+ 1 file changed, 85 insertions(+), 1 deletion(-)
 
 --- a/drivers/net/phy/at803x.c
 +++ b/drivers/net/phy/at803x.c
@@ -147,3 +147,12 @@ Signed-off-by: René van Dorst 
.flags  = PHY_POLL_CABLE_TEST,
.probe  = at803x_probe,
.remove = at803x_remove,
+@@ -1119,7 +1203,7 @@ static struct phy_driver at803x_driver[]
+   .get_wol= at803x_get_wol,
+   .suspend= at803x_suspend,
+   .resume = at803x_resume,
+-  .features   = PHY_GBIT_FEATURES,
++  .features   = PHY_GBIT_FIBRE_FEATURES,
+   .read_status= at803x_read_status,
+   .aneg_done  = at803x_aneg_done,
+   .ack_interrupt  = &at803x_ack_interrupt,
diff --git a/target/linux/ramips/patches-5.4/991-at803x.patch 
b/target/linux/ramips/patches-5.4/991-at803x.patch
index 95411211b2..8381aa9f3f 100644
--- a/target/linux/ramips/patches-5.4/991-at803x.patch
+++ b/target/linux/ramips/patches-5.4/991-at803x.patch
@@ -9,8 +9,8 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: René van Dorst 
 ---
- drivers/net/phy/at803x.c | 91 
- 1 file changed, 91 insertions(+)
+ drivers/net/phy/at803x.c | 93 +++-
+ 1 file changed, 92 insertions(+), 1 deletion(-)
 
 --- a/drivers/net/phy/at803x.c
 +++ b/drivers/net/phy/at803x.c
@@ -146,11 +146,18 @@ Signed-off-by: René van Dorst 
  static struct phy_driver at803x_driver[] = {
  {
/* ATHEROS 8035 */
-@@ -461,6 +551,7 @@ static struct phy_driver at803x_driver[]
+@@ -485,12 +575,13 @@ static struct phy_driver at803x_driver[]
+   .name   = "Atheros 8031 ethernet",
+   .phy_id_mask= AT803X_PHY_ID_MASK,
+   .probe  = at803x_probe,
++  .config_aneg= at803x_config_aneg,
+   .config_init= at803x_config_init,
+   .set_wol= at803x_set_wol,
+   .get_wol= at803x_get_wol,
.suspend= at803x_suspend,
.resume = at803x_resume,
-   /* PHY_GBIT_FEATURES */
-+  .config_aneg= at803x_config_aneg,
+-  .features   = PHY_GBIT_FEATURES,
++  .features   = PHY_GBIT_FIBRE_FEATURES,
.read_status= at803x_read_status,
-   .ack_interrupt  = at803x_ack_interrupt,
-   .config_intr= at803x_config_intr,
+   .aneg_done  = at803x_aneg_done,
+   .ack_interrupt  = &at803x_ack_interrupt,
-- 
2.25.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Does blockd intentionally skip mounts if device name exists in / ?

2021-06-03 Thread David Adair via openwrt-devel
The sender domain has a DMARC Reject/Quarantine policy which disallows
sending mailing list messages using the original "From" header.

To mitigate this problem, the original message has been wrapped
automatically by the mailing list software.--- Begin Message ---
This will block autofs from mounting volumes with names like "home" or "usr" -- 
was that
actually the intent ?

root@OpenWrt:/# touch /cv
root@OpenWrt:/# ls /mnt/cv
ls: /mnt/cv: No such file or directory
root@OpenWrt:/# rm /cv
root@OpenWrt:/# ls /mnt/cv
[  205.014819] EXT4-fs (dm-3): mounted filesystem with ordered data mode. Opts: 
hi  keepme  lost+found  tt

root@OpenWrt:~# cat /proc/2520/cmdline && echo -n " " && ls -l /proc/2520/cwd
/sbin/blockd lrwxrwxrwx1 root root 0 Jun  3 00:01 
/proc/2520/cwd -> /

Blockd does not forward mount request to block because of the lstat:

ULOG_ERR("kernel is requesting a mount -> %s\n", pkt->name);
if (lstat(pkt->name, &st) == -1)
if (block("autofs", "add", (char *)pkt->name))
cmd = AUTOFS_IOC_FAIL;

It seems like the intention was to check either /mnt or /tmp/run/blockd instead 
of / .
Since /mnt contains symlinks for mounts with the "autofs" property and 
directories
for anon mounts it seems to make sense but lstat will only work in 
/tmp/run/blockd.

Perhaps:
ULOG_ERR("kernel is requesting a mount -> %s\n", pkt->name);
if (asprintf(&mnt, "/mnt/%s", pkt->name) == -1)
exit(ENOMEM);
if (stat(mnt, &st) == -1)
if (block("autofs", "add", (char *)pkt->name))
cmd = AUTOFS_IOC_FAIL;
free(mnt);

Or:  ( haven't tested this one )
ULOG_ERR("kernel is requesting a mount -> %s\n", pkt->name);
if (asprintf(&mnt, "/mnt/%s", pkt->name) == -1)
exit(ENOMEM);
if (!lstat(pkt->name, &st) && S_ISLNK(st.st_mode))
if (block("autofs", "add", (char *)pkt->name))
cmd = AUTOFS_IOC_FAIL;
free(mnt);

Or just no test at all since there has effectively been no test for years.



--- End Message ---
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


RE: Inconsistencies in include/image.mk

2021-06-03 Thread Adrian Schmutzler
Hi,

> -Original Message-
> From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org]
> On Behalf Of Philip Prindeville
> Sent: Donnerstag, 3. Juni 2021 07:23
> To: OpenWrt Development List 
> Subject: Inconsistencies in include/image.mk
> 
> Hi,
> 
> I was looking at this with Paul this afternoon, and noticed a few issues worth
> fixing in include/image.mk after reviewing the DEVICE_PACKAGES PR he sent
> out.

I've not checked it in detail, but it looks to me like you are mixing TARGET 
and DEVICE variables here.

IIRC IMG_PREFIX is a target-based, device-independent variable, so it should 
not be set based on a device-dependent PROFILE_something variable.

Best

Adrian

> 
> The first part is how IMG_PREFIX is derived:
> 
> IMG_PREFIX_EXTRA:=$(if $(EXTRA_IMAGE_NAME),$(call
> sanitize,$(EXTRA_IMAGE_NAME))-) IMG_PREFIX_VERNUM:=$(if
> $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NUMBER))-)
> IMG_PREFIX_VERCODE:=$(if $(CONFIG_VERSION_CODE_FILENAMES),$(call
> sanitize,$(VERSION_CODE))-)
> 
> IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-
> $(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$(IMG_PREFIX_EXTRA)$
> (BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) IMG_ROOTFS:=$(IMG_PREFIX)-
> rootfs IMG_COMBINED:=$(IMG_PREFIX)-combined
> 
> But we don't append -$(PROFILE_SANITIZED) to it (if set), adding it later
> here:
> 
> define Image/Manifest
>   $(call opkg,$(TARGET_DIR_ORIG)) list-installed > \
>   $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-
> $(PROFILE_SANITIZED)).manifest
> endef
> 
> And here:
> 
> ifdef CONFIG_TARGET_ROOTFS_TARGZ
>   define Image/Build/targz
>   $(TAR) -cp --numeric-owner --owner=0 --group=0 --mode=a-s --
> sort=name \
>   $(if $(SOURCE_DATE_EPOCH),--
> mtime="@$(SOURCE_DATE_EPOCH)") \
>   -C $(TARGET_DIR)/ . | gzip -9n >
> $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-
> $(PROFILE_SANITIZED))-rootfs.tar.gz
>   endef
> endif
> 
> Note that we're also adding the suffix -rootfs, but not using the
> $(IMG_ROOTFS) definition made up at the top.
> 
> Conversely, here:
> 
> ifdef CONFIG_TARGET_ROOTFS_CPIOGZ
>   define Image/Build/cpiogz
>   ( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H
> newc -R 0:0 | gzip -9n >$(BIN_DIR)/$(IMG_ROOTFS).cpio.gz )
>   endef
> endif
> 
> We use $(IMG_ROOTFS) which doesn't include $(PROFILE_SANITIZED)... but
> we do use $(PROFILE_SANITIZED) in Image/Build/targz.  I don't see why the
> two cases aren't handled in the same way.
> 
> Either $(PROFILE_SANITIZED) is important enough to be included in
> everything (including cpio.gz images and manifests) or it's not.
> 
> Creating a PR to address this:
> 
> https://github.com/openwrt/openwrt/pull/4223
> 
> I don't know how to get good coverage of this change with CI/CD since that
> seems to only happen with PR's for "packages", but not "openwrt".
> 
> Any suggestions?
> 
> Thanks,
> 
> -Philip
> 
> 
> 
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel


openpgp-digital-signature.asc
Description: PGP signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Re: FRAG Attacks (new vuln for wifi)

2021-06-03 Thread Ben Greear

On 5/13/21 11:50 AM, Mirko Parthey wrote:

On Thu, May 13, 2021 at 03:49:05PM +0200, Felix Fietkau wrote:

We're talking about the version of the kernel tree used to create the
ath10k-ct source, not the kernel version used by OpenWrt.


OK, sorry for the noise.



I have compile-tested (against upstream stable kernels) 4.19, 5.4
and 5.10 ath10k-ct driver versions.  I have not tested this in owrt,
so if someone has time to pull this in and do some testing I'd
be grateful.

Thanks,
Ben

https://github.com/greearb/ath10k-ct

commit b44cd7b2e7b0df5995ece18f358d4dfc40834ba1 (HEAD -> master, origin/master)
Author: Ben Greear 
Date:   Thu Jun 3 13:29:23 2021 -0700

ath10k-ct:  Add security fixes.

For 4.19, 5.4, and 5.10 kernels.  This rebases -ct changes
on top of upstream stable kernel's latest code.  Including
the wifi security fixes that recently went in.

Signed-off-by: Ben Greear 



--
Ben Greear 
Candela Technologies Inc  http://www.candelatech.com

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Product Inquiry [JL] 06/03/21

2021-06-03 Thread John Lewis Partnersip
Dear lede-dev

The famous brand John Lewis Partnership, is UK's largest multi-
channel retailer with over 126 shops and multiple expansion in 
Africa furnished by European/Asian/American products. We are 
sourcing new products to attract new customers and also retain 
our existing ones, create new partnerships with companies dealing 
with different kinds of goods globally.

Your company's products are of interest to our market as we have 
an amazing market for your products.

Provide us your current catalog through email to review more. We 
hope to be able to order with you and start a long-term friendly,
respectable and solid business partnership. Please we would 
appreciate it if you could send us your stock availability via 
email if any.

Our payment terms are 15 days net in Europe, 30 days Net in UK 
and 30 days net in Asia/USA as we operate with over 5297 
suppliers around the globe for the past 50 years now. For 
immediate response Send your reply to robert_turner@johnlewis-
trading.com for us to be able to 
treat with care and urgency.


Best Regards

Rob Turner
Head Of Procurement Operations
John Lewis & Partners.
robert_tur...@johnlewis-trading.com
Tel: +44-7451-274090
WhatsApp: +447497483925
www.johnlewis.com
REGISTERED OFFICE: 171 VICTORIA STREET, LONDON SW1E 5NN  

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Re: [PATCH 19.07] ubus: update to version 2021-06-03

2021-06-03 Thread Petr Štetiar
Jo-Philipp Wich  [2021-06-03 10:50:07]:

Hi,

> does that change the libubus abi?

good catch, should be handled in v2 series.

-- ynezz

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[PATCH 19.07 v2 2/2] ubus: update to version 2021-06-03

2021-06-03 Thread Petr Štetiar
This update cherry picks following changes:

 * cmake: add a possibility to set library version
 * ubusd: protect against too-short messages
 * ubusd: add per-client tx queue limit
 * ubusd: convert tx_queue to linked list
 * lua: avoid truncation of large numeric values

Fixes: FS#1525
Signed-off-by: Petr Štetiar 
---

I've created openwrt-19.07[1] maintenance branch in the ubus project and
cherry picked there above referenced fixes.

1. 
https://git.openwrt.org/?p=project/ubus.git;a=shortlog;h=refs/heads/openwrt-19.07

 package/system/ubus/Makefile | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile
index 5e3bbd120dc6..702a78214e8c 100644
--- a/package/system/ubus/Makefile
+++ b/package/system/ubus/Makefile
@@ -5,10 +5,10 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git
-PKG_SOURCE_DATE:=2019-12-27
-PKG_SOURCE_VERSION:=041c9d1c052bb4936fd03240f7d0dd64aedda972
-PKG_MIRROR_HASH:=7febbe78dd178d8d7ccacff54c00fb2d19a53624005920db8cd85236f54f8324
-PKG_ABI_VERSION:=20191227
+PKG_SOURCE_DATE:=2021-06-03
+PKG_SOURCE_VERSION:=90fb56c00bbd911d929227528e679b174b1f4cec
+PKG_MIRROR_HASH:=cec3ce8a2b952f08ed26d7f7e230cbbac34e66f0bcf11a03c3edaef1d0390490
+PKG_ABI_VERSION:=20210603
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=LGPL-2.1

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[PATCH 19.07 v2 1/2] ubus: backport SOVERSION support

2021-06-03 Thread Petr Štetiar
Add a support for setting of new `ABIVERSION` CMake define which allows
to control the SOVERSION used for the built shared library. This is
needed for downstream packaging to properly track breaking ABI changes
when updating to newer versions of the library.

Signed-off-by: Felix Fietkau 
Signed-off-by: Petr Štetiar  [backport]
(backported from commit 8edb1797d55d259c6eda18c89784f152328436fc)
---
 package/system/ubus/Makefile | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile
index d3fe45225228..5e3bbd120dc6 100644
--- a/package/system/ubus/Makefile
+++ b/package/system/ubus/Makefile
@@ -8,6 +8,7 @@ PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git
 PKG_SOURCE_DATE:=2019-12-27
 PKG_SOURCE_VERSION:=041c9d1c052bb4936fd03240f7d0dd64aedda972
 
PKG_MIRROR_HASH:=7febbe78dd178d8d7ccacff54c00fb2d19a53624005920db8cd85236f54f8324
+PKG_ABI_VERSION:=20191227
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=LGPL-2.1
@@ -36,7 +37,7 @@ define Package/libubus
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=+libubox
-  ABI_VERSION:=20191227
+  ABI_VERSION:=$(PKG_ABI_VERSION)
   TITLE:=OpenWrt RPC client library
 endef
 
@@ -51,7 +52,8 @@ TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -flto
 TARGET_LDFLAGS += -flto
 
 CMAKE_OPTIONS = \
-   -DLUAPATH=/usr/lib/lua
+   -DLUAPATH=/usr/lib/lua \
+   -DABIVERSION="$(PKG_ABI_VERSION)"
 
 define Package/ubus/install
$(INSTALL_DIR) $(1)/bin
@@ -65,7 +67,7 @@ endef
 
 define Package/libubus/install
$(INSTALL_DIR) $(1)/lib
-   $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/lib/
+   $(CP) $(PKG_INSTALL_DIR)/usr/lib/libubus.so.* $(1)/lib/
 endef
 
 define Package/libubus-lua/install

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Re: [PATCH] ipq806x: fix LAN and WAN port assignments on TP-Link AD7200

2021-06-03 Thread David Bauer
Hi Alex,

On 6/3/21 8:18 AM, Alex Henrie wrote:
> LAN port 4 was swapped with the WAN port and the remaining three LAN
> ports were numbered in reverse order from their labels on the case.
> 
> Fixes: 1a775a4fd033 ("ipq806x: add support for TP-Link Talon AD7200")
> Signed-off-by: Alex Henrie 
> ---
>  target/linux/ipq806x/base-files/etc/board.d/02_network | 5 -
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network 
> b/target/linux/ipq806x/base-files/etc/board.d/02_network
> index abdab89857..f0a852ece8 100644
> --- a/target/linux/ipq806x/base-files/etc/board.d/02_network
> +++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
> @@ -56,7 +56,6 @@ nec,wg2600hp3)
>   "2:lan" "3:lan" "4:lan" "5:lan" "0@eth1" "1:wan" "6@eth0"
>   ;;
>  netgear,r7800 |\
> -tplink,ad7200 |\
>  tplink,c2600)
>   ucidef_add_switch "switch0" \
>   "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "6@eth1" "5:wan" 
> "0@eth0"
> @@ -71,6 +70,10 @@ qcom,ipq8064-db149)
>   ucidef_add_switch "switch0" \
>   "1:lan" "2:lan" "3:lan" "4:lan" "6u@eth1" "5:wan" "0u@eth0"
>   ;;
> +tplink,ad7200)
> + ucidef_add_switch "switch0" \
> + "2:lan" "3:lan" "4:lan" "5:lan" "6@eth1" "1:wan" "0@eth0"

I'd suggest

"2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "6@eth1" "1:wan" "0@eth0"

so the case port numbering is explicitly added to the definition here.

Looks good otherwise.

Best
David
> + ;;
>  ubnt,unifi-ac-hd)
>   ucidef_set_interface_lan "eth0 eth1"
>   ;;
> 

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Re: [PATCH 19.07] ubus: update to version 2021-06-03

2021-06-03 Thread Jo-Philipp Wich
Hi Petr,

does that change the libubus abi?

~ Jo



signature.asc
Description: OpenPGP digital signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[PATCH 19.07] ubus: update to version 2021-06-03

2021-06-03 Thread Petr Štetiar
This update cherry picks following changes:

 * ubusd: protect against too-short messages
 * ubusd: add per-client tx queue limit
 * ubusd: convert tx_queue to linked list
 * lua: avoid truncation of large numeric values

Fixes: FS#1525
Signed-off-by: Petr Štetiar 
---

I've created openwrt-19.07 maintenance branch in the ubus project and
cherry picked there above referenced fixes.

1. 
https://git.openwrt.org/?p=project/ubus.git;a=shortlog;h=refs/heads/openwrt-19.07

 package/system/ubus/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile
index d3fe45225228..fc5e128e71c8 100644
--- a/package/system/ubus/Makefile
+++ b/package/system/ubus/Makefile
@@ -5,9 +5,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git
-PKG_SOURCE_DATE:=2019-12-27
-PKG_SOURCE_VERSION:=041c9d1c052bb4936fd03240f7d0dd64aedda972
-PKG_MIRROR_HASH:=7febbe78dd178d8d7ccacff54c00fb2d19a53624005920db8cd85236f54f8324
+PKG_SOURCE_DATE:=2021-06-03
+PKG_SOURCE_VERSION:=fe029ae0b66b57e9c512396a5d5bca92df7478ff
+PKG_MIRROR_HASH:=81d95c1b8341744a7ee2d5013dd676ca62b61c5bcf57f2ce83c81dde23aff1aa
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=LGPL-2.1

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel