commit: 666d20fb9ecd5e0fdb052fbfd3b0b895825d8482 Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de> AuthorDate: Fri Jan 15 17:13:43 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Fri Jan 15 17:13:43 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=666d20fb
dev-util/xdp-tools: Bump to v1.1.0 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de> dev-util/xdp-tools/Manifest | 1 + .../xdp-tools/files/xdp-tools-1.1.0-install.patch | 38 +++++++++++++ dev-util/xdp-tools/xdp-tools-1.1.0.ebuild | 66 ++++++++++++++++++++++ 3 files changed, 105 insertions(+) diff --git a/dev-util/xdp-tools/Manifest b/dev-util/xdp-tools/Manifest index 87bfe52b..facab188 100644 --- a/dev-util/xdp-tools/Manifest +++ b/dev-util/xdp-tools/Manifest @@ -1 +1,2 @@ DIST xdp-tools-1.0.1.tar.gz 150775 BLAKE2B 5b984aa20a125555d07b46c5f83f9f02f22f85130eb2d64c8808965fdc1c0903092a3de3c72c81360063b29269237cf94d74c712a88bbf0f30e239de0a499043 SHA512 918323b7ae85890c35403eab437491ad32df52f32c8abf3e698fefd09bfd445c6335730ca48fb830608a3baeb1f686c644ce992b90d5d3e1b2c8caf97832237d +DIST xdp-tools-1.1.0.tar.gz 157577 BLAKE2B 219219898cf83c72dd07ef64b3eda889ca2825ae9f21ab7714020fbc467ef37a4df978ee0c7eef45c1ebd43370ff71f43d1dab0d11507d80de3cbf39d45cab16 SHA512 31165f932dcdf8181c012500e2dc27118860d8733932ab253d02dd07a436c0ef1f5bc3253e6def716b10ff50b37854bb5e9679cc38adec27c3366823c8656232 diff --git a/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch new file mode 100644 index 00000000..702d555c --- /dev/null +++ b/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch @@ -0,0 +1,38 @@ +From 1de19829622cf394a6154834955379e7e45e0cb8 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach <[email protected]> +Date: Fri, 10 Apr 2020 15:39:13 +0200 +Subject: [PATCH] lib: xdp: make: Fix library install + +Two problems: + + * install doesn't handle symlinks + * static libs are installed + +Fix it. + +Signed-off-by: Kurt Kanzenbach <[email protected]> +--- + lib/libxdp/Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile +index f45cc93c3076..2efe6bbea67a 100644 +--- a/lib/libxdp/Makefile ++++ b/lib/libxdp/Makefile +@@ -49,12 +49,11 @@ install: all + $(Q)install -d -m 0755 $(DESTDIR)$(BPF_OBJECT_DIR) + $(Q)install -m 0644 $(LIB_HEADERS) $(DESTDIR)$(HDRDIR)/ + $(Q)install -m 0644 $(PC_FILE) $(DESTDIR)$(LIBDIR)/pkgconfig/ +- $(Q)install -m 0755 $(SHARED_LIBS) $(STATIC_LIBS) $(DESTDIR)$(LIBDIR) ++ $(Q)cp -a $(SHARED_LIBS) $(DESTDIR)$(LIBDIR) + $(Q)install -m 0755 $(XDP_OBJS) $(DESTDIR)$(BPF_OBJECT_DIR) + $(if $(MAN_FILES),$(Q)install -m 0755 -d $(DESTDIR)$(MANDIR)/man3) + $(if $(MAN_FILES),$(Q)install -m 0644 $(MAN_FILES) $(DESTDIR)$(MANDIR)/man3) + +- + $(OBJDIR)/libxdp.a: $(STATIC_OBJS) + $(QUIET_LINK)$(AR) rcs $@ $^ + +-- +2.26.2 + diff --git a/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild new file mode 100644 index 00000000..0f16f708 --- /dev/null +++ b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info llvm multilib + +DESCRIPTION="Utilities and example programs for use with XDP" +HOMEPAGE="https://github.com/xdp-project/xdp-tools"; +SRC_URI="https://github.com/xdp-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" + +# skip strip for eBPF object files +RESTRICT="strip" + +# skip QA check(s) for eBPF samples +QA_EXECSTACK="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o" +QA_PREBUILT="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o" + +# XDP should be enabled +CONFIG_CHECK="~XDP_SOCKETS" + +LLVM_MAX_SLOT=10 + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + >=dev-libs/libbpf-0.0.7 + net-libs/libpcap + sys-libs/zlib + virtual/libelf +" +DEPEND="${RDEPEND} + sys-devel/clang:10 + sys-devel/llvm:10 +" + +PATCHES=( "${FILESDIR}/${P}-install.patch" ) + +pkg_setup() { + llvm_pkg_setup +} + +src_configure() { + ./configure +} + +src_compile() { + emake \ + PRODUCTION=1 \ + DYNAMIC_LIBXDP=1 \ + FORCE_SYSTEM_LIBBPF=1 \ + PREFIX=/usr \ + LIBDIR="/usr/$(get_libdir)" all +} + +src_install() { + emake PREFIX=/usr LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install + doman xdp-filter/xdp-filter.8 + doman xdp-dump/xdpdump.8 + doman xdp-loader/xdp-loader.8 +}
