summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-11-29 12:06:32 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-11-29 12:06:32 +0000
commitec45a75b18ed0fe0dcb333d74995566bbaeafc67 (patch)
treef5c223dd50a265d370bcf7a0cb0f3c43afc2dbd3
parent2021-11-29 10:36:39 UTC (diff)
parentdev-libs/libbpf: drop 0.4.0 (diff)
downloadgentoo-ec45a75b18ed0fe0dcb333d74995566bbaeafc67.tar.gz
gentoo-ec45a75b18ed0fe0dcb333d74995566bbaeafc67.tar.bz2
gentoo-ec45a75b18ed0fe0dcb333d74995566bbaeafc67.zip
Merge updates from master
-rw-r--r--dev-libs/libbpf/Manifest1
-rw-r--r--dev-libs/libbpf/libbpf-0.4.0.ebuild62
-rw-r--r--dev-util/bpftool/Manifest2
-rw-r--r--dev-util/bpftool/bpftool-5.15.3.ebuild (renamed from dev-util/bpftool/bpftool-5.15.2.ebuild)0
4 files changed, 1 insertions, 64 deletions
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index da6ed9ecbf91..f5a32a29f9f5 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,2 +1 @@
-DIST libbpf-0.4.0.tar.gz 1015782 BLAKE2B f3bb1a5b1808d30612d9d3852400b71cb5d2ba4c31a177dd72b1f6060bc1d97f8d4ea7bb071a1ae2c5e94e3a4745593a0cc6b8ab6e56288e6cfb046d6de43717 SHA512 5d247f724f0dd3b2dadcc1ac10026ac57d3029b9dd7eb2831e282c58a4143042ef024170781139d89d85c4e9a3849b9ec0d3604a00bb3433be7622682b6dabc1
DIST libbpf-0.5.0.tar.gz 815083 BLAKE2B 9097d808f03cbbe61cd59b24347075e2937603f51350f83f8897123900c911392d7545af8135f39f749132c6518296f1a4d22d37c0c7b4371631f5c63a0dd9ac SHA512 3c578d3e6e93a306a1f182978e54f35fec8acfa51fad5d7de72c5003f10c266d7474e82d6dd045311fcaf8c18aa8cebe64a3336a458a9ea477e5a58e5111dd85
diff --git a/dev-libs/libbpf/libbpf-0.4.0.ebuild b/dev-libs/libbpf/libbpf-0.4.0.ebuild
deleted file mode 100644
index 438a4a1415ec..000000000000
--- a/dev-libs/libbpf/libbpf-0.4.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} =~ [9]{4,} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
-else
- SRC_URI="https://github.com/libbpf/libbpf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-S="${WORKDIR}/${P}/src"
-
-HOMEPAGE="https://github.com/libbpf/libbpf"
-DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/${PV}"
-IUSE="+static-libs"
-
-COMMON_DEPEND="
- virtual/libelf
-"
-DEPEND="
- ${COMMON_DEPEND}
- sys-kernel/linux-headers
-"
-RDEPEND="
- ${COMMON_DEPEND}
-"
-
-PATCHES=(
- "${FILESDIR}/libbpf-9999-paths.patch"
-)
-
-src_compile() {
- append-cflags -fPIC
- emake \
- BUILD_SHARED=y \
- LIBSUBDIR="$(get_libdir)" \
- CC="$(tc-getCC)" \
- AR="$(tc-getAR)" \
- V=1
-}
-
-src_install() {
- emake \
- BUILD_SHARED=y \
- LIBSUBDIR="$(get_libdir)" \
- DESTDIR="${D}" \
- install install_uapi_headers
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins ${PN}.pc
-
- if ! use static-libs; then
- find "${D}" -name '*.a' -delete || die
- fi
-}
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index e7b095e24bd6..bf58d97ab0c5 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,4 @@
DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST patch-5.14.14.xz 528644 BLAKE2B 3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f SHA512 258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
-DIST patch-5.15.2.xz 17244 BLAKE2B 769ef83b6613d865b420d048c25ac1df4c2f88f7ae580b373f874d312720bad877e561756943c9833535a94e5621922bba24cb1b804a1540f2e67cfa23f1a1aa SHA512 5f0123bdc7c9875e7b3f02a89496a8a1e0808d77dc58fb725e250d93d69510a1ef6462cfb38cb38e78e20ca34fd7446f58327cad5e67fc68ec36d15777048edf
+DIST patch-5.15.3.xz 290732 BLAKE2B 62544d1c3187321db6b2dfc7f1d910ddbcfc2b9d2977087d0e1fba12dde33df2d74ea62ced1646243db68a8d386b22bc5c80a955c1e65e77084b06e224586d93 SHA512 cf8b69a3aa725e0ebbe767ac28b7b99de53ee2436a6883e54ee330d17bbdb4d88c147ef1082c3c02a20649ecdc1e363961d9b210e56018c92daff7b889ff2db5
diff --git a/dev-util/bpftool/bpftool-5.15.2.ebuild b/dev-util/bpftool/bpftool-5.15.3.ebuild
index e3fa3487cfe7..e3fa3487cfe7 100644
--- a/dev-util/bpftool/bpftool-5.15.2.ebuild
+++ b/dev-util/bpftool/bpftool-5.15.3.ebuild