[LEDE-DEV] [PATCH] uci: fix a potential use-after-free in uci_set()

[Jordan Miner]

When calling uci_set() to update an option, if ptr->o != NULL and
ptr->option == NULL, then uci_expand_ptr() will set ptr->option to
ptr->o->e.name (or the caller could set ptr->option to that value). In
this case, the option will be freed just before calling
uci_alloc_option() with ptr->option, which was just freed.

Signed-off-by: Jordan Miner 
---
 list.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/list.c b/list.c
index 0347138..5a1d891 100644
--- a/list.c
+++ b/list.c
@@ -698,8 +698,8 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
if ((ptr->o->type == UCI_TYPE_STRING) &&
!strcmp(ptr->o->v.string, ptr->value))
return 0;
-   uci_free_option(ptr->o);
ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value);
+   uci_free_option(ptr->o);
ptr->last = >o->e;
} else if (ptr->s && ptr->section) { /* update section */
char *s = uci_strdup(ctx, ptr->value);
-- 
2.7.4


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

Re: [LEDE-DEV] [openwrt/openwrt] toolchain/binutils: add support for version 2.30

[Arjen de Korte]

Citeren Hauke Mehrtens :


On 03/12/2018 09:48 PM, Arjen de Korte wrote:

Citeren Felix Fietkau :


On 2018-03-12 21:02, Arjen de Korte wrote:

Citeren LEDE Commits :


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/e28551b103f4999b36d3725a23b59f507830f48a

commit e28551b103f4999b36d3725a23b59f507830f48a
Author: Felix Fietkau 
AuthorDate: Thu Mar 8 11:21:58 2018 +0100

    toolchain/binutils: add support for version 2.30

    Signed-off-by: Felix Fietkau 


This doesn't fly. The 'binutils-2.30.tar.bz2' archive bundles *.rej
files:

 binutils-2.30/ld/ChangeLog.rej
 binutils-2.30/ld/ldlang.c.rej

which causes fatal build errors

 Aborting.  Reject files found.

Oops.

Forgot to push another change that I had to address this. Fixed now.


Slight uncomfortable feeling remains why these broken patches made it
into the binutils archive in the first place. Is there something missing
which really should have been included, or are these the remnants of
patches that have been superseded?


Hi Arjen,

Could you please send a mail to the binutils people so they can comment
on this and fix this in their next release.


https://sourceware.org/bugzilla/show_bug.cgi?id=22953


Hauke

___
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] [openwrt/openwrt] toolchain/binutils: add support for version 2.30

[Hauke Mehrtens]

On 03/12/2018 09:48 PM, Arjen de Korte wrote:
> Citeren Felix Fietkau :
> 
>> On 2018-03-12 21:02, Arjen de Korte wrote:
>>> Citeren LEDE Commits :
>>>
 nbd pushed a commit to openwrt/openwrt.git, branch master:
 https://git.lede-project.org/e28551b103f4999b36d3725a23b59f507830f48a

 commit e28551b103f4999b36d3725a23b59f507830f48a
 Author: Felix Fietkau 
 AuthorDate: Thu Mar 8 11:21:58 2018 +0100

     toolchain/binutils: add support for version 2.30

     Signed-off-by: Felix Fietkau 
>>>
>>> This doesn't fly. The 'binutils-2.30.tar.bz2' archive bundles *.rej
>>> files:
>>>
>>>  binutils-2.30/ld/ChangeLog.rej
>>>  binutils-2.30/ld/ldlang.c.rej
>>>
>>> which causes fatal build errors
>>>
>>>  Aborting.  Reject files found.
>>>
>>> Oops.
>> Forgot to push another change that I had to address this. Fixed now.
> 
> Slight uncomfortable feeling remains why these broken patches made it
> into the binutils archive in the first place. Is there something missing
> which really should have been included, or are these the remnants of
> patches that have been superseded?

Hi Arjen,

Could you please send a mail to the binutils people so they can comment
on this and fix this in their next release.

Hauke

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

Re: [LEDE-DEV] [openwrt/openwrt] toolchain/binutils: add support for version 2.30

[Arjen de Korte]

Citeren Felix Fietkau :


On 2018-03-12 21:02, Arjen de Korte wrote:

Citeren LEDE Commits :


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/e28551b103f4999b36d3725a23b59f507830f48a

commit e28551b103f4999b36d3725a23b59f507830f48a
Author: Felix Fietkau 
AuthorDate: Thu Mar 8 11:21:58 2018 +0100

toolchain/binutils: add support for version 2.30

Signed-off-by: Felix Fietkau 


This doesn't fly. The 'binutils-2.30.tar.bz2' archive bundles *.rej files:

 binutils-2.30/ld/ChangeLog.rej
 binutils-2.30/ld/ldlang.c.rej

which causes fatal build errors

 Aborting.  Reject files found.

Oops.

Forgot to push another change that I had to address this. Fixed now.


Slight uncomfortable feeling remains why these broken patches made it  
into the binutils archive in the first place. Is there something  
missing which really should have been included, or are these the  
remnants of patches that have been superseded?




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

Re: [LEDE-DEV] [openwrt/openwrt] toolchain/binutils: add support for version 2.30

[Felix Fietkau]

On 2018-03-12 21:02, Arjen de Korte wrote:
> Citeren LEDE Commits :
> 
>> nbd pushed a commit to openwrt/openwrt.git, branch master:
>> https://git.lede-project.org/e28551b103f4999b36d3725a23b59f507830f48a
>>
>> commit e28551b103f4999b36d3725a23b59f507830f48a
>> Author: Felix Fietkau 
>> AuthorDate: Thu Mar 8 11:21:58 2018 +0100
>>
>> toolchain/binutils: add support for version 2.30
>>
>> Signed-off-by: Felix Fietkau 
> 
> This doesn't fly. The 'binutils-2.30.tar.bz2' archive bundles *.rej files:
> 
>  binutils-2.30/ld/ChangeLog.rej
>  binutils-2.30/ld/ldlang.c.rej
> 
> which causes fatal build errors
> 
>  Aborting.  Reject files found.
> 
> Oops.
Forgot to push another change that I had to address this. Fixed now.

Thanks,

- Felix

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

[LEDE-DEV] [PATCH] Add support for Comfast E314N

[Bill Moffitt]

The Comfast E314N-V2 is a 2.4 GHz 2x2 radio with a built-in directional
antenna and a second Ethernet port - very similar to the Ubiquiti
NanoStation M2. The Ethernet port features a pass-through PoE
capability, enabled or disabled with a slide switch. The radio is built
using a Qualcomm/Atheros QCA9531 chipset.

The majority of the changes are in the
target/linux/ar71xx/files/arch/mips/ath79/mach-cf-e316n-v2.c file.
One significant change is that the function cf_exxxn_qca953x_eth_setup
had to be moved before the CF-314N section in that file.

Firmware can be flashed on these units by the following method:
1.) Apply power to the unit
2.) Immediately AFTER applying power, hold down the reset button
3.) The WAN, LAN, and wireless lights will flash - wait three seconds
(three flashes) and then release the button.
4.) After a second, the lights will "flutter" quickly and the unit will
be visible at 192.168.1.1. A web page will be available to enable quick
and simple uploading and flashing of firmware.

During the boot process, these units also look for a tftp server at
192.168.1.10. If one is present, the firmware can be uploaded as a file
called "firmware-auto.bin"
---
 target/linux/ar71xx/base-files/etc/board.d/01_leds |   5 +
 target/linux/ar71xx/base-files/etc/diag.sh |   1 +
 target/linux/ar71xx/base-files/lib/ar71xx.sh   |   3 +
 .../ar71xx/base-files/lib/upgrade/platform.sh  |   1 +
 target/linux/ar71xx/config-4.4 |   1 +
 .../ar71xx/files/arch/mips/ath79/Kconfig.openwrt   |  10 ++
 target/linux/ar71xx/files/arch/mips/ath79/Makefile |   1 +
 .../files/arch/mips/ath79/mach-cf-e316n-v2.c   | 148 +
 .../linux/ar71xx/files/arch/mips/ath79/machtypes.h |   1 +
 target/linux/ar71xx/image/generic.mk   |   9 ++
 10 files changed, 153 insertions(+), 27 deletions(-)

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 833522f..dae3481 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -143,6 +143,11 @@ carambola2)
ucidef_set_led_netdev "wan" "WAN" "$board:orange:eth1" "eth1"
ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
;;
+cf-e314n-v2)
+ucidef_set_led_netdev "wan" "WAN" "$board:white:wan" "eth0"
+   ucidef_set_led_netdev "lan" "lAN" "$board:white:lan" "eth1"
+   ucidef_set_led_wlan "wlan" "WLAN" "$board:white:wlan" "phy0tpt"
+;;
 cf-e316n-v2)
ucidef_set_led_netdev "lan" "LAN" "$board:blue:lan" "eth0"
ucidef_set_led_netdev "wan" "WAN" "$board:blue:wan" "eth1"
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh 
b/target/linux/ar71xx/base-files/etc/diag.sh
index bc2fc2f..e2f26eb 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -101,6 +101,7 @@ get_status_led() {
cap4200ag)
status_led="senao:green:pwr"
;;
+cf-e314n-v2|\
cf-e316n-v2|\
cf-e520n|\
cf-e530n)
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh 
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index bf36598..b01f4af 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -487,6 +487,9 @@ ar71xx_board_detect() {
*CAP4200AG)
name="cap4200ag"
;;
+   *"CF-E314N v2")
+   name="cf-e314n-v2"
+   ;;
*"CF-E316N v2")
name="cf-e316n-v2"
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh 
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 21ad2a6..f7d03e5 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -209,6 +209,7 @@ platform_check_image() {
bullet-m|\
c-55|\
carambola2|\
+cf-e314n-v2|\
cf-e316n-v2|\
cf-e320n-v2|\
cf-e380ac-v1|\
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
index a862245..7ba7e2f 100644
--- a/target/linux/ar71xx/config-4.4
+++ b/target/linux/ar71xx/config-4.4
@@ -62,6 +62,7 @@ CONFIG_ATH79_MACH_C60=y
 CONFIG_ATH79_MACH_CAP324=y
 CONFIG_ATH79_MACH_CAP4200AG=y
 CONFIG_ATH79_MACH_CARAMBOLA2=y
+CONFIG_ATH79_MACH_CF_E314N_V2=y
 CONFIG_ATH79_MACH_CF_E316N_V2=y
 CONFIG_ATH79_MACH_CF_E320N_V2=y
 CONFIG_ATH79_MACH_CF_E380AC_V1=y
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt 
b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
index 58d7e43..d85ae2c 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -1765,6 +1765,16 @@ config ATH79_MACH_CARAMBOLA2
select ATH79_DEV_USB
select ATH79_DEV_WMAC
 
+config ATH79_MACH_CF_E314N_V2
+   bool "COMFAST 

Re: [LEDE-DEV] [openwrt/openwrt] toolchain/binutils: add support for version 2.30

[Arjen de Korte]

Citeren LEDE Commits :


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/e28551b103f4999b36d3725a23b59f507830f48a

commit e28551b103f4999b36d3725a23b59f507830f48a
Author: Felix Fietkau 
AuthorDate: Thu Mar 8 11:21:58 2018 +0100

toolchain/binutils: add support for version 2.30

Signed-off-by: Felix Fietkau 


This doesn't fly. The 'binutils-2.30.tar.bz2' archive bundles *.rej files:

binutils-2.30/ld/ChangeLog.rej
binutils-2.30/ld/ldlang.c.rej

which causes fatal build errors

Aborting.  Reject files found.

Oops.


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

[LEDE-DEV] Fwd: revisited: Nanostation m5 XW ethernet patch gone

[Joe Ayers]

The NS M5 XW has an internal switch.   Could you be running into the
issue where a given port can only do tagged or un-tagged, but not
both?  The NS M5 XW never had the issue related to this thread, which
is unique to UBNT's use of a separate AR803x with GPIO wiring to reset
it.

By the way, if anyone is interested I applied a stack of patches,
including Felix's AR803x fixes, to Chaos Calmer.  You can find these
here (and the 5 prior change sets):

http://bloodhound.aredn.org/products/AREDN/changeset/0bf063b87203087a9746481ad01bc819cb7f662a/arednbase/




On Mon, Mar 12, 2018 at 7:53 AM, Daniel Golle  wrote:
>
> Hi!
>
> I just witnessed the Ethernet issue returning on OpenWrt snapshot on
> Ubiquiti NanoStation M5 XW (NSM5-XW):
> ag71xx.0: connected to PHY at ag71xx-mdio.0:00 [uid=004dd043, driver=Atheros 
> AR8216/AR8236/AR8316]
> After about three days uptime eth0 links were lost and could be
> recovered by resetting the device. The device is connected to another
> ubnt XW device (NB NBM5) which also runs OpenWrt.
> The logs didn't show anything suspicious. How should I debug the
> situation next time it occurrs?
>
> Cheers
>
> Daniel
>
>
>
> On Thu, Oct 19, 2017 at 02:03:35PM -0700, Joe Ayers wrote:
> > Was the fix included in the Generic PHY?  If not, possible some of the
> > following are still using the generic and therefore would still have
> > the bug?:
> >
> > NBE/PBE-M5-300 XW: ag71xx ag71xx.0: connected to PHY at
> > ag71xx-mdio.0:01 [uid=004dd023, driver=Generic PHY]
> > NSM5-loco-XW:  ag71xx ag71xx.0: connected to PHY at ag71xx-mdio.0:01
> > [uid=004dd023, driver=Generic PHY]
> > Airgrid M5 XW:  ag71xx ag71xx.0: connected to PHY at ag71xx-mdio.0:01
> > [uid=004dd023, driver=Generic PHY]
> > NBM5/16 XW:  ag71xx ag71xx.0: connected to PHY at ag71xx-mdio.0:01
> > [uid=004dd023, driver=Generic PHY]
> > NBM5/19 XW: ag71xx ag71xx.0: connected to PHY at ag71xx-mdio.0:01
> > [uid=004dd023, driver=Generic PHY]
> >
> > There was a bounty source on this defect -- how to get the original
> > OpenWRT defect closed?
> >
> > Regards,
> > Joe AE6XE
> >
> >
> >
> >
> > On Thu, Oct 19, 2017 at 12:58 PM, Felix Fietkau  wrote:
> > >
> > > Hi Daniel,
> > >
> > > The patch that you mentioned is not related to your issue at all, since
> > > it only deals with the AT8032 PHY, which the NanoStation M does not
> > > have. Maybe you can provide a more detailed description of what symptoms
> > > you're seeing.
> > >
> > > I did indeed clean up the AT8032 mess and solved it in the PHY driver
> > > (controlled by platform data) instead of adding GPIO toggle hackery to
> > > the Ethernet driver.
> > >
> > > - Felix
> > >
> > > On 2017-10-19 20:20, Daniel Golle wrote:
> > > > Hi Felix!
> > > > Hi everyone!
> > > >
> > > > It looks like Tiziano is right and this patch did get lost somehow.
> > > > At least I can't find any work-arounds regarding PHY hangs committed in
> > > > neither target/linux/generic/files/* nor target/linux/ar71xx/files/*.
> > > >
> > > > The thread on lede-dev also seems to have stagnated after
> > > > http://lists.infradead.org/pipermail/lede-dev/2016-December/004406.html
> > > >
> > > > Felix, you said you had a more clean patch for this in your staging
> > > > tree?
> > > >
> > > > I'm asking because I might have just hit that bug once again on
> > > > UBNT-NM-XW, ie. uid=004dd043, driver=Atheros AR8216/AR8236/AR8316...
> > > >
> > > > Anyone? I've also had a lot of problems with that bug on XW hardware
> > > > and have since simply tried to avoid it (the hardware). Now that also
> > > > non-loco NanoStations are only available in their XW-version I'd be
> > > > happy to finally have a reliable work-around for that hardware problem.
> > > >
> > > >
> > > > Cheers
> > > >
> > > >
> > > > Daniel
> > > >
> > > >
> > > > - Forwarded message from Tiziano Bacocco  -
> > > >
> > > > Date: Mon, 6 Feb 2017 16:34:24 +0100
> > > > From: Tiziano Bacocco 
> > > > To: openwrt-de...@lists.openwrt.org
> > > > Subject: [OpenWrt-Devel] Nanostation m5 XW ethernet patch gone
> > > >
> > > > Hello everyone
> > > > Could this patch http://gerrit.aredn.org/#/c/57 be merged in trunk?
> > > > I've just tested it with trunk and it works properly on my nanostation 
> > > > loco
> > > > m5 xw , the PHY chip is correctly reset every like 8 hours or so and no
> > > > connectivity loss since then
> > > >
> > > > Bug report:
> > > > https://dev.openwrt.org/ticket/19085
> > > >
> > > > System log after applying patch
> > > > Sun Feb  5 23:40:02 2017 kern.info kernel: [716206.656361] br-lan: port
> > > > 1(eth0) entered forwarding state
> > > > Sun Feb  5 23:40:02 2017 daemon.notice netifd: Network device 'eth0' 
> > > > link
> > > > is up
> > > > Sun Feb  5 23:40:04 2017 kern.info kernel: [716208.654021] br-lan: port
> > > > 1(eth0) entered forwarding state
> > > > Mon Feb  6 05:05:21 2017 kern.info kernel: [735725.556613]
> > > > ag71xx_check_reset: 

Re: [LEDE-DEV] new buildbot slave

[Jo-Philipp Wich]

Hello Daniel,

> I am Daniel Müllers from Aachen. I like to setup two Buildbot Slave
> to provid the LEDE OpenWRT Project with some build power.

thank you for your generous offer! Can you elaborate a bit on the
specifications of the machine?

> Is this the way to setup an Buildbot Slave?

Setting up a new slave is quite simple and can be done with a single
command, although I prefer direct SSH access nowadays to be able to
properly tune the machine.

Given that you decide to offer resources, would it be possible to have
VMs with full SSH access?

> Is it possible to set a timer for the build server?

I will need to look into that. It is possible to gracefully remove
slaves from the cluster once a given build is finished but we cannot (or
rather do not want to) hard-shutdown slaves immediately when a specific
time is reached as that would lead to needlessly interrupted builds.


With kind regards,
Jo-Philipp

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

Re: [LEDE-DEV] revisited: Nanostation m5 XW ethernet patch gone

[Daniel Golle]

Hi!

I just witnessed the Ethernet issue returning on OpenWrt snapshot on
Ubiquiti NanoStation M5 XW (NSM5-XW):
ag71xx.0: connected to PHY at ag71xx-mdio.0:00 [uid=004dd043, driver=Atheros 
AR8216/AR8236/AR8316]
After about three days uptime eth0 links were lost and could be
recovered by resetting the device. The device is connected to another
ubnt XW device (NB NBM5) which also runs OpenWrt.
The logs didn't show anything suspicious. How should I debug the
situation next time it occurrs?

Cheers

Daniel



On Thu, Oct 19, 2017 at 02:03:35PM -0700, Joe Ayers wrote:
> Was the fix included in the Generic PHY?  If not, possible some of the
> following are still using the generic and therefore would still have
> the bug?:
> 
> NBE/PBE-M5-300 XW: ag71xx ag71xx.0: connected to PHY at
> ag71xx-mdio.0:01 [uid=004dd023, driver=Generic PHY]
> NSM5-loco-XW:  ag71xx ag71xx.0: connected to PHY at ag71xx-mdio.0:01
> [uid=004dd023, driver=Generic PHY]
> Airgrid M5 XW:  ag71xx ag71xx.0: connected to PHY at ag71xx-mdio.0:01
> [uid=004dd023, driver=Generic PHY]
> NBM5/16 XW:  ag71xx ag71xx.0: connected to PHY at ag71xx-mdio.0:01
> [uid=004dd023, driver=Generic PHY]
> NBM5/19 XW: ag71xx ag71xx.0: connected to PHY at ag71xx-mdio.0:01
> [uid=004dd023, driver=Generic PHY]
> 
> There was a bounty source on this defect -- how to get the original
> OpenWRT defect closed?
> 
> Regards,
> Joe AE6XE
> 
> 
> 
> 
> On Thu, Oct 19, 2017 at 12:58 PM, Felix Fietkau  wrote:
> >
> > Hi Daniel,
> >
> > The patch that you mentioned is not related to your issue at all, since
> > it only deals with the AT8032 PHY, which the NanoStation M does not
> > have. Maybe you can provide a more detailed description of what symptoms
> > you're seeing.
> >
> > I did indeed clean up the AT8032 mess and solved it in the PHY driver
> > (controlled by platform data) instead of adding GPIO toggle hackery to
> > the Ethernet driver.
> >
> > - Felix
> >
> > On 2017-10-19 20:20, Daniel Golle wrote:
> > > Hi Felix!
> > > Hi everyone!
> > >
> > > It looks like Tiziano is right and this patch did get lost somehow.
> > > At least I can't find any work-arounds regarding PHY hangs committed in
> > > neither target/linux/generic/files/* nor target/linux/ar71xx/files/*.
> > >
> > > The thread on lede-dev also seems to have stagnated after
> > > http://lists.infradead.org/pipermail/lede-dev/2016-December/004406.html
> > >
> > > Felix, you said you had a more clean patch for this in your staging
> > > tree?
> > >
> > > I'm asking because I might have just hit that bug once again on
> > > UBNT-NM-XW, ie. uid=004dd043, driver=Atheros AR8216/AR8236/AR8316...
> > >
> > > Anyone? I've also had a lot of problems with that bug on XW hardware
> > > and have since simply tried to avoid it (the hardware). Now that also
> > > non-loco NanoStations are only available in their XW-version I'd be
> > > happy to finally have a reliable work-around for that hardware problem.
> > >
> > >
> > > Cheers
> > >
> > >
> > > Daniel
> > >
> > >
> > > - Forwarded message from Tiziano Bacocco  -
> > >
> > > Date: Mon, 6 Feb 2017 16:34:24 +0100
> > > From: Tiziano Bacocco 
> > > To: openwrt-de...@lists.openwrt.org
> > > Subject: [OpenWrt-Devel] Nanostation m5 XW ethernet patch gone
> > >
> > > Hello everyone
> > > Could this patch http://gerrit.aredn.org/#/c/57 be merged in trunk?
> > > I've just tested it with trunk and it works properly on my nanostation 
> > > loco
> > > m5 xw , the PHY chip is correctly reset every like 8 hours or so and no
> > > connectivity loss since then
> > >
> > > Bug report:
> > > https://dev.openwrt.org/ticket/19085
> > >
> > > System log after applying patch
> > > Sun Feb  5 23:40:02 2017 kern.info kernel: [716206.656361] br-lan: port
> > > 1(eth0) entered forwarding state
> > > Sun Feb  5 23:40:02 2017 daemon.notice netifd: Network device 'eth0' link
> > > is up
> > > Sun Feb  5 23:40:04 2017 kern.info kernel: [716208.654021] br-lan: port
> > > 1(eth0) entered forwarding state
> > > Mon Feb  6 05:05:21 2017 kern.info kernel: [735725.556613]
> > > ag71xx_check_reset: expected: 004d, got: 
> > > Mon Feb  6 05:05:21 2017 kern.info kernel: [735725.562190]
> > > ag71xx_gpio_reset triggered
> > > Mon Feb  6 05:05:21 2017 kern.info kernel: [735725.571328] eth0: link down
> > > Mon Feb  6 05:05:21 2017 daemon.notice netifd: Network device 'eth0' link
> > > is down
> > > Mon Feb  6 05:05:21 2017 kern.info kernel: [735725.574702] br-lan: port
> > > 1(eth0) entered disabled state
> > > Mon Feb  6 05:05:23 2017 kern.info kernel: [735727.567752] eth0: link up
> > > (100Mbps/Full duplex)
> > > Mon Feb  6 05:05:23 2017 kern.info kernel: [735727.572533] br-lan: port
> > > 1(eth0) entered forwarding state
> > > Mon Feb  6 05:05:23 2017 kern.info kernel: [735727.578224] br-lan: port
> > > 1(eth0) entered forwarding state
> > > Mon Feb  6 05:05:23 2017 daemon.notice netifd: Network device 'eth0' link
> > > is up
> > >
> > >
> 

[LEDE-DEV] [PATCH] kernel: drop patch hacking bridge to accept EAP only locally

[Rafał Miłecki]

From: Rafał Miłecki 

EAPOL frames have wireless interface address specified as destination.
That makes "dst->is_local" condition true for them and results in
upstream code processing frames the same way as OpenWrt/LEDE's hack.

This code could be needed years ago but currently it seems redundant.

Signed-off-by: Rafał Miłecki 
---
 .../640-bridge-only-accept-EAP-locally.patch   | 32 --
 .../hack-4.14/641-bridge_port_isolate.patch|  2 +-
 .../640-bridge-only-accept-EAP-locally.patch   | 32 --
 .../generic/hack-4.9/641-bridge_port_isolate.patch |  2 +-
 .../pending-4.4/640-bridge_no_eap_forward.patch| 23 
 .../pending-4.4/642-bridge_port_isolate.patch  |  2 +-
 6 files changed, 3 insertions(+), 90 deletions(-)
 delete mode 100644 
target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch
 delete mode 100644 
target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch
 delete mode 100644 
target/linux/generic/pending-4.4/640-bridge_no_eap_forward.patch

diff --git 
a/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch 
b/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch
deleted file mode 100644
index 83c9cf739f..00
--- a/target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c6905cfdeb31a5c049db3da434b10fa0d3e83569 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau 
-Date: Fri, 7 Jul 2017 17:18:54 +0200
-Subject: bridge: only accept EAP locally
-
-When bridging, do not forward EAP frames to other ports, only deliver
-them locally, regardless of the state.
-
-Signed-off-by: Felix Fietkau 

- net/bridge/br_input.c | 7 +--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
 a/net/bridge/br_input.c
-+++ b/net/bridge/br_input.c
-@@ -166,11 +166,14 @@ int br_handle_frame_finish(struct net *n
-   }
-   }
- 
-+  BR_INPUT_SKB_CB(skb)->brdev = br->dev;
-+
-+  if (skb->protocol == htons(ETH_P_PAE))
-+  return br_pass_frame_up(skb);
-+
-   if (p->state == BR_STATE_LEARNING)
-   goto drop;
- 
--  BR_INPUT_SKB_CB(skb)->brdev = br->dev;
--
-   if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP))
-   br_do_proxy_arp(skb, br, vid, p);
- 
diff --git a/target/linux/generic/hack-4.14/641-bridge_port_isolate.patch 
b/target/linux/generic/hack-4.14/641-bridge_port_isolate.patch
index 538dbd16b0..8f3e0219b0 100644
--- a/target/linux/generic/hack-4.14/641-bridge_port_isolate.patch
+++ b/target/linux/generic/hack-4.14/641-bridge_port_isolate.patch
@@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau 
 */
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
-@@ -177,6 +177,9 @@ int br_handle_frame_finish(struct net *n
+@@ -174,6 +174,9 @@ int br_handle_frame_finish(struct net *n
if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP))
br_do_proxy_arp(skb, br, vid, p);
  
diff --git 
a/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch 
b/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch
deleted file mode 100644
index ba87420b32..00
--- a/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c6905cfdeb31a5c049db3da434b10fa0d3e83569 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau 
-Date: Fri, 7 Jul 2017 17:18:54 +0200
-Subject: bridge: only accept EAP locally
-
-When bridging, do not forward EAP frames to other ports, only deliver
-them locally, regardless of the state.
-
-Signed-off-by: Felix Fietkau 

- net/bridge/br_input.c | 7 +--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
 a/net/bridge/br_input.c
-+++ b/net/bridge/br_input.c
-@@ -164,11 +164,14 @@ int br_handle_frame_finish(struct net *n
-   }
-   }
- 
-+  BR_INPUT_SKB_CB(skb)->brdev = br->dev;
-+
-+  if (skb->protocol == htons(ETH_P_PAE))
-+  return br_pass_frame_up(skb);
-+
-   if (p->state == BR_STATE_LEARNING)
-   goto drop;
- 
--  BR_INPUT_SKB_CB(skb)->brdev = br->dev;
--
-   if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP))
-   br_do_proxy_arp(skb, br, vid, p);
- 
diff --git a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch 
b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch
index 0d0b2c73ff..9c797f5a4d 100644
--- a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch
+++ b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch
@@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau 
continue;
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
-@@ -175,6 +175,9 @@ int br_handle_frame_finish(struct net *n
+@@ -172,6 +172,9 @@ int 

[LEDE-DEV] [PATCH 2/3] kernel: bump 4.9 to 4.9.87

[Koen Vandeputte]

- Refreshed all patches

Compile tested on: ar71xx
Runtime tested on: ar71xx

Signed-off-by: Koen Vandeputte 
---
 include/kernel-version.mk  |   4 +-
 .../patches-4.9/910-unaligned_access_hacks.patch   |   2 +-
 ...-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch |   2 +-
 ...q-add-a-shortcut-in-tcp_small_queue_check.patch |   2 +-
 ...tcp-tcp_mtu_probe-is-likely-to-exit-early.patch |   2 +-
 ...tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch |   6 +-
 .../025-tcp-allow-drivers-to-tweak-TSQ-logic.patch |   2 +-
 ...-r4k_cache-use-more-efficient-cache-blast.patch |   2 +-
 .../linux/generic/hack-4.9/721-phy_packets.patch   |   2 +-
 .../linux/generic/hack-4.9/902-debloat_proc.patch  |   2 +-
 ...80-NET-skip-GRO-for-foreign-MAC-addresses.patch |  10 +-
 .../202-core-linux-support-layerscape.patch|   2 +-
 .../sunxi/patches-4.9/0052-stmmac-form-4-12.patch  | 386 +++--
 13 files changed, 223 insertions(+), 201 deletions(-)

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index d20b2262352d..95103c5ffe7f 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -4,12 +4,12 @@ LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .71
 LINUX_VERSION-4.4 = .119
-LINUX_VERSION-4.9 = .86
+LINUX_VERSION-4.9 = .87
 LINUX_VERSION-4.14 = .26
 
 LINUX_KERNEL_HASH-3.18.71 = 
5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
 LINUX_KERNEL_HASH-4.4.119 = 
4f1f9b7b6b2ee93597239d89bb3b6b60c71ebd8c91d706fadd36f515c68443e6
-LINUX_KERNEL_HASH-4.9.86 = 
a7cf6eb5efcf182f1760fdfc06118eecce5d8c9d82d6945e68fc15db990c6e85
+LINUX_KERNEL_HASH-4.9.87 = 
7ac9f6af69dc5a7e38bf35cc3fa889e3a4b22504a85f57fdc87734a8abe4c917
 LINUX_KERNEL_HASH-4.14.26 = 
99a466c54261007b984ee149167d89755051dd09bfc31df37332207b0e9c6c58
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1
diff --git a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch 
b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
index a45375290037..464a930f3275 100644
--- a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
@@ -316,7 +316,7 @@
for (p = *head; p; p = p->next) {
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c
-@@ -458,7 +458,7 @@ static struct neighbour *ipv4_neigh_look
+@@ -461,7 +461,7 @@ static struct neighbour *ipv4_neigh_look
else if (skb)
pkey = _hdr(skb)->daddr;
  
diff --git 
a/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch
 
b/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch
index 249a2ce27e05..f5004d3ffcb0 100644
--- 
a/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch
+++ 
b/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch
@@ -60,7 +60,7 @@ Signed-off-by: David S. Miller 
nval = cmpxchg(>tsq_flags, oval, nval);
if (nval != oval)
continue;
-@@ -2183,6 +2183,8 @@ static bool tcp_write_xmit(struct sock *
+@@ -2210,6 +2210,8 @@ static bool tcp_write_xmit(struct sock *
unlikely(tso_fragment(sk, skb, limit, mss_now, gfp)))
break;
  
diff --git 
a/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch
 
b/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch
index 463b9553414c..65013b6aa7f3 100644
--- 
a/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch
+++ 
b/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch
@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller 
 
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -2088,6 +2088,15 @@ static bool tcp_small_queue_check(struct
+@@ -2115,6 +2115,15 @@ static bool tcp_small_queue_check(struct
limit <<= factor;
  
if (atomic_read(>sk_wmem_alloc) > limit) {
diff --git 
a/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch
 
b/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch
index c5bb42d44818..6f2d196687a2 100644
--- 
a/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch
+++ 
b/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller 
 
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -1928,26 +1928,26 @@ static inline void tcp_mtu_check_reprobe
+@@ -1948,26 +1948,26 @@ static bool tcp_can_coalesce_send_queue_
   */
  static int tcp_mtu_probe(struct sock *sk)
  {
diff --git 

[LEDE-DEV] [PATCH 1/3] kernel: bump 4.14 to 4.14.26

[Koen Vandeputte]

- Refreshed all patches

Compile tested on: cns3xxx, imx6
Runtime tested on: cns3xxx, imx6

Signed-off-by: Koen Vandeputte 
---
 include/kernel-version.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index e24c96e9a6a6..d20b2262352d 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -5,12 +5,12 @@ LINUX_RELEASE?=1
 LINUX_VERSION-3.18 = .71
 LINUX_VERSION-4.4 = .119
 LINUX_VERSION-4.9 = .86
-LINUX_VERSION-4.14 = .25
+LINUX_VERSION-4.14 = .26
 
 LINUX_KERNEL_HASH-3.18.71 = 
5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
 LINUX_KERNEL_HASH-4.4.119 = 
4f1f9b7b6b2ee93597239d89bb3b6b60c71ebd8c91d706fadd36f515c68443e6
 LINUX_KERNEL_HASH-4.9.86 = 
a7cf6eb5efcf182f1760fdfc06118eecce5d8c9d82d6945e68fc15db990c6e85
-LINUX_KERNEL_HASH-4.14.25 = 
6dcfbf79c068e51c1b06edb1ce58ddc9ca351f862bf2a144e96106ec3f21e587
+LINUX_KERNEL_HASH-4.14.26 = 
99a466c54261007b984ee149167d89755051dd09bfc31df37332207b0e9c6c58
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst 
-,_,$(subst /,_,$(1)))
-- 
2.7.4


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

[LEDE-DEV] [PATCH 3/3] kernel: bump 4.4 to 4.4.121

[Koen Vandeputte]

- Refreshed all patches
- Only compile-tested

Compile tested on: Gemini

Signed-off-by: Koen Vandeputte 
---
 include/kernel-version.mk  |  4 ++--
 .../patches-4.4/910-unaligned_access_hacks.patch   |  2 +-
 ...w-rejecting-with-source-address-failed-policy.patch | 18 +-
 .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch   | 10 +-
 target/linux/generic/pending-4.4/721-phy_packets.patch |  2 +-
 .../linux/generic/pending-4.4/902-debloat_proc.patch   |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 95103c5ffe7f..7151f0100904 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -3,12 +3,12 @@
 LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .71
-LINUX_VERSION-4.4 = .119
+LINUX_VERSION-4.4 = .121
 LINUX_VERSION-4.9 = .87
 LINUX_VERSION-4.14 = .26
 
 LINUX_KERNEL_HASH-3.18.71 = 
5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
-LINUX_KERNEL_HASH-4.4.119 = 
4f1f9b7b6b2ee93597239d89bb3b6b60c71ebd8c91d706fadd36f515c68443e6
+LINUX_KERNEL_HASH-4.4.121 = 
44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
 LINUX_KERNEL_HASH-4.9.87 = 
7ac9f6af69dc5a7e38bf35cc3fa889e3a4b22504a85f57fdc87734a8abe4c917
 LINUX_KERNEL_HASH-4.14.26 = 
99a466c54261007b984ee149167d89755051dd09bfc31df37332207b0e9c6c58
 
diff --git a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch 
b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
index 72d964df639b..7858abc64b46 100644
--- a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
@@ -359,7 +359,7 @@
for (p = *head; p; p = p->next) {
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c
-@@ -458,7 +458,7 @@ static struct neighbour *ipv4_neigh_look
+@@ -461,7 +461,7 @@ static struct neighbour *ipv4_neigh_look
else if (skb)
pkey = _hdr(skb)->daddr;
  
diff --git 
a/target/linux/generic/pending-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
 
b/target/linux/generic/pending-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
index 4bf34c128e87..c921a079aef3 100644
--- 
a/target/linux/generic/pending-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
+++ 
b/target/linux/generic/pending-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -143,7 +143,7 @@ Signed-off-by: Jonas Gorski 
  static const struct rt6_info ip6_blk_hole_entry_template = {
.dst = {
.__refcnt   = ATOMIC_INIT(1),
-@@ -1898,6 +1915,11 @@ static struct rt6_info *ip6_route_info_c
+@@ -1899,6 +1916,11 @@ static struct rt6_info *ip6_route_info_c
rt->dst.output = ip6_pkt_prohibit_out;
rt->dst.input = ip6_pkt_prohibit;
break;
@@ -155,7 +155,7 @@ Signed-off-by: Jonas Gorski 
case RTN_THROW:
case RTN_UNREACHABLE:
default:
-@@ -2501,6 +2523,17 @@ static int ip6_pkt_prohibit_out(struct n
+@@ -2502,6 +2524,17 @@ static int ip6_pkt_prohibit_out(struct n
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, 
IPSTATS_MIB_OUTNOROUTES);
  }
  
@@ -173,7 +173,7 @@ Signed-off-by: Jonas Gorski 
  /*
   *Allocate a dst for local (unicast / anycast) address.
   */
-@@ -2743,7 +2776,8 @@ static int rtm_to_fib6_config(struct sk_
+@@ -2744,7 +2777,8 @@ static int rtm_to_fib6_config(struct sk_
if (rtm->rtm_type == RTN_UNREACHABLE ||
rtm->rtm_type == RTN_BLACKHOLE ||
rtm->rtm_type == RTN_PROHIBIT ||
@@ -183,7 +183,7 @@ Signed-off-by: Jonas Gorski 
cfg->fc_flags |= RTF_REJECT;
  
if (rtm->rtm_type == RTN_LOCAL)
-@@ -3096,6 +3130,9 @@ static int rt6_fill_node(struct net *net
+@@ -3097,6 +3131,9 @@ static int rt6_fill_node(struct net *net
case -EACCES:
rtm->rtm_type = RTN_PROHIBIT;
break;
@@ -193,7 +193,7 @@ Signed-off-by: Jonas Gorski 
case -EAGAIN:
rtm->rtm_type = RTN_THROW;
break;
-@@ -3375,6 +3412,8 @@ static int ip6_route_dev_notify(struct n
+@@ -3376,6 +3413,8 @@ static int ip6_route_dev_notify(struct n
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski 
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
  #endif
-@@ -3601,6 +3640,17 @@ static int __net_init ip6_route_net_init
+@@ -3602,6 +3641,17 @@ static int __net_init 

[LEDE-DEV] [PATCH 2/2] glibc: update glibc to 2.26+ and switch to download from git

[Hans Dedecker]

Switch glibc to 2.26+ [0] and download the sources from git which will it
make easier to update glibc in the future.

For an overview of the fixed bugs and CVE related fixes in 2.26+ see the
NEWS file [1]

[0] 
https://sourceware.org/git/?p=glibc.git;a=commit;h=d300041c533a3d837c9f37a099bcc95466860e98
[1] 
https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS;h=410f0d163145c1549fb73fdd96568f585b5bf62f;hb=refs/heads/release/2.26/master

Signed-off-by: Xinxing Hu 
Signed-off-by: Hans Dedecker 
---
 toolchain/glibc/common.mk | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk
index 090901e..b10e797 100644
--- a/toolchain/glibc/common.mk
+++ b/toolchain/glibc/common.mk
@@ -9,11 +9,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=glibc
 PKG_VERSION:=2.26
 
-PKG_SOURCE_URL:=@GNU/libc
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=e54e0a934cd2bc94429be79da5e9385898d2306b9eaf3c92d5a77af96190f6bd
-
+PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=d300041c533a3d837c9f37a099bcc95466860e98
+PKG_MIRROR_HASH:=31e90926a1d3093355aa85c04c68b3d109c3dc3d9f80afe50505e864b32ac784
+PKG_SOURCE_URL:=git://sourceware.org/git/glibc.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+
 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_SOURCE_SUBDIR)
 CUR_BUILD_DIR:=$(HOST_BUILD_DIR)-$(VARIANT)
 PATCH_DIR:=$(PATH_PREFIX)/patches
-- 
1.9.1


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

[LEDE-DEV] [PATCH 1/2] glibc: fix applying of patches

[Hans Dedecker]

Commit f4d9d7a removed support for version specific patches; but it also
broke applying of patches in the patches glibc dir.
Fix the issue by setting PATCH_DIR to $(PATH_PREFIX)/patches similar as
musl/common.mk.

Signed-off-by: Xinxing Hu 
Signed-off-by: Hans Dedecker 
---
 toolchain/glibc/common.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk
index 0ffeef0..090901e 100644
--- a/toolchain/glibc/common.mk
+++ b/toolchain/glibc/common.mk
@@ -16,6 +16,7 @@ 
PKG_HASH:=e54e0a934cd2bc94429be79da5e9385898d2306b9eaf3c92d5a77af96190f6bd
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_SOURCE_SUBDIR)
 CUR_BUILD_DIR:=$(HOST_BUILD_DIR)-$(VARIANT)
+PATCH_DIR:=$(PATH_PREFIX)/patches
 
 include $(INCLUDE_DIR)/toolchain-build.mk
 
-- 
1.9.1


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