Drop net-misc/bridge-utils - #4159
Conversation
bridge-utils is deprecated upstream in favor of the bridge utility from iproute2, which Flatcar already ships via sys-apps/iproute2. Remove the package from portage-stable, drop it from the coreos-base/coreos package list and from the portage-stable packages list used by the automated package update workflow. Closes flatcar/Flatcar#638 Signed-off-by: Naveen Hegde <alivestars.tech@gmail.com>
|
@Alivestars04 Do not tag maintainers for reviews like this. This is not the way to operate in this project. If you cannot follow these standards, you will be removed. |
|
Definitely +1 on dropping bridge-utils, because it has been deprecated long time ago. Anyway I will try to run Jenkins CI with this PR. |
dongsupark
left a comment
There was a problem hiding this comment.
I think this PR is ready to merge.
~6 months of promotion from main to stable would be already okay for deprecation period.
| @@ -0,0 +1 @@ | |||
| - Removed the `net-misc/bridge-utils` package. It is deprecated upstream in favor of the `bridge` utility from iproute2, which Flatcar ships through `sys-apps/iproute2`. Use `ip link add ... type bridge` instead of `brctl addbr ...`. | |||
There was a problem hiding this comment.
Can you please add ([Flatcar#638](https://github.com/flatcar/Flatcar/issues/638)) at the end?
- Removed the `net-misc/bridge-utils` package. It is deprecated upstream in favor of the `bridge` utility from iproute2, which Flatcar ships through `sys-apps/iproute2`. Use `ip link add ... type bridge` instead of `brctl addbr ...`. ([Flatcar#638](https://github.com/flatcar/Flatcar/issues/638))
bridge-utilshas been marked deprecated by its upstream maintainers in favor of thebridgeutility from iproute2, which Flatcar already ships viasys-apps/iproute2(currently 6.16.0). Keeping a deprecated package in the image means carrying two Gentoo patches (a musl fix and an AR-variable fix) and an ebuild for tooling that upstream no longer recommends.This removes the package from
portage-stable, drops it from thecoreos-base/coreospackage list, and removes it from theportage-stable-packages-listused by the automated package update workflow, so the updater stops tracking it. Thecoreos-base/coreosrevision symlink is bumped from-r320to-r321so the package is rebuilt.This is a user-visible change:
brctlwill no longer be present in the image. Users invokingbrctlin scripts or Ignition configs need to switch toip link/bridge, e.g.ip link add br0 type bridgeinstead ofbrctl addbr br0. Given that, maintainers may prefer to time this against a specific release — happy to hold or re-target the branch.Closes flatcar/Flatcar#638
How to use
Reviewers can confirm the removal is complete and correctly scoped:
brctlis gone andbridge/ip linkstill create bridges:Testing done
Verified statically in the tree; I have not built an SDK image locally, so the image-level checks below are left to CI.
Confirmed the package existed only at
sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/and was referenced in exactly two live places (coreos-base/coreos/coreos-0.0.1.ebuildand.github/workflows/portage-stable-packages-list):After the change, only the historical changelog entry remains:
Confirmed the replacement is shipped in the same image package list:
Confirmed no other package depends on it. The only
RDEPENDin the removed ebuild wasselinux? ( sec-policy/selinux-brctl ), andsec-policy/selinux-brctlis not present in the tree, so nothing is orphaned.Confirmed the revision-symlink convention by checking the most recent commit to touch this ebuild (
overlay coreos-base/coreos: add erofs-utils), which renamedcoreos-0.0.1-r319.ebuild->-r320.ebuild; this PR follows it with-r320->-r321.Changelog entries added in the respective
changelog/directory (user-facing change, bug fix, security fix, update)Inspected CI output for image differences:
/bootand/usrsize, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc. — will do once CI produces the image diff; expecting/usr/sbin/brctlto be the only binary removed