[RFC]routing: merge openwrt-routing/packages with full history #9419
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
batman-adv must make sure that ether_setup is already declared via linux/netdevice.h before the preprocessor can patch the use of it in batman-adv. Otherwise it is tried to also patch the declaration of ether_setup. Fixes: 8da2f5c ("batman-adv: upgrade package to latest release 2017.2") Signed-off-by: Sven Eckelmann <sven@narfation.org>
batman-adv: Prevent FTBFS when redefining ether_setup
Signed-off-by: Sven Eckelmann <sven@narfation.org>
batman-adv: Fix conflicts with compat-wireless backports-4.14-rc1
* support latest kernels (3.2 - 4.14) * coding style cleanups and refactoring * bugs squashed: - fix TT sync flag inconsistencies - ignore invalid throughput values from wifi interfaces Signed-off-by: Sven Eckelmann <sven@narfation.org>
* bugs squashed: - Fix error messages on traceroute send failures Signed-off-by: Sven Eckelmann <sven@narfation.org>
* reduction of memory usage when using --update-command Signed-off-by: Sven Eckelmann <sven@narfation.org>
batman-adv 2017.3
This patch bumps olsr version from 0.9.6.1 to 0.9.6.2 One major bugfix comes with the newer version, which is quite relevant for our Freifunk mesh network: the feature LinkQualityMult was not working in 0.9.6.1 and got fixed in the new version. Tested on 92 productive mesh nodes running current LEDE trunk . Signed-off-by: Thomas Huehn <thomas@net.t-labs.tu-berlin.de>
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
Build timestamp prevents reproducible builds [0]. [0] https://reproducible-builds.org/docs/timestamps/ Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
The build id contains the build timestamp by default. Make this field optional. Build timestamp prevents reproducible builds [0]. Thanks to the debian project for the patch. [0] https://reproducible-builds.org/docs/timestamps/ Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
[olsr] Bump olsr version to 0.9.6.2
* support latest kernels (3.2 - 4.15) * coding style cleanups and refactoring * documentation cleanup * bugs squashed: - avoid spurious warnings from bat_v neigh_cmp implementation - fix check of gateway availability in B.A.T.M.A.N. V - fix locking for bidirectional TQ check counters - remove leak of stack bits in fragmentation header priority Signed-off-by: Sven Eckelmann <sven@narfation.org>
* synchronization of batman-adv netlink header * coding style cleanups and refactoring * documentation cleanup * bugs squashed: - improve error handling for libnl related errors - add checks for various allocation errors Signed-off-by: Sven Eckelmann <sven@narfation.org>
* synchronization of batman-adv netlink header * coding style cleanups and refactoring * documentation cleanup * bugs squashed: - only query debugfs when netlink failed - handle allocation errors in hashtable iterator Signed-off-by: Sven Eckelmann <sven@narfation.org>
smcroute: make build id optional
olsrd: pud: does not depend on ncurses
OONF 0.14.1-1
mrd6: remove build timestamp
batman-adv 2017.4
Enhancements and bug fixes including: - Developed and Tested against Bird-1.6.3 - New LUCI scripts (Logs, Functions and Filters) - Enhanced UX and less use of Terminal for daily management - Improved UX by adding extra information for the administrator - Refactor DOCN and include missing parts. - Code cleaning and refactoring - New DOCN-specific [Repository](https://github.com/eloicaso/bgp-bmx6-bird-docn)
mcproxy: remove pedantic flag to allow compilation with musl
Signed-off-by: Alexander Krupenkin <mail@akru.me>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
nodogsplash2: change configuration defaults Changes: * set default to NoDogsplash enabled as rest of config should now be safe and is possible to SSH to router to stop NDS if needed * change clientidletimeout to 120 minutes (2 hours) * add clientforcetimeout set to 1440 minutes (24 hours) * comment out the two provided example authenticated_users block lines * add list authenticated_users 'allow all' * comment original list authenticated_users allow... entries and leave them as examples * set preauth default to no use remote DNS. All devices used at a public wifi venues should be configured for DHCP. To force the use of the local DNS server makes DNS tunnelling very inefficient if not unusable on a typical OpenWrt device. * set fw_mark settings for compatibility with other OpenWrt packages
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
* coding style cleanups and refactoring * add multicast_fanout setting subcommand * implement netlink based support for remaining sysfs-only features * drop support for deprecated log command support * remove non-netlink support for translating MAC addresses to originators Signed-off-by: Sven Eckelmann <sven@narfation.org>
* support latest kernels (3.16 - 5.2) * coding style cleanups and refactoring * implement multicast-to-unicast support for multiple targets * deprecate sysfs support and make it optional * refresh DAT entry timeouts on incoming ARP Replies * bugs squashed: - fix multicast tt/tvlv worker locking - drop roam tvlv handler when unregistering mesh interface Signed-off-by: Sven Eckelmann <sven@narfation.org>
batman-adv 2019.2
batmand: whitespace
The state of slave interfaces are handled differently depending on whether the interface is up or not. All active interfaces (IFF_UP) will transmit OGMs. But for B.A.T.M.A.N. IV, also non-active interfaces are scheduling (low TTL) OGMs on active interfaces. The code which setups and schedules the OGMs must therefore already be called when the interfaces gets added as slave interface and the transmit function must then check whether it has to send out the OGM or not on the specific slave interface. But v2016.3 moved the setup code from the enable function to the activate function. The latter is called either when the added slave was already up when batadv_hardif_enable_interface processed the new interface or when a NETDEV_UP event was received for this slave interfac. As result, each NETDEV_UP would schedule a new OGM worker for the interface and thus OGMs would be send a lot more than expected. Fixes: 549909f ("batman-adv: upgrade package to latest release 2016.3") Reported-by: Linus Lüssing <linus.luessing@c0d3.blue> Signed-off-by: Sven Eckelmann <sven@narfation.org>
batman-adv: Fix duplicated OGMs on NETDEV_UP
batctl currently supports settings which are either mesh interface or vlan specific. But B.A.T.M.A.N. V introduced two additional settings which are hard (slave) interface specific. To support these, an additional command prefix called hardif is implemented for some sysfs commands: $ batctl -m bat0 hardif eth0 .. The usable commands with that are: * elp_interval * throughput_override Signed-off-by: Sven Eckelmann <sven@narfation.org>
B.A.T.M.A.N. V support additional settings which are hardif specific. The batadv_hardif proto has to expose them to allow automatic configuration. The default configuration would be: config interface 'bat0_hardif_eth0' option proto 'batadv_hardif' option master 'bat0' option ifname 'eth0' option mtu '1536' option 'elp_interval' 500 # string like '1mbit' is accepted instead of kbit for override option 'throughput_override' '0' Signed-off-by: Sven Eckelmann <sven@narfation.org>
The ap_isolation setting only supports boolean values. So setting an empty string as ap_isolation is not supported by batctl. Fixes: f5205d7 ("batman-adv: upgrade package to latest release 2014.2.0") Signed-off-by: Sven Eckelmann <sven@narfation.org>
batman-adv: Add support for B.A.T.M.A.N. V hardif settings
uClibc-ng also defines __GLIBC__, which messes up the check. Signed-off-by: Rosen Penev <rosenp@gmail.com>
Is not supported by node. Signed-off-by: Rosen Penev <rosenp@gmail.com>
Build fixes
bird1: update to version 1.6.6
bird2: Bump to v2.0.4
https://help.github.com/en/articles/about-git-subtree-merges git pull git checkout -b merge-test git remote add -f openwrt-routing https://github.com/openwrt-routing/packages.git git merge -s ours --no-commit --allow-unrelated-histories openwrt-routing/master git read-tree --prefix=routing/ -u openwrt-routing/master Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
This was referenced Jul 7, 2019
|
Fine with me I guess... |
|
From what I understand nobody is against granting the current maintainers of openwrt-routing commit access to packages.git. So I'd be fine merging this and provide fixes later on. |
|
You moved the packages into |
|
Please don't do this, packages should be reviewed induvidually. |
|
Well, then we might be back at #9408 again ... |
|
That is easiest, yes. Review is needed. ahcpd for example, still uses PKG_MD5SUM. That's not acceptable. |
|
This PR was more to show how we can keep full history, I prefer to keep history, but I'm fine either way |
|
I also prefer to keep history. But since polishing packages is required, I think we just have to move stuff package-wise. In this process, one might keep history or not. |
|
I have updated #9408 to serve as an example and nucleation site for a decision. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
merge commit: 80bfaa7
https://help.github.com/en/articles/about-git-subtree-merges
git pull
git checkout -b merge-test
git remote add -f openwrt-routing https://github.com/openwrt-routing/packages.git
git merge -s ours --no-commit --allow-unrelated-histories openwrt-routing/master
git read-tree --prefix=routing/ -u openwrt-routing/master