Drop net-misc/bridge-utils - #4159
Open
Alivestars04 wants to merge 1 commit into
Open
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>
Author
This file contains hidden or 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
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.
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