From fb7fb9aefcdc9e0b76aba5f4b81f9dcc4cdb764b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 5 Dec 2022 21:35:38 +0700 Subject: [PATCH] dpdk: update to 22.11. --- common/shlibs | 134 ------------------------- srcpkgs/dpdk/patches/arm.patch | 17 ---- srcpkgs/dpdk/patches/cross-build.patch | 13 +++ srcpkgs/dpdk/patches/sphinx-4.0.patch | 10 -- srcpkgs/dpdk/template | 25 ++--- 5 files changed, 23 insertions(+), 176 deletions(-) delete mode 100644 srcpkgs/dpdk/patches/arm.patch create mode 100644 srcpkgs/dpdk/patches/cross-build.patch delete mode 100644 srcpkgs/dpdk/patches/sphinx-4.0.patch diff --git a/common/shlibs b/common/shlibs index 965eef4df56f..4a42d68fbf67 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3724,140 +3724,6 @@ libicns.so.1 libicns-0.8.1_1 librabbitmq.so.4 rabbitmq-c-0.10.0_2 libuInputPlus.so.0 libuInputPlus-0.1.3_1 libevdevPlus.so.0 libevdevPlus-0.1.0_1 -librte_lpm.so.2 dpdk-19.08_5 -librte_sched.so.3 dpdk-19.08_5 -librte_eal.so.11 dpdk-19.08_5 -librte_pci.so.1 dpdk-19.08_5 -librte_gro.so.1 dpdk-19.08_5 -librte_jobstats.so.1 dpdk-19.08_5 -librte_bpf.so.1 dpdk-19.08_5 -librte_ip_frag.so.1 dpdk-19.08_5 -librte_port.so.3 dpdk-19.08_5 -librte_latencystats.so.1 dpdk-19.08_5 -librte_pipeline.so.3 dpdk-19.08_5 -librte_distributor.so.1 dpdk-19.08_5 -librte_pmd_vmxnet3.so.1 dpdk-19.08_5 -librte_pmd_dpaa_sec.so.1 dpdk-19.08_5 -librte_common_octeontx.so.1 dpdk-19.08_5 -librte_pmd_iavf.so.1 dpdk-19.08_5 -librte_pmd_octeontx_event.so.1 dpdk-19.08_5 -librte_pmd_ring.so.2 dpdk-19.08_5 -librte_rawdev_skeleton.so.1 dpdk-19.08_5 -librte_pmd_qat.so.1 dpdk-19.08_5 -librte_pmd_hinic.so.1 dpdk-19.08_5 -librte_bus_vmbus.so.2 dpdk-19.08_5 -librte_pmd_null.so.2 dpdk-19.08_5 -librte_pmd_bbdev_null.so.1 dpdk-19.08_5 -librte_common_dpaax.so.1 dpdk-19.08_5 -librte_pmd_dpaa2_event.so.2 dpdk-19.08_5 -librte_pmd_bnxt.so.2 dpdk-19.08_5 -librte_bus_ifpga.so.2 dpdk-19.08_5 -librte_pmd_pcap.so.1 dpdk-19.08_5 -librte_pmd_kni.so.1 dpdk-19.08_5 -librte_pmd_enetc.so.1 dpdk-19.08_5 -librte_pmd_atlantic.so.1 dpdk-19.08_5 -librte_mempool_stack.so.1 dpdk-19.08_5 -librte_pmd_opdl_event.so.1 dpdk-19.08_5 -librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_5 -librte_pmd_avp.so.1 dpdk-19.08_5 -librte_pmd_cxgbe.so.1 dpdk-19.08_5 -librte_pmd_crypto_scheduler.so.1 dpdk-19.08_5 -librte_pmd_openssl.so.1 dpdk-19.08_5 -librte_pmd_octeontx2_event.so.1 dpdk-19.08_5 -librte_pmd_sfc.so.1 dpdk-19.08_5 -librte_pmd_i40e.so.2 dpdk-19.08_5 -librte_pmd_e1000.so.1 dpdk-19.08_5 -librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_5 -librte_rawdev_ioat.so.1 dpdk-19.08_5 -librte_pmd_dpaa2.so.2 dpdk-19.08_5 -librte_pmd_sw_event.so.1 dpdk-19.08_5 -librte_mempool_octeontx2.so.1 dpdk-19.08_5 -librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_5 -librte_rawdev_ntb.so.1 dpdk-19.08_5 -librte_pmd_memif.so.1 dpdk-19.08_5 -librte_pmd_dpaa2_sec.so.2 dpdk-19.08_5 -librte_pmd_failsafe.so.1 dpdk-19.08_5 -librte_pmd_thunderx.so.1 dpdk-19.08_5 -librte_pmd_octeontx.so.1 dpdk-19.08_5 -librte_pmd_dpaa.so.1 dpdk-19.08_5 -librte_pmd_caam_jr.so.1 dpdk-19.08_5 -librte_pmd_virtio.so.1 dpdk-19.08_5 -librte_pmd_octeontx_compress.so.1 dpdk-19.08_5 -librte_pmd_zlib.so.1 dpdk-19.08_5 -librte_bus_pci.so.2 dpdk-19.08_5 -librte_pmd_bond.so.2 dpdk-19.08_5 -librte_pmd_ice.so.1 dpdk-19.08_5 -librte_pmd_skeleton_event.so.1 dpdk-19.08_5 -librte_mempool_ring.so.1 dpdk-19.08_5 -librte_pmd_octeontx2.so.1 dpdk-19.08_5 -librte_mempool_octeontx.so.1 dpdk-19.08_5 -librte_pmd_ark.so.1 dpdk-19.08_5 -librte_pmd_null_crypto.so.1 dpdk-19.08_5 -librte_pmd_ena.so.1 dpdk-19.08_5 -librte_pmd_axgbe.so.1 dpdk-19.08_5 -librte_common_cpt.so.1 dpdk-19.08_5 -librte_pmd_af_packet.so.1 dpdk-19.08_5 -librte_pmd_vhost.so.2 dpdk-19.08_5 -librte_pmd_softnic.so.1 dpdk-19.08_5 -librte_pmd_nfp.so.1 dpdk-19.08_5 -librte_bus_fslmc.so.2 dpdk-19.08_5 -librte_bus_dpaa.so.2 dpdk-19.08_5 -librte_pmd_fm10k.so.1 dpdk-19.08_5 -librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_5 -librte_mempool_dpaa2.so.2 dpdk-19.08_5 -librte_pmd_ipn3ke.so.1 dpdk-19.08_5 -librte_pmd_vdev_netvsc.so.1 dpdk-19.08_5 -librte_mempool_dpaa.so.1 dpdk-19.08_5 -librte_pmd_bnx2x.so.1 dpdk-19.08_5 -librte_pmd_enic.so.1 dpdk-19.08_5 -librte_pmd_ixgbe.so.2 dpdk-19.08_5 -librte_common_octeontx2.so.1 dpdk-19.08_5 -librte_pmd_liquidio.so.1 dpdk-19.08_5 -librte_pmd_netvsc.so.2 dpdk-19.08_5 -librte_mempool_bucket.so.1 dpdk-19.08_5 -librte_pmd_virtio_crypto.so.1 dpdk-19.08_5 -librte_pmd_ccp.so.1 dpdk-19.08_5 -librte_bus_vdev.so.2 dpdk-19.08_5 -librte_pmd_tap.so.1 dpdk-19.08_5 -librte_pmd_octeontx_crypto.so.1 dpdk-19.08_5 -librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_5 -librte_pmd_dsw_event.so.1 dpdk-19.08_5 -librte_pmd_dpaa_event.so.1 dpdk-19.08_5 -librte_pmd_ifc.so.1 dpdk-19.08_5 -librte_stack.so.1 dpdk-19.08_5 -librte_kvargs.so.1 dpdk-19.08_5 -librte_security.so.2 dpdk-19.08_5 -librte_bitratestats.so.2 dpdk-19.08_5 -librte_rcu.so.1 dpdk-19.08_5 -librte_gso.so.1 dpdk-19.08_5 -librte_efd.so.1 dpdk-19.08_5 -librte_cmdline.so.2 dpdk-19.08_5 -librte_telemetry.so.1 dpdk-19.08_5 -librte_pdump.so.3 dpdk-19.08_5 -librte_eventdev.so.7 dpdk-19.08_5 -librte_vhost.so.4 dpdk-19.08_5 -librte_net.so.1 dpdk-19.08_5 -librte_meter.so.3 dpdk-19.08_5 -librte_acl.so.2 dpdk-19.08_5 -librte_mempool.so.5 dpdk-19.08_5 -librte_table.so.3 dpdk-19.08_5 -librte_power.so.1 dpdk-19.08_5 -librte_reorder.so.1 dpdk-19.08_5 -librte_ring.so.2 dpdk-19.08_5 -librte_ethdev.so.12 dpdk-19.08_5 -librte_bbdev.so.1 dpdk-19.08_5 -librte_ipsec.so.1 dpdk-19.08_5 -librte_timer.so.1 dpdk-19.08_5 -librte_cfgfile.so.2 dpdk-19.08_5 -librte_member.so.1 dpdk-19.08_5 -librte_compressdev.so.1 dpdk-19.08_5 -librte_mbuf.so.5 dpdk-19.08_5 -librte_hash.so.2 dpdk-19.08_5 -librte_flow_classify.so.1 dpdk-19.08_5 -librte_metrics.so.1 dpdk-19.08_5 -librte_cryptodev.so.8 dpdk-19.08_5 -librte_rawdev.so.1 dpdk-19.08_5 -librte_kni.so.2 dpdk-19.08_5 libredwg.so.0 libredwg-0.9_1 libgcj-tools.so.17 libgcj-6.5.0_1 libgcj_bc.so.1 libgcj-6.5.0_1 diff --git a/srcpkgs/dpdk/patches/arm.patch b/srcpkgs/dpdk/patches/arm.patch deleted file mode 100644 index 5a30e4d4fc16..000000000000 --- a/srcpkgs/dpdk/patches/arm.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git config/meson.build config/meson.build -index 2bafea5..6b15f13 100644 ---- a/config/meson.build -+++ b/config/meson.build -@@ -50,11 +50,7 @@ meson.add_install_script('../buildtools/symlink-drivers-solibs.sh', - pmd_subdir_opt) - - # set the machine type and cflags for it --if meson.is_cross_build() -- machine = host_machine.cpu() --else -- machine = get_option('machine') --endif -+machine = get_option('machine') - - # machine type 'default' is special, it defaults to the per arch agreed common - # minimal baseline needed for DPDK. diff --git a/srcpkgs/dpdk/patches/cross-build.patch b/srcpkgs/dpdk/patches/cross-build.patch new file mode 100644 index 000000000000..167a9f35bbe0 --- /dev/null +++ b/srcpkgs/dpdk/patches/cross-build.patch @@ -0,0 +1,13 @@ +Index: dpdk-22.11/config/meson.build +=================================================================== +--- dpdk-22.11.orig/config/meson.build ++++ dpdk-22.11/config/meson.build +@@ -74,7 +74,7 @@ enable_drivers = '' + platform = get_option('platform') + + # set the cpu_instruction_set and cflags for it +-if meson.is_cross_build() ++if false + cpu_instruction_set = host_machine.cpu() + else + cpu_instruction_set = get_option('cpu_instruction_set') diff --git a/srcpkgs/dpdk/patches/sphinx-4.0.patch b/srcpkgs/dpdk/patches/sphinx-4.0.patch deleted file mode 100644 index cdee0fe98c1a..000000000000 --- a/srcpkgs/dpdk/patches/sphinx-4.0.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: dpdk-19.08/doc/guides/conf.py -=================================================================== ---- dpdk-19.08.orig/doc/guides/conf.py -+++ dpdk-19.08/doc/guides/conf.py -@@ -410,4 +410,4 @@ def setup(app): - # Process the numref references once the doctree has been created. - app.connect('doctree-resolved', process_numref) - -- app.add_stylesheet('css/custom.css') -+ app.add_css_file('css/custom.css') diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template index 0f74b4c99d64..dc76bebd6585 100644 --- a/srcpkgs/dpdk/template +++ b/srcpkgs/dpdk/template @@ -1,12 +1,12 @@ # Template file for 'dpdk' pkgname=dpdk -version=19.08 -revision=5 +version=22.11 +revision=1 # no musl - uses error.h, execinfo.h and argp.h archs="x86_64 aarch64 ppc64le i686 armv7l" build_style=meson configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false" -hostmakedepends="doxygen python3-Sphinx pkg-config elfutils" +hostmakedepends="doxygen python3-Sphinx pkg-config elfutils python3-pyelftools" makedepends="libnuma-devel jansson-devel libpcap-devel zlib-devel openssl-devel libbsd-devel libelf libmnl" depends="python3-pyelftools" @@ -15,18 +15,18 @@ maintainer="Hans-J. Schmid " license="BSD-3-Clause, GPL-2.0-only" homepage="https://www.dpdk.org/" distfiles="https://github.com/DPDK/${pkgname}/archive/v${version}.tar.gz" -checksum=1ceff1a6f4f8d5f6f62c1682097249227ac5225ccd9638e0af09f5411c681038 +checksum=ed8b2a2b153f0311ffa065d35af29a098367af44a22b3c33e191e1a74211f2e3 # import py3compat python_version=3 case "${XBPS_TARGET_MACHINE}" in - armv7l*) configure_args+=" -Dmachine=armv7-a";; - aarch64*) configure_args+=" -Dmachine=armv8-a";; - ppc64le*) configure_args+=" -Dmachine=power8";; - *) configure_args+=" -Dmachine=default" + armv7l*) configure_args+=" -Dcpu_instruction_set=armv7-a";; + aarch64*) configure_args+=" -Dcpu_instruction_set=armv8-a";; + ppc64le*) configure_args+=" -Dcpu_instruction_set=power8";; + *) configure_args+=" -Dcpu_instruction_set=generic" esac -CFLAGS="-fcommon" +# CFLAGS="-fcommon" post_install() { vmkdir usr/lib/modules-load.d @@ -54,7 +54,7 @@ dpdk-devel_package() { vmove usr/include vmove usr/lib/*.so vmove usr/lib/*.a - vmove usr/lib/dpdk/pmds-${version}/*.so + vmove usr/lib/dpdk/pmds-23.0/*.so vmove usr/lib/pkgconfig vmove usr/share/dpdk/examples } @@ -67,16 +67,11 @@ dpdk-dkms_package() { pkg_install() { vmkdir usr/src/dpdk-igb-uio-${version} vmkdir usr/src/dpdk-rte-kni-${version} - vcopy "kernel/linux/igb_uio/*" usr/src/dpdk-igb-uio-${version} vcopy "kernel/linux/kni/*" usr/src/dpdk-rte-kni-${version} - vcopy ${FILESDIR}/dkms_igb_uio.conf usr/src/dpdk-igb-uio-${version}/dkms.conf vcopy ${FILESDIR}/dkms_rte_kni.conf usr/src/dpdk-rte-kni-${version}/dkms.conf - sed -i -e "s/@VERSION@/${version}/" ${PKGDESTDIR}/usr/src/dpdk-igb-uio-${version}/dkms.conf sed -i -e "s/@VERSION@/${version}/" ${PKGDESTDIR}/usr/src/dpdk-rte-kni-${version}/dkms.conf # load modules at boot time - echo igb_uio > ${DESTDIR}/usr/lib/modules-load.d/igb_uio.conf echo rte_kni > ${DESTDIR}/usr/lib/modules-load.d/rte_kni.conf - chmod 644 ${DESTDIR}/usr/lib/modules-load.d/igb_uio.conf chmod 644 ${DESTDIR}/usr/lib/modules-load.d/rte_kni.conf vmove usr/lib/modules-load.d }