[OpenWrt-Devel] OpenWrt -> LEDE git tree merge

Mathias Kresin dev at kresin.me
Mon Oct 23 02:01:38 EDT 2017


22.10.2017 22:56, Hauke Mehrtens:
> On 10/22/2017 10:28 PM, Zoltan HERPAI wrote:
>> Hi,
>>
>> Zoltan HERPAI wrote:
>>> Hi Hauke,
>>>
>>> On Sun, 22 Oct 2017, Hauke Mehrtens wrote:
>>>
>>>> I am working on merging the missing commits from the OpenWrt git
>>>> repository into the LEDE repository.
>>>>
>>>> Here is a list of all non merge commits from the OpenWrt git repository
>>>> and their corresponding LEDE commit IDs:
>>>> https://github.com/hauke/openwrt-lede-merge/blob/master/commits.csv
>>>>
>>>> I only looked into the non merge commits and assumed that commits with
>>>> the same title are the same, if this is wrong please point me to some
>>>> place where this causes problems.
>>>>
>>>> I used this script to generate the csv table:
>>>> https://github.com/hauke/openwrt-lede-merge/blob/master/openwrt-merge.py
>>>>
>>>> The bigger topics I see are:
>>>> * addition of SoCFPGA target with kernel 4.4 support
>>>> * Will someone port this to kernel 4.9 or provide me with hardware so I
>>>>    can try to port this and test it?
>>>> * There are some commits without a Signed-off-by line, I will contact
>>>>   the authors.
>>>> * The realview target was removed from LEDE, but it got an update to
>>>>   kernel 4.4 in OpenWrt, how do we want to handle this? Does anyone need
>>>>   the realview target?
>>>
>>> As discussed earlier, I've prepared manually a list of commits that
>>> are missing from LEDE. I was about to send:
>>>
>>>   - a set of patches that probably don't need any discussion and can be
>>> merged right away,
>>>   - a set of patches that are RFC, and should be discussed.
>>>
>>> Let me know if that should still happen.
>> The series has been sent as discussed on irc. I don't recall any more
>> required - also based on checking the CSV, thanks for prepping that.
>>
>> The RFC patches/PRs are:
>>
>> ----

...

>> - https://github.com/openwrt/openwrt/pull/312
>> ar71xx: add support for Zsun WiFi SD Card Reader
> 
> This is missing a Singed-of-by line

A few days ago a similar PR was created (and unfortunately already 
closed): https://github.com/lede-project/source/pull/1422.

The OpenWrt PR has a lot of issues, like enabling unencrypted wireless 
for the whole target.

> 
>> https://github.com/openwrt/openwrt/commit/4f997727aef0603f02e9320ba787ea1b894747c0
>>
>> lantiq: td-w8980: fix failsafe mode via ethernet.
> 
> This looks correct to me, but I do not have this board.

This one isn't required. The wrong interface in failsafe was fixed for 
the whole target with f080cfab72d8801856fa01f0476f1fc9b920a9d9.

Mathias
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


More information about the openwrt-devel mailing list