From 32fc13e9b504273fc146126c6301c34b8fe384b9 Mon Sep 17 00:00:00 2001 From: Naveen Hegde Date: Wed, 29 Jul 2026 11:27:07 +0530 Subject: [PATCH] Drop net-misc/bridge-utils 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 --- .../workflows/portage-stable-packages-list | 1 - .../changes/2026-07-29-drop-bridge-utils.md | 1 + ...1-r320.ebuild => coreos-0.0.1-r321.ebuild} | 0 .../coreos-base/coreos/coreos-0.0.1.ebuild | 1 - .../net-misc/bridge-utils/Manifest | 1 - .../bridge-utils/bridge-utils-1.7.1-r1.ebuild | 56 ------------------- .../files/bridge-utils-1.7.1-musl.patch | 10 ---- ...ubstitute-AR-variable-from-configure.patch | 40 ------------- .../net-misc/bridge-utils/metadata.xml | 15 ----- 9 files changed, 1 insertion(+), 124 deletions(-) create mode 100644 changelog/changes/2026-07-29-drop-bridge-utils.md rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r320.ebuild => coreos-0.0.1-r321.ebuild} (100%) delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/metadata.xml diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 8d3fd56db94..5334d33e39d 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -558,7 +558,6 @@ net-libs/nghttp2 net-libs/ngtcp2 net-libs/rpcsvc-proto -net-misc/bridge-utils net-misc/chrony net-misc/curl net-misc/ethertypes diff --git a/changelog/changes/2026-07-29-drop-bridge-utils.md b/changelog/changes/2026-07-29-drop-bridge-utils.md new file mode 100644 index 00000000000..f65629cb10a --- /dev/null +++ b/changelog/changes/2026-07-29-drop-bridge-utils.md @@ -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 ...`. diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r320.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r321.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r320.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r321.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index e7023163305..71136d2bcd0 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -136,7 +136,6 @@ RDEPEND="${RDEPEND} net-firewall/nftables net-fs/nfs-utils net-fs/cifs-utils - net-misc/bridge-utils net-misc/curl net-misc/iputils net-misc/ntp diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/Manifest deleted file mode 100644 index c3d505c0182..00000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bridge-utils-1.7.1.tar.xz 29632 BLAKE2B 36b8b9c62e88f6f1510acbf23ab8dc5ec41d3bf97eecd274c91771e116650e30b366ded37e65bde061c1e9bc7b19b7eae1e17d4573fcea9fd31892bf6d937515 SHA512 6a3824853bdaa1733c552973e6a5082280facdddc52c3feeb2c8c9375ba9469a5930b559092c9de1a73b464f388f019e147b45ac1e2d10ce8968057779fcd12c diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild deleted file mode 100644 index 139dde86ccb..00000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-info toolchain-funcs - -DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" -HOMEPAGE="https://bridge.sourceforge.net/" -SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="selinux" - -DEPEND="virtual/os-headers" -RDEPEND="selinux? ( sec-policy/selinux-brctl )" - -CONFIG_CHECK="~BRIDGE" -WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel" - -get_headers() { - CTARGET=${CTARGET:-${CHOST}} - dir=/usr/include - tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include - echo "${dir}" -} - -src_prepare() { - local PATCHES=( - "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch - "${FILESDIR}"/${P}-musl.patch #828902 - ) - default - eautoreconf -} - -src_configure() { - # use santitized headers and not headers from /usr/src - local myeconfargs=( - --prefix=/ - --libdir=/usr/$(get_libdir) - --includedir=/usr/include - --with-linux-headers="$(get_headers)" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - emake install DESTDIR="${D}" - dodoc AUTHORS ChangeLog README THANKS \ - doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} - - [ -f "${ED}"/sbin/brctl ] || die "upstream makefile failed to install binary" -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch deleted file mode 100644 index 618811e80b7..00000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libbridge/libbridge.h -+++ b/libbridge/libbridge.h -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch deleted file mode 100644 index 0676d0cc9c7..00000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4dc12feb7b5a0f8f4d27c737513853896e77feea Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Tue, 21 Apr 2020 13:17:33 -0400 -Subject: [PATCH] libbridge: substitute AR variable from configure - -Bug: https://bugs.gentoo.org/717700 -Signed-off-by: Mike Gilbert ---- - configure.ac | 1 + - libbridge/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8b2e2ea..e66f334 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -12,6 +12,7 @@ dnl Checks for programs. - AC_PROG_CC - AC_PROG_INSTALL - AC_PROG_RANLIB -+AC_CHECK_TOOL([AR], [ar]) - - dnl Checks for header files. - AC_HEADER_STDC -diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in -index 7932bfe..bd55e9b 100644 ---- a/libbridge/Makefile.in -+++ b/libbridge/Makefile.in -@@ -1,7 +1,7 @@ - - KERNEL_HEADERS=-I@KERNEL_HEADERS@ - --AR=ar -+AR=@AR@ - RANLIB=@RANLIB@ - - CC=@CC@ --- -2.26.1 - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/metadata.xml deleted file mode 100644 index 2dd80ab1972..00000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - robbat2@gentoo.org - - - base-system@gentoo.org - Gentoo Base System - - - cpe:/a:kernel:bridge-utils - bridge - -