I made a mistake merge. Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.
I reconstructed the "desired" state of staging-next tree by:
- checking out the last commit of the problematic range: 4effe769e2
- `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
merge commit and its revert from that range (while keeping
reapplication from 4effe769e2)
- merging the last unaffected staging-next commit (803ca85c20)
- fortunately no other commits have been pushed to staging-next yet
- applying a diff on staging-next to get it into that state
"The former date based internal versioning (snapshot) is replaced by the
regular version numbering which corresponds to the kernel version." [0]
File changes (additions/removals):
+share/man/man8/ip-mptcp.8.gz
+share/man/man8/tc-gate.8.gz
[0]: https://marc.info/?l=linux-netdev&m=159681449423365
"As usual lots of small fixes, across many utilities. Several qdisc now
have more parameters available. Devlink get most of the fixes." [0]
File changes (additions/removals):
+share/bash-completion/completions/devlink
+share/man/man8/devlink-dpipe.8.gz
+share/man/man8/tc-ct.8.gz
[0]: https://marc.info/?l=linux-netdev&m=159115579900638
They will be installed now and we can provide $HOSTCC for
cross-compilation.
New files:
+lib/tc/experimental.dist
+lib/tc/normal.dist
+lib/tc/pareto.dist
+lib/tc/paretonormal.dist
Note: The distributions are generated in a reproducible way.
Co-Authored-By: Benjamin Saunders <ben.e.saunders@gmail.com>
"Not a lot of changes in this release, most are related to fixing output
formatting and documentation." [0]
File changes (additions/removals):
+share/man/man8/tc-ets.8.gz
+share/man/man8/tc-fq_pie.8.gz
nix path-info -S:
5.5.0 51509616
5.6.0 51528680
[0]: https://marc.info/?l=linux-netdev&m=158585608413591
"Most of the fixes have been related to single (and json) formatting.
Thank you to Aya, Jakub, Jiri, and Ron for the work to get devlink
improved." [0]
File changes (additions/removals):
None
nix path-info -S:
5.4.0 46705272
5.5.0 46726136
[0]: https://marc.info/?l=linux-netdev&m=158013364425477
"Not a lot of changes in this release, most are related to fixing output
formatting and documentation." [0]
File changes (additions/removals):
+share/man/man8/devlink-trap.8.gz
nix path-info -S:
5.3.0 46078816
5.4.0 46095296
[0]: https://www.spinics.net/lists/netdev/msg615781.html
"Not a lot of big new features in this release. Just the usual array of
small fixes across the board." [0]
File changes:
None
nix path-info -S:
5.1.0 46637048
5.2.0 46627312
[0]: https://www.spinics.net/lists/netdev/msg584562.html
"Most of the new features for this release are in the devlink and rdma utilities.
And most of the bug fixes are in fixing the output format glitches
that resulted from converting most of the tools to have JSON
output." [0]
File changes:
+share/man/man8/devlink-health.8.gz
nix path-info -S:
5.0.0 46661416
5.1.0 46677880
[0]: https://www.spinics.net/lists/netdev/msg569915.html
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
"Update to iproute2 utility to support new features in Linux 4.20.
This release is mostly small fixes but there are several changes
related to ip neigh support for offloaded entries." [0]
File changes:
+share/man/man8/tc-taprio.8.gz
nix path-info -S:
4.19.0 42681224
4.20.0 42714224
[0]: https://www.spinics.net/lists/netdev/msg543288.html
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/iproute2/versions.
These checks were done:
- built on NixOS
- Warning: no invocation of /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/arpd had a zero exit code or showed the expected version
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/bridge passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/ctstat passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/genl passed the binary check.
- Warning: no invocation of /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/ifcfg had a zero exit code or showed the expected version
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/ifstat passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/ip passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/lnstat passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/nstat passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/routef passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/routel passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/rtacct passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/rtmon passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/rtpr passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/rtstat passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/ss passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/tc passed the binary check.
- 15 of 17 passed binary check by having a zero exit code.
- 0 of 17 passed binary check by having the new version present in output.
- found 4.17.0 with grep in /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0
- directory tree listing: https://gist.github.com/034a57ce83d6f871566054eab222cf18
- du listing: https://gist.github.com/19da8b14a2528b5fc8dca94a8f14216e
When doing source routing/multihoming, it's practical to give names to routing
tables. The absence of the rt_table file in /etc make this impossible.
This patch recreates these files on rebuild so that they can be modified
by the user see NixOS#38638.
iproute2 is modified to look into config.networking.iproute2.confDir instead of
/etc/iproute2.
Doesn't eliminate glibc dep, somehow
a dependency on host's "db" leaks,
but it's a start.
Also don't attempt to build unused 'netem' tools,
avoiding need to use HOSTCC.
This has been broken nearly all the time due to the patches needed to
iproute2 not being compatible with the newer versions we have been
shipping. As long as Ubuntu does not manage to upstream these changes
so they are maintained with iproute2 and we don't have a maintainer
updating these patches to new iproute2 versions it is not feasible to
have this available.
