From 7ad385f8e9d57bae56a48bb5cb82ddeceb8be677 Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Mon, 5 Sep 2022 21:57:29 +0800 Subject: dpdk-module/20.11 : update version to 20.11.6 Drops upstreamed patch * 0002-kni-update-kernel-API-to-set-random-MAC-address.patch Signed-off-by: Yogesh Tyagi Signed-off-by: Anuj Mittal --- recipes-extended/dpdk/dpdk-module_20.11.5.bb | 50 ---------------------- recipes-extended/dpdk/dpdk-module_20.11.6.bb | 49 +++++++++++++++++++++ ...date-kernel-API-to-set-random-MAC-address.patch | 44 ------------------- 3 files changed, 49 insertions(+), 94 deletions(-) delete mode 100644 recipes-extended/dpdk/dpdk-module_20.11.5.bb create mode 100644 recipes-extended/dpdk/dpdk-module_20.11.6.bb delete mode 100644 recipes-extended/dpdk/dpdk/0002-kni-update-kernel-API-to-set-random-MAC-address.patch diff --git a/recipes-extended/dpdk/dpdk-module_20.11.5.bb b/recipes-extended/dpdk/dpdk-module_20.11.5.bb deleted file mode 100644 index 64defa8..0000000 --- a/recipes-extended/dpdk/dpdk-module_20.11.5.bb +++ /dev/null @@ -1,50 +0,0 @@ -include dpdk.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:" - -SRC_URI += " \ - file://0001-Makefile-add-makefile.patch \ - file://0002-kni-update-kernel-API-to-set-random-MAC-address.patch \ -" -STABLE = "-stable" -BRANCH = "20.11" -SRCREV = "abf68ccc8b1f923f0eb0b6bf2a8b944378e1ebeb" -S = "${WORKDIR}/git" - -inherit module - -#kernel module needs 'rte_build_config.h', which is generated at buid time -DEPENDS += "dpdk" - -COMPATIBLE_MACHINE = "null" -COMPATIBLE_HOST:libc-musl:class-target = "null" -COMPATIBLE_HOST:linux-gnux32 = "null" - -export S -export STAGING_KERNEL_DIR -export STAGING_INCDIR -export INSTALL_MOD_DIR="dpdk" - -do_configure[noexec] = "1" - -do_compile() { - cd ${S}/kernel/linux/kni - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ - KERNEL_VERSION=${KERNEL_VERSION} \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - AR="${KERNEL_AR}" \ - O=${STAGING_KERNEL_BUILDDIR} \ - KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}" \ - ${MAKE_TARGETS} -} - -do_install() { - cd ${S}/kernel/linux/kni - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake DEPMOD=echo MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \ - INSTALL_FW_PATH="${D}${nonarch_base_libdir}/firmware" \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - O=${STAGING_KERNEL_BUILDDIR} \ - ${MODULES_INSTALL_TARGET} -} diff --git a/recipes-extended/dpdk/dpdk-module_20.11.6.bb b/recipes-extended/dpdk/dpdk-module_20.11.6.bb new file mode 100644 index 0000000..29b055d --- /dev/null +++ b/recipes-extended/dpdk/dpdk-module_20.11.6.bb @@ -0,0 +1,49 @@ +include dpdk.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:" + +SRC_URI += " \ + file://0001-Makefile-add-makefile.patch \ +" +STABLE = "-stable" +BRANCH = "20.11" +SRCREV = "73655c6414914c99a33010e9e7bdae9cafd24404" +S = "${WORKDIR}/git" + +inherit module + +#kernel module needs 'rte_build_config.h', which is generated at buid time +DEPENDS += "dpdk" + +COMPATIBLE_MACHINE = "null" +COMPATIBLE_HOST:libc-musl:class-target = "null" +COMPATIBLE_HOST:linux-gnux32 = "null" + +export S +export STAGING_KERNEL_DIR +export STAGING_INCDIR +export INSTALL_MOD_DIR="dpdk" + +do_configure[noexec] = "1" + +do_compile() { + cd ${S}/kernel/linux/kni + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + O=${STAGING_KERNEL_BUILDDIR} \ + KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}" \ + ${MAKE_TARGETS} +} + +do_install() { + cd ${S}/kernel/linux/kni + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake DEPMOD=echo MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \ + INSTALL_FW_PATH="${D}${nonarch_base_libdir}/firmware" \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + O=${STAGING_KERNEL_BUILDDIR} \ + ${MODULES_INSTALL_TARGET} +} diff --git a/recipes-extended/dpdk/dpdk/0002-kni-update-kernel-API-to-set-random-MAC-address.patch b/recipes-extended/dpdk/dpdk/0002-kni-update-kernel-API-to-set-random-MAC-address.patch deleted file mode 100644 index dea9e12..0000000 --- a/recipes-extended/dpdk/dpdk/0002-kni-update-kernel-API-to-set-random-MAC-address.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e0a23f3cf8410871d28fdd8f0806216848b357ce Mon Sep 17 00:00:00 2001 -From: Ferruh Yigit -Date: Wed, 3 Nov 2021 12:59:50 +0000 -Subject: [PATCH] kni: update kernel API to set random MAC address - -Previously used 'random_ether_addr()' API is removed in upstream kernel -with commit -Commit ba530fea8ca1 ("ethernet: remove random_ether_addr()") - -Replacement API 'eth_random_addr()' is around since v3.6 [1], so -simply switching to this API without any version checks. - -[1] -0a4dd594982a ("etherdevice: Rename random_ether_addr to eth_random_addr") - -Signed-off-by: Ferruh Yigit - -Upstream-Status: Backport [http://git.dpdk.org/dpdk/commit/?id=e6cbfd9bf30bbc4170fe8c7c04a16d9cf795fb90] -Signed-off-by: Yongxin Liu ---- - kernel/linux/kni/kni_misc.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c -index 2b464c4381..f4944e1ddf 100644 ---- a/kernel/linux/kni/kni_misc.c -+++ b/kernel/linux/kni/kni_misc.c -@@ -399,11 +399,8 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num, - if (is_valid_ether_addr(dev_info.mac_addr)) - memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN); - else -- /* -- * Generate random mac address. eth_random_addr() is the -- * newer version of generating mac address in kernel. -- */ -- random_ether_addr(net_dev->dev_addr); -+ /* Generate random MAC address. */ -+ eth_random_addr(net_dev->dev_addr); - - if (dev_info.mtu) - net_dev->mtu = dev_info.mtu; --- -2.32.0 - -- cgit v1.2.3-54-g00ecf