From ebef2b816ea23500dc707e68851f277faa7702f5 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 19 Oct 2022 10:20:59 +0200 Subject: [PATCH] net-misc/bridge-utils: Sync with Gentoo It's from Gentoo commit f479cc80ee08a51b73e4c8aa50421e4ccf761bd7. --- .../net-misc/bridge-utils/Manifest | 1 - .../bridge-utils/bridge-utils-1.6.ebuild | 55 ------------------- .../bridge-utils/bridge-utils-1.7.1-r1.ebuild | 2 +- .../bridge-utils/bridge-utils-1.7.1.ebuild | 55 ------------------- 4 files changed, 1 insertion(+), 112 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.6.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild 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 index 08ad577c85..c3d505c018 100644 --- 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 @@ -1,2 +1 @@ -DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02 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.6.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.6.ebuild deleted file mode 100644 index 273624c416..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.6.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools linux-info toolchain-funcs - -DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" -HOMEPAGE="http://bridge.sourceforge.net/" -#SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz" -SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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 - ) - 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 TODO \ - 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/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 index 85a58f61fc..d668c78e80 100644 --- 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 @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="selinux" DEPEND="virtual/os-headers" diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild deleted file mode 100644 index b3ea6ff1a7..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 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="http://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 ~ia64 ~mips ppc ppc64 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 - ) - 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" -}