| 1 |
commit: 27d4ad234e68205110bfc7b70044867d06fc3c2d |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 3 11:16:22 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 3 11:16:22 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=27d4ad23 |
| 7 |
|
| 8 |
dev-util/xdp-tools: moved to net-libs/xdp-tools::gentoo |
| 9 |
|
| 10 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-util/xdp-tools/Manifest | 1 - |
| 13 |
.../xdp-tools/files/xdp-tools-1.2.0-install.patch | 23 ------- |
| 14 |
.../xdp-tools/files/xdp-tools-1.2.0-readelf.patch | 51 ---------------- |
| 15 |
dev-util/xdp-tools/metadata.xml | 15 ----- |
| 16 |
dev-util/xdp-tools/xdp-tools-1.2.0.ebuild | 70 ---------------------- |
| 17 |
profiles/updates/4Q-2021 | 1 + |
| 18 |
6 files changed, 1 insertion(+), 160 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-util/xdp-tools/Manifest b/dev-util/xdp-tools/Manifest |
| 21 |
deleted file mode 100644 |
| 22 |
index 5ecf7cd4b..000000000 |
| 23 |
--- a/dev-util/xdp-tools/Manifest |
| 24 |
+++ /dev/null |
| 25 |
@@ -1 +0,0 @@ |
| 26 |
-DIST xdp-tools-1.2.0.tar.gz 233676 BLAKE2B 488bd24c5b0c25cb90cc434c0d7cecaf0cf2818d949008fabf4a1245f773e1a1e7a6520c4155df5a6364b0cc8ce2ae49b7b428209b762ecd11f9d6adc10cc57b SHA512 484e5aed6d695665e9e7edec8033b6034281fb215c758a8a8600b5b2215c7decb538efbafa4204306497197a329c3ad7c51beb33717fbe0296a345a1aca8c0a9 |
| 27 |
|
| 28 |
diff --git a/dev-util/xdp-tools/files/xdp-tools-1.2.0-install.patch b/dev-util/xdp-tools/files/xdp-tools-1.2.0-install.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index a02fb50f1..000000000 |
| 31 |
--- a/dev-util/xdp-tools/files/xdp-tools-1.2.0-install.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,23 +0,0 @@ |
| 34 |
-From 1de19829622cf394a6154834955379e7e45e0cb8 Mon Sep 17 00:00:00 2001 |
| 35 |
-From: Kurt Kanzenbach <kurt@×××××××××××××.de> |
| 36 |
-Date: Fri, 10 Apr 2020 15:39:13 +0200 |
| 37 |
-Subject: [PATCH] lib: xdp: make: Don't install static libs |
| 38 |
- |
| 39 |
-Don't install static libs. |
| 40 |
- |
| 41 |
-Signed-off-by: Kurt Kanzenbach <kurt@×××××××××××××.de> |
| 42 |
---- |
| 43 |
- lib/libxdp/Makefile | 2 +- |
| 44 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 45 |
- |
| 46 |
---- a/lib/libxdp/Makefile |
| 47 |
-+++ b/lib/libxdp/Makefile |
| 48 |
-@@ -49,7 +49,7 @@ install: all |
| 49 |
- $(Q)install -d -m 0755 $(DESTDIR)$(BPF_OBJECT_DIR) |
| 50 |
- $(Q)install -m 0644 $(LIB_HEADERS) $(DESTDIR)$(HDRDIR)/ |
| 51 |
- $(Q)install -m 0644 $(PC_FILE) $(DESTDIR)$(LIBDIR)/pkgconfig/ |
| 52 |
-- $(Q)cp -fpR $(SHARED_LIBS) $(STATIC_LIBS) $(DESTDIR)$(LIBDIR) |
| 53 |
-+ $(Q)cp -fpR $(SHARED_LIBS) $(DESTDIR)$(LIBDIR) |
| 54 |
- $(Q)install -m 0755 $(XDP_OBJS) $(DESTDIR)$(BPF_OBJECT_DIR) |
| 55 |
- $(if $(MAN_FILES),$(Q)install -m 0755 -d $(DESTDIR)$(MANDIR)/man3) |
| 56 |
- $(if $(MAN_FILES),$(Q)install -m 0644 $(MAN_FILES) $(DESTDIR)$(MANDIR)/man3) |
| 57 |
|
| 58 |
diff --git a/dev-util/xdp-tools/files/xdp-tools-1.2.0-readelf.patch b/dev-util/xdp-tools/files/xdp-tools-1.2.0-readelf.patch |
| 59 |
deleted file mode 100644 |
| 60 |
index 9566c27b8..000000000 |
| 61 |
--- a/dev-util/xdp-tools/files/xdp-tools-1.2.0-readelf.patch |
| 62 |
+++ /dev/null |
| 63 |
@@ -1,51 +0,0 @@ |
| 64 |
-From: Kurt Kanzenbach <kurt@×××××××××××××.de> |
| 65 |
-Subject: lib: xdp: make: Fix hardcoded readelf |
| 66 |
- |
| 67 |
-Don't hardcode readelf. Allow to reuse something else. |
| 68 |
- |
| 69 |
-Signed-off-by: Kurt Kanzenbach <kurt@×××××××××××××.de> |
| 70 |
---- |
| 71 |
- lib/libxdp/Makefile | 10 +++++----- |
| 72 |
- 1 file changed, 5 insertions(+), 5 deletions(-) |
| 73 |
- |
| 74 |
---- a/lib/libxdp/Makefile |
| 75 |
-+++ b/lib/libxdp/Makefile |
| 76 |
-@@ -26,7 +26,7 @@ TEMPLATED_SOURCES := xdp-dispatcher.c |
| 77 |
- |
| 78 |
- CFLAGS += -I$(HEADER_DIR) -I$(LIB_DIR)/util |
| 79 |
- BPF_CFLAGS += -I$(HEADER_DIR) |
| 80 |
-- |
| 81 |
-+READELF ?= readelf |
| 82 |
- |
| 83 |
- ifndef BUILD_STATIC_ONLY |
| 84 |
- SHARED_LIBS := $(OBJDIR)/libxdp.so \ |
| 85 |
-@@ -89,12 +89,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DE |
| 86 |
- |
| 87 |
- XDP_IN_SHARED := $(SHARED_OBJDIR)/libxdp.o $(SHARED_OBJDIR)/xsk.o |
| 88 |
- |
| 89 |
--GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(XDP_IN_SHARED) | \ |
| 90 |
-+GLOBAL_SYM_COUNT = $(shell $(READELF) -s --wide $(XDP_IN_SHARED) | \ |
| 91 |
- cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ |
| 92 |
- sed 's/\[.*\]//' | \ |
| 93 |
- awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ |
| 94 |
- sort -u | wc -l) |
| 95 |
--VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OBJDIR)/libxdp.so | \ |
| 96 |
-+VERSIONED_SYM_COUNT = $(shell $(READELF) --dyn-syms --wide $(OBJDIR)/libxdp.so | \ |
| 97 |
- grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | sort -u | wc -l) |
| 98 |
- |
| 99 |
- check: check_abi |
| 100 |
-@@ -106,12 +106,12 @@ check_abi: $(OBJDIR)/libxdp.so |
| 101 |
- "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \ |
| 102 |
- "Please make sure all symbols are" \ |
| 103 |
- "versioned in $(VERSION_SCRIPT)." >&2; \ |
| 104 |
-- readelf -s --wide $(XDP_IN_SHARED) | \ |
| 105 |
-+ $(READELF) -s --wide $(XDP_IN_SHARED) | \ |
| 106 |
- cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ |
| 107 |
- sed 's/\[.*\]//' | \ |
| 108 |
- awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ |
| 109 |
- sort -u > $(OUTPUT)libxdp_global_syms.tmp; \ |
| 110 |
-- readelf --dyn-syms --wide $(OUTPUT)libxdp.so | \ |
| 111 |
-+ $(READELF) --dyn-syms --wide $(OUTPUT)libxdp.so | \ |
| 112 |
- grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | \ |
| 113 |
- sort -u > $(OUTPUT)libxdp_versioned_syms.tmp; \ |
| 114 |
- diff -u $(OUTPUT)libxdp_global_syms.tmp \ |
| 115 |
|
| 116 |
diff --git a/dev-util/xdp-tools/metadata.xml b/dev-util/xdp-tools/metadata.xml |
| 117 |
deleted file mode 100644 |
| 118 |
index 3cb68e8a5..000000000 |
| 119 |
--- a/dev-util/xdp-tools/metadata.xml |
| 120 |
+++ /dev/null |
| 121 |
@@ -1,15 +0,0 @@ |
| 122 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 123 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 124 |
-<pkgmetadata> |
| 125 |
- <maintainer type="person"> |
| 126 |
- <email>kurt@×××××××××××××.de</email> |
| 127 |
- <name>Kurt Kanzenbach</name> |
| 128 |
- </maintainer> |
| 129 |
- <longdescription lang="en"> |
| 130 |
- This package contains a collection of utilities and example code to be used |
| 131 |
- with the eXpress Data Path facility of the Linux kernel. |
| 132 |
- </longdescription> |
| 133 |
- <upstream> |
| 134 |
- <remote-id type="github">xdp-project/xdp-tools</remote-id> |
| 135 |
- </upstream> |
| 136 |
-</pkgmetadata> |
| 137 |
|
| 138 |
diff --git a/dev-util/xdp-tools/xdp-tools-1.2.0.ebuild b/dev-util/xdp-tools/xdp-tools-1.2.0.ebuild |
| 139 |
deleted file mode 100644 |
| 140 |
index 9c66034a8..000000000 |
| 141 |
--- a/dev-util/xdp-tools/xdp-tools-1.2.0.ebuild |
| 142 |
+++ /dev/null |
| 143 |
@@ -1,70 +0,0 @@ |
| 144 |
-# Copyright 1999-2021 Gentoo Authors |
| 145 |
-# Distributed under the terms of the GNU General Public License v2 |
| 146 |
- |
| 147 |
-EAPI=7 |
| 148 |
- |
| 149 |
-inherit linux-info llvm multilib toolchain-funcs |
| 150 |
- |
| 151 |
-DESCRIPTION="Utilities and example programs for use with XDP" |
| 152 |
-HOMEPAGE="https://github.com/xdp-project/xdp-tools" |
| 153 |
-SRC_URI="https://github.com/xdp-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 154 |
- |
| 155 |
-SLOT="0" |
| 156 |
-LICENSE="GPL-2" |
| 157 |
-KEYWORDS="~amd64 ~x86" |
| 158 |
- |
| 159 |
-# skip strip for eBPF object files |
| 160 |
-# tests have to be run as root |
| 161 |
-RESTRICT="strip test" |
| 162 |
- |
| 163 |
-# skip QA check(s) for eBPF samples |
| 164 |
-QA_EXECSTACK="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o" |
| 165 |
-QA_PREBUILT="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o" |
| 166 |
- |
| 167 |
-# XDP should be enabled |
| 168 |
-CONFIG_CHECK="~XDP_SOCKETS" |
| 169 |
- |
| 170 |
-LLVM_MAX_SLOT=12 |
| 171 |
- |
| 172 |
-BDEPEND=" |
| 173 |
- virtual/pkgconfig |
| 174 |
-" |
| 175 |
-RDEPEND=" |
| 176 |
- >=dev-libs/libbpf-0.0.7 |
| 177 |
- net-libs/libpcap |
| 178 |
- sys-libs/zlib |
| 179 |
- virtual/libelf |
| 180 |
-" |
| 181 |
-DEPEND="${RDEPEND} |
| 182 |
- sys-devel/clang |
| 183 |
- sys-devel/llvm |
| 184 |
-" |
| 185 |
- |
| 186 |
-PATCHES=( |
| 187 |
- "${FILESDIR}/${P}-install.patch" |
| 188 |
- "${FILESDIR}/${P}-readelf.patch" |
| 189 |
-) |
| 190 |
- |
| 191 |
-pkg_setup() { |
| 192 |
- llvm_pkg_setup |
| 193 |
-} |
| 194 |
- |
| 195 |
-src_configure() { |
| 196 |
- ./configure || die |
| 197 |
-} |
| 198 |
- |
| 199 |
-src_compile() { |
| 200 |
- emake \ |
| 201 |
- CC="$(tc-getCC)" \ |
| 202 |
- AR="$(tc-getAR)" \ |
| 203 |
- READELF=$(tc-getREADELF) \ |
| 204 |
- PRODUCTION=1 \ |
| 205 |
- DYNAMIC_LIBXDP=1 \ |
| 206 |
- FORCE_SYSTEM_LIBBPF=1 \ |
| 207 |
- PREFIX=/usr \ |
| 208 |
- LIBDIR="/usr/$(get_libdir)" all |
| 209 |
-} |
| 210 |
- |
| 211 |
-src_install() { |
| 212 |
- emake PREFIX=/usr LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install |
| 213 |
-} |
| 214 |
|
| 215 |
diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021 |
| 216 |
index 280ab12ee..ee04ef444 100644 |
| 217 |
--- a/profiles/updates/4Q-2021 |
| 218 |
+++ b/profiles/updates/4Q-2021 |
| 219 |
@@ -1 +1,2 @@ |
| 220 |
move dev-python/geopy sci-geosciences/geopy |
| 221 |
+move dev-util/xdp-tools net-libs/xdp-tools |
Archives