From nobody Sat Dec 30 07:16:55 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T2D8833q0z55jJL; Sat, 30 Dec 2023 07:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T2D881k8cz4DdB; Sat, 30 Dec 2023 07:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703920616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cOobtAGWIKHcgq3FNptXllcxq8HeaeY/8wnucbYt8ls=; b=e4qulS8y/g65A0SerJie+q/BX8IfuBojN8icjvkGk8OVlouv7fNURwqpaKmvVRF89BRv/L TtoJnZ0Vp8Lla/+dZaCx+tVpvmmLUZB4g8ykAs9JsLS+Kpky6gXRm845sqPE0GtTqPn9u5 nsLVWevvJIEQClx9U9c5Ynyf3wt6FWQ7Ac6Getdw0QEuhEnm3nDdBfn8n2uNfkq/HKRKaT fzLdx/klioJDwjvvRJo4H+U4ypTW7rgpwgBscV9R3zSkPXxtFUsWksEn8R2NIFViv0mT7s hLPhPVSWaAVCnpaM9aOXhWG4r8kMLGIRjrnKdGNKKC9giSWJCvzMYerit+uQPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703920616; a=rsa-sha256; cv=none; b=GEIImhp8bZqYrannL8/gOaFiadMaxzzfynATQD0Blp96Fpbz4v7r5hsK72iWAmrqnRH0pa MAymOYsS9NJt+xlO4OfAS93r9+TeSadfieez8FEviLYO8w0P2zmagIlOv+1z+ZPFpOfp42 VxDXVVUm/HAMdRYT4QDg6XPVHX3qrRY8RZaNaj7legY6aZVPB3odALJxHeIAntkIu1oZr+ lksuw5QgQxNBgiU5O7eMcW9OsvAojKZ/FG1GDrEquhOjuCHqmV6NkZXC4FqKAyjoySq3hi BMmGdO0QjUcbUbyqqR3GuwkMuacv8pMTa3GK97ZktksyPAECs7acgxiWh/26fQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703920616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cOobtAGWIKHcgq3FNptXllcxq8HeaeY/8wnucbYt8ls=; b=EzU2Vs4N1cU9QiG1k3CGCrZWI7RfwYl/TWAwuCWo2hy6wBM11s0a9zEWgd83QyMh0i5Uz0 ROwGCLyNqU0++bYHhCDNTW5CcExMBpKy9dWc9U5tJ53FRs+Eru/H3rXYMBQe0Pf7UoYZrC vXbQ4an4CEanWi/TYhiiA3phxzcMZmToAjbL9d7pqq7o7u+vP8ojIoBxDdmb4BPd5fu9I9 A88Tus0X+TWDW/WHB8YJPfhrurpLRX0Sk7C0EMeft63/PfEMBYEZMAjZXhH7xI/0QRDzpH CD92IBif9+Bmjj41XFTpv52Raha0iXQDysdIrjo0Uin9ZYpP209LhW2pOBqcBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T2D880N4szh3y; Sat, 30 Dec 2023 07:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BU7GuCI097239; Sat, 30 Dec 2023 07:16:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BU7Gt53097236; Sat, 30 Dec 2023 07:16:55 GMT (envelope-from git) Date: Sat, 30 Dec 2023 07:16:55 GMT Message-Id: <202312300716.3BU7Gt53097236@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 35b06fb1497a - main - net/dpdk: Move net/dpdk-22.11 to net/dpdk List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35b06fb1497aff804abe21e254ea4cf5829953b2 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=35b06fb1497aff804abe21e254ea4cf5829953b2 commit 35b06fb1497aff804abe21e254ea4cf5829953b2 Author: Muhammad Moinur Rahman AuthorDate: 2023-12-29 22:17:50 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-30 07:16:41 +0000 net/dpdk: Move net/dpdk-22.11 to net/dpdk net/dpdk was about to expire in lieu of net/dpdk-22.11. So move net/dpdk-22.11 to dpdk. When there are multiple versions in the ports tree always keep the most latest stable version without the suffix/prefix and adjust accordingly for other versions. Approved by: portmgr (blanket) --- MOVED | 1 + net/Makefile | 1 - net/dpdk-22.11/Makefile | 62 - net/dpdk-22.11/distinfo | 3 - .../patch-kernel_freebsd_contigmem_contigmem.c | 20 - .../files/patch-kernel_freebsd_nic__uio_nic__uio.c | 18 - net/dpdk-22.11/pkg-descr | 15 - net/dpdk-22.11/pkg-message | 30 - net/dpdk-22.11/pkg-plist | 1356 ------------------- net/dpdk/Makefile | 67 +- net/dpdk/distinfo | 6 +- .../files/patch-config_meson.build | 0 .../patch-kernel_freebsd_contigmem_contigmem.c | 2 +- .../files/patch-kernel_freebsd_nic__uio_nic__uio.c | 2 +- ...h-lib_librte__eal_freebsd_eal_include_rte__os.h | 41 - net/dpdk/pkg-plist | 1368 ++++++++++++-------- 16 files changed, 878 insertions(+), 2114 deletions(-) diff --git a/MOVED b/MOVED index ed38f9c4a290..7104993521f9 100644 --- a/MOVED +++ b/MOVED @@ -8185,3 +8185,4 @@ www/yanopaste||2023-12-18|Has expired: Last upstream release was in 2011 www/py-yt-dlp-devel|www/py-yt-dlp|2023-12-22|Remove the -devel suffix math/octave-forge-statistics-bootstrap|math/octave-forge-statistics-resampling|2023-12-24|Name change upstream comms/openzwave-devel||2023-12-28|Has expired: Upstream no longer maintained, indicates to move to openzwave JS instead +net/net/dpdk-22.11|net/dpdk|2023-12-30|Instead of expiring dpdk move dpdk-22.11 to dpdk diff --git a/net/Makefile b/net/Makefile index b56e314fded0..62841265cf39 100644 --- a/net/Makefile +++ b/net/Makefile @@ -130,7 +130,6 @@ SUBDIR += downzemall SUBDIR += dpdk SUBDIR += dpdk-20.11 - SUBDIR += dpdk-22.11 SUBDIR += dpinger SUBDIR += drawterm SUBDIR += drive diff --git a/net/dpdk-22.11/Makefile b/net/dpdk-22.11/Makefile deleted file mode 100644 index 0696d3ea44af..000000000000 --- a/net/dpdk-22.11/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -PORTNAME= dpdk -DISTVERSION= 22.11.2 -CATEGORIES= net -MASTER_SITES= http://fast.dpdk.org/rel/ -PKGNAMESUFFIX= 22.11 - -MAINTAINER= bruce.richardson@intel.com -COMMENT= DPDK: Software libraries for packet processing -WWW= https://dpdk.org/ - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/license/README - -ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= only tested on 64-bit x86 hardware - -BUILD_DEPENDS= objdump:devel/binutils \ - ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} - -LIB_DEPENDS= libelf.so:devel/elfutils \ - libjansson.so:devel/jansson \ - libpcap.so.1:net/libpcap \ - libisal.so:devel/isa-l - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} - -USES= kmod meson pkgconfig:both python shebangfix ssl tar:xz -USE_LDCONFIG= yes -SHEBANG_FILES= examples/ipsec-secgw/test/pkttest.py \ - examples/ipsec-secgw/test/pkttest.sh \ - examples/ipsec-secgw/test/run_test.sh \ - examples/ipsec-secgw/test/trs_ipv6opts.py \ - examples/ipsec-secgw/test/tun_null_header_reconstruct.py \ - examples/pipeline/examples/vxlan_table.py \ - usertools/dpdk-devbind.py usertools/dpdk-hugepages.py \ - usertools/dpdk-pmdinfo.py usertools/dpdk-telemetry-client.py \ - usertools/dpdk-telemetry.py - -.if defined(CPUTYPE) -DPDK_CPUTYPE=${CPUTYPE} -.else -DPDK_CPUTYPE=default -.endif - -MESON_ARGS= -Ddefault_library=shared \ - -Denable_kmods=true \ - -Dmachine=${DPDK_CPUTYPE} - -WRKSRC= ${WRKDIR}/${PORTNAME}-stable-${DISTVERSION} - -OPTIONS_DEFINE= EXAMPLES TEST TOOLS -OPTIONS_DEFAULT= TOOLS -OPTIONS_SUB= yes - -TEST_DESC= Build and install automated unit test binary -TOOLS_DESC= Install tool scripts - -EXAMPLES_MESON_ON= -Dexamples=all -TEST_MESON_TRUE= tests -TOOLS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyelftools>=0:devel/py-pyelftools@${PY_FLAVOR} - -.include diff --git a/net/dpdk-22.11/distinfo b/net/dpdk-22.11/distinfo deleted file mode 100644 index 1d301d7799bc..000000000000 --- a/net/dpdk-22.11/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1687361326 -SHA256 (dpdk-22.11.2.tar.xz) = af64bdda15087ff8d429894b9ea6cbbbb6ee7a932bdb344f82b0dc366379a2d4 -SIZE (dpdk-22.11.2.tar.xz) = 15594000 diff --git a/net/dpdk-22.11/files/patch-kernel_freebsd_contigmem_contigmem.c b/net/dpdk-22.11/files/patch-kernel_freebsd_contigmem_contigmem.c deleted file mode 100644 index fa54be32ef58..000000000000 --- a/net/dpdk-22.11/files/patch-kernel_freebsd_contigmem_contigmem.c +++ /dev/null @@ -1,20 +0,0 @@ ---- kernel/freebsd/contigmem/contigmem.c.orig 2023-05-20 00:00:38 UTC -+++ kernel/freebsd/contigmem/contigmem.c -@@ -111,7 +111,7 @@ static int - }; - - static int --contigmem_load() -+contigmem_load(void) - { - char index_string[8], description[32]; - int i, error = 0; -@@ -178,7 +178,7 @@ static int - } - - static int --contigmem_unload() -+contigmem_unload(void) - { - int i; - diff --git a/net/dpdk-22.11/files/patch-kernel_freebsd_nic__uio_nic__uio.c b/net/dpdk-22.11/files/patch-kernel_freebsd_nic__uio_nic__uio.c deleted file mode 100644 index 27bd60e20b78..000000000000 --- a/net/dpdk-22.11/files/patch-kernel_freebsd_nic__uio_nic__uio.c +++ /dev/null @@ -1,18 +0,0 @@ ---- kernel/freebsd/nic_uio/nic_uio.c.orig 2022-07-26 18:52:05 UTC -+++ kernel/freebsd/nic_uio/nic_uio.c -@@ -78,10 +78,14 @@ struct pci_bdf { - uint32_t function; - }; - -+DEFINE_CLASS_0(nic_uio, nic_uio_driver, nic_uio_methods, sizeof(struct nic_uio_softc)); -+#if __FreeBSD_version >= 1400058 -+DRIVER_MODULE(nic_uio, pci, nic_uio_driver, nic_uio_modevent, NULL); -+#else - static devclass_t nic_uio_devclass; - --DEFINE_CLASS_0(nic_uio, nic_uio_driver, nic_uio_methods, sizeof(struct nic_uio_softc)); - DRIVER_MODULE(nic_uio, pci, nic_uio_driver, nic_uio_devclass, nic_uio_modevent, 0); -+#endif - - static int - nic_uio_mmap(struct cdev *cdev, vm_ooffset_t offset, vm_paddr_t *paddr, diff --git a/net/dpdk-22.11/pkg-descr b/net/dpdk-22.11/pkg-descr deleted file mode 100644 index a4f09217b2a0..000000000000 --- a/net/dpdk-22.11/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -The Data Plane Development Kit (DPDK) - -The DPDK is a set of software libraries to enable packet processing. It -consists of a set of polling mode drivers (PMD) which can be used to pull -network packets directly from a Network Interface Card (NIC), as well as -other libraries to assist in the processing of those packets. The additional -libraries include ones for: -* memory and buffer management -* packet classification -* software rings or FIFOs to allow packet transfer between cores -amongst others. - -Applications written using the DPDK run in userspace. The devices used by a -DPDK application are removed from kernel control and are instead managed -directly by that application. diff --git a/net/dpdk-22.11/pkg-message b/net/dpdk-22.11/pkg-message deleted file mode 100644 index f557b725ac78..000000000000 --- a/net/dpdk-22.11/pkg-message +++ /dev/null @@ -1,30 +0,0 @@ -[ -{ type: install - message: <