mirror of
git://git.yoctoproject.org/meta-dpdk.git
synced 2025-07-19 21:09:04 +02:00
dpdk/19.11: drop recipe
dpdk 21.11 support already has been added. So time to drop it. Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Naveen Saini
Anuj Mittal
parent
d144475b16
commit
21121e672c
|
|
@ -1,50 +0,0 @@
|
||||||
From 0808b30cd00f307f182007d21a8be3a0866ccf83 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
|
|
||||||
Date: Fri, 18 Dec 2015 18:30:47 +0800
|
|
||||||
Subject: [PATCH] dpdk v2.2.0: add RTE_KERNELDIR_OUT to split kernel build
|
|
||||||
artifact
|
|
||||||
|
|
||||||
Introduce RTE_KERNELDIR_OUT to be the path to which kernel build
|
|
||||||
artifacts are located. This is for matching the workflow change
|
|
||||||
since Yocto Project v1.8 onwards whereby tmp/work-shared contains
|
|
||||||
separate directories for kernel source and kernel artifacts.
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [configuration]
|
|
||||||
|
|
||||||
Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
|
|
||||||
|
|
||||||
---
|
|
||||||
mk/rte.module.mk | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/mk/rte.module.mk b/mk/rte.module.mk
|
|
||||||
index 1ada528a00b1..da0538cd5321 100644
|
|
||||||
--- a/mk/rte.module.mk
|
|
||||||
+++ b/mk/rte.module.mk
|
|
||||||
@@ -48,7 +48,7 @@ build: _postbuild
|
|
||||||
# build module
|
|
||||||
$(MODULE).ko: $(SRCS_LINKS)
|
|
||||||
@if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
|
|
||||||
- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \
|
|
||||||
+ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \
|
|
||||||
CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0)
|
|
||||||
|
|
||||||
# install module in $(RTE_OUTPUT)/kmod
|
|
||||||
@@ -59,7 +59,7 @@ $(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko
|
|
||||||
|
|
||||||
# install module
|
|
||||||
modules_install:
|
|
||||||
- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \
|
|
||||||
+ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \
|
|
||||||
modules_install
|
|
||||||
|
|
||||||
.PHONY: clean
|
|
||||||
@@ -69,7 +69,7 @@ clean: _postclean
|
|
||||||
.PHONY: doclean
|
|
||||||
doclean:
|
|
||||||
@if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
|
|
||||||
- $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean
|
|
||||||
+ $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) clean
|
|
||||||
@$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\
|
|
||||||
if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;)
|
|
||||||
@if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
From d08d11c8b6fdfe73884d67a94d907000afd136ed Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
|
|
||||||
Date: Fri, 19 Aug 2016 11:57:49 +0800
|
|
||||||
Subject: [PATCH] dpdk: add --sysroot option within app makefile
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [configuration]
|
|
||||||
|
|
||||||
rte.app.mk has been changed to add -Wl, to all items listed
|
|
||||||
under EXTRA_LDFLAGS. It causes --sysroot=<path> to not setup
|
|
||||||
correctly when we depends on gcc to setup for GNU ld.
|
|
||||||
|
|
||||||
Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
|
|
||||||
|
|
||||||
---
|
|
||||||
mk/rte.app.mk | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
|
|
||||||
index 3eb41d176d21..9ab6688718db 100644
|
|
||||||
--- a/mk/rte.app.mk
|
|
||||||
+++ b/mk/rte.app.mk
|
|
||||||
@@ -300,7 +300,7 @@ exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1))))
|
|
||||||
ifeq ($(LINK_USING_CC),1)
|
|
||||||
O_TO_EXE = $(CC) -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $(OBJS-y) $(call linkerprefix, \
|
|
||||||
$(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
|
|
||||||
- $(MAPFLAGS))
|
|
||||||
+ $(MAPFLAGS)) $(SYSROOTPATH)
|
|
||||||
else
|
|
||||||
O_TO_EXE = $(LD) -o $@ $(OBJS-y) \
|
|
||||||
$(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
|
|
||||||
|
|
@ -1,194 +0,0 @@
|
||||||
include dpdk.inc
|
|
||||||
|
|
||||||
SRC_URI += " \
|
|
||||||
file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
|
|
||||||
file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
STABLE = "-stable"
|
|
||||||
BRANCH = "19.11"
|
|
||||||
SRCREV = "a3d97ddaead03cb19b5160bc78e724659795aea7"
|
|
||||||
S = "${WORKDIR}/git"
|
|
||||||
|
|
||||||
COMPATIBLE_MACHINE = "null"
|
|
||||||
COMPATIBLE_HOST:libc-musl:class-target = "null"
|
|
||||||
COMPATIBLE_HOST:linux-gnux32 = "null"
|
|
||||||
|
|
||||||
# dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat.
|
|
||||||
# fuse is in meta-filesystems and qat is not yet upstreamed.
|
|
||||||
# So adding mechanism to explicitly disable the use of fuse and qat.
|
|
||||||
# To enable, uncomment the below line or include in .bbappend.
|
|
||||||
# PACKAGECONFIG ?= " dpdk_qat vhost libvirt"
|
|
||||||
|
|
||||||
PACKAGECONFIG[dpdk_qat] = ",,virtual/qat"
|
|
||||||
PACKAGECONFIG[vhost] = ",,fuse"
|
|
||||||
PACKAGECONFIG[libvirt] = ",,libvirt"
|
|
||||||
PACKAGECONFIG[numa] = ",,numactl"
|
|
||||||
|
|
||||||
export CONFIG_EXAMPLE_DPDK_QAT = "${@bb.utils.contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}"
|
|
||||||
export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@bb.utils.contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}"
|
|
||||||
export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}"
|
|
||||||
export CONFIG_HAVE_NUMA = "${@bb.utils.contains('PACKAGECONFIG', 'numa', 'y', 'n', d)}"
|
|
||||||
|
|
||||||
# Don't use the default value of datadir and let the dpdk set it to a dpdk
|
|
||||||
# specific directory
|
|
||||||
datadir[unexport] = "1"
|
|
||||||
|
|
||||||
RDEPENDS:${PN} += "pciutils python3-core"
|
|
||||||
DEPENDS = "virtual/kernel"
|
|
||||||
do_configure[depends] += "virtual/kernel:do_shared_workdir"
|
|
||||||
|
|
||||||
inherit module
|
|
||||||
|
|
||||||
export MODULE_DIR="${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net"
|
|
||||||
export RTE_SDK = "${S}"
|
|
||||||
|
|
||||||
export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include"
|
|
||||||
export ICP_LIB_ROOT= "${PKG_CONFIG_SYSROOT_DIR}/usr/lib"
|
|
||||||
export RTE_KERNELDIR = "${STAGING_KERNEL_DIR}"
|
|
||||||
export RTE_KERNELDIR_OUT = "${STAGING_KERNEL_BUILDDIR}"
|
|
||||||
export INSTALL_PATH = "${prefix}/share/dpdk"
|
|
||||||
export RTE_OUTPUT = "${S}/${RTE_TARGET}"
|
|
||||||
export ETHTOOL_LIB_PATH = "${S}/examples/ethtool/lib/${RTE_TARGET}/"
|
|
||||||
export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}"
|
|
||||||
export DPDK_TARGET_MACH = "${@get_dpdk_target_mach(bb,d)}"
|
|
||||||
export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac"
|
|
||||||
|
|
||||||
export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
|
|
||||||
export ARCHDIR = "generic"
|
|
||||||
|
|
||||||
DPDK_RTE_TARGET:x86-64 = "x86_64-native-linuxapp-gcc"
|
|
||||||
DPDK_RTE_TARGET:x86 = "i686-native-linuxapp-gcc"
|
|
||||||
DPDK_RTE_TARGET:aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc"
|
|
||||||
export RTE_TARGET = "${DPDK_RTE_TARGET}"
|
|
||||||
|
|
||||||
# Workaround failure on gcc10
|
|
||||||
TOOLCHAIN_OPTIONS += "-Wno-error=maybe-uninitialized"
|
|
||||||
|
|
||||||
CONFIG_NAME = "common_linux"
|
|
||||||
TEST_DIR = "app/test"
|
|
||||||
|
|
||||||
# The list of intel Comms platforms and their target machine
|
|
||||||
# process mapping. The supported target machine is listed under
|
|
||||||
# dpdk/mk/machine
|
|
||||||
def get_dpdk_target_mach(bb, d):
|
|
||||||
target_arch = d.getVar('DPDK_TARGET_MACHINE', True)
|
|
||||||
if target_arch:
|
|
||||||
return target_arch
|
|
||||||
return "default"
|
|
||||||
|
|
||||||
do_configure () {
|
|
||||||
#############################################################
|
|
||||||
### default value for prefix is "usr", unsetting it, so it
|
|
||||||
### will not be concatenated in ${RTE_TARGET}/Makefile
|
|
||||||
### which will cause compilation failure
|
|
||||||
#############################################################
|
|
||||||
unset prefix
|
|
||||||
|
|
||||||
# Fix-up CONFIG_RTE_MACHINE based on target machine
|
|
||||||
sed -e "s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#" -i ${S}/config/defconfig_${RTE_TARGET}
|
|
||||||
|
|
||||||
# Fix-up vhost configs based on package config
|
|
||||||
sed -e "s#CONFIG_RTE_KNI_VHOST=n#CONFIG_RTE_KNI_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/${CONFIG_NAME}
|
|
||||||
sed -e "s#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/${CONFIG_NAME}
|
|
||||||
sed -e "s#CONFIG_RTE_LIBRTE_VHOST=n#CONFIG_RTE_LIBRTE_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/${CONFIG_NAME}
|
|
||||||
sed -e "s#CONFIG_RTE_LIBRTE_VHOST_NUMA=.*#CONFIG_RTE_LIBRTE_VHOST_NUMA=${CONFIG_HAVE_NUMA}#" -i ${S}/config/${CONFIG_NAME}
|
|
||||||
sed -e "s#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=.*#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=${CONFIG_HAVE_NUMA}#" -i ${S}/config/${CONFIG_NAME}
|
|
||||||
|
|
||||||
# Fix-up CONFIG_RTE_LIBRTE_POWER based on package config for libvirt
|
|
||||||
sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/${CONFIG_NAME}
|
|
||||||
|
|
||||||
make O=$RTE_TARGET T=$RTE_TARGET config
|
|
||||||
}
|
|
||||||
|
|
||||||
do_compile () {
|
|
||||||
unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS
|
|
||||||
|
|
||||||
cd ${S}/${RTE_TARGET}
|
|
||||||
oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" \
|
|
||||||
EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR}" \
|
|
||||||
CROSS="${TARGET_PREFIX}" \
|
|
||||||
prefix="" LDFLAGS="${TUNE_LDARGS}" WERROR_FLAGS="-w" V=1
|
|
||||||
|
|
||||||
cd ${S}/examples/
|
|
||||||
oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \
|
|
||||||
EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -O3 -I${STAGING_INCDIR}" \
|
|
||||||
CROSS="${TARGET_PREFIX}" O="${S}/examples/$@/"
|
|
||||||
|
|
||||||
cd ${S}/${TEST_DIR}/
|
|
||||||
oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \
|
|
||||||
EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -O3 -I${STAGING_INCDIR}" \
|
|
||||||
CROSS="${TARGET_PREFIX}" O="${S}/${TEST_DIR}/$@/"
|
|
||||||
}
|
|
||||||
|
|
||||||
do_install () {
|
|
||||||
oe_runmake O=${RTE_OUTPUT} T= install-runtime DESTDIR=${D}
|
|
||||||
oe_runmake O=${RTE_OUTPUT} T= install-kmod DESTDIR=${D} kerneldir=${MODULE_DIR}
|
|
||||||
oe_runmake O=${RTE_OUTPUT} T= install-sdk DESTDIR=${D}
|
|
||||||
|
|
||||||
# Install examples
|
|
||||||
for dirname in ${S}/examples/*
|
|
||||||
do
|
|
||||||
install -m 0755 -d ${D}/${INSTALL_PATH}/examples/`basename ${dirname}`
|
|
||||||
|
|
||||||
for appname in `find ${dirname} -regex ".*${EXAMPLES_BUILD_DIR}\/app\/[-0-9a-zA-Z0-9/_]*$"`
|
|
||||||
do
|
|
||||||
install -m 755 ${appname} ${D}/${INSTALL_PATH}/examples/`basename ${dirname}`/
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
# Install test
|
|
||||||
for dirname in ${S}/${TEST_DIR}/app/*
|
|
||||||
do
|
|
||||||
install -m 0755 -d ${D}/${INSTALL_PATH}/test
|
|
||||||
|
|
||||||
for appname in `find ${dirname} -regex ".*test\/app\/[-0-9a-zA-Z0-9/_]*$"`
|
|
||||||
do
|
|
||||||
install -m 755 ${appname} ${D}/${INSTALL_PATH}/test
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
cp -r ${S}/mk ${D}${INSTALL_PATH}/
|
|
||||||
|
|
||||||
for ss in $(find ${D} -type f -name "*.py"); do
|
|
||||||
sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${ss}
|
|
||||||
done
|
|
||||||
|
|
||||||
# Remove the unneeded dir
|
|
||||||
rm -rf ${D}/${INSTALL_PATH}/${RTE_TARGET}/app
|
|
||||||
}
|
|
||||||
|
|
||||||
PACKAGES += "${PN}-examples ${PN}-test"
|
|
||||||
|
|
||||||
FILES:${PN}-dbg += " \
|
|
||||||
${INSTALL_PATH}/.debug \
|
|
||||||
${INSTALL_PATH}/examples/*/.debug \
|
|
||||||
"
|
|
||||||
|
|
||||||
FILES:${PN}-doc += "\
|
|
||||||
${INSTALL_PATH}/doc \
|
|
||||||
"
|
|
||||||
|
|
||||||
FILES:${PN}-dev += " \
|
|
||||||
${INSTALL_PATH}/${RTE_TARGET}/.config \
|
|
||||||
${includedir} \
|
|
||||||
${includedir}/${ARCHDIR} \
|
|
||||||
${includedir}/exec-env \
|
|
||||||
${INSTALL_PATH}/buildtools/ \
|
|
||||||
${INSTALL_PATH}/${RTE_TARGET}/include \
|
|
||||||
${INSTALL_PATH}/${RTE_TARGET}/lib \
|
|
||||||
${INSTALL_PATH}/mk \
|
|
||||||
"
|
|
||||||
|
|
||||||
FILES:${PN} += " ${INSTALL_PATH}/usertools/ \
|
|
||||||
${prefix}/sbin/ \
|
|
||||||
${prefix}/bin/ \
|
|
||||||
${libdir}/ \
|
|
||||||
"
|
|
||||||
FILES:${PN}-examples += " \
|
|
||||||
${INSTALL_PATH}/examples/* \
|
|
||||||
"
|
|
||||||
|
|
||||||
FILES:${PN}-test += " \
|
|
||||||
${INSTALL_PATH}/test \
|
|
||||||
"
|
|
||||||
Loading…
Reference in New Issue
Block a user