From 3493058e7dcf00c78517ec5efb6457ebb1e85089 Mon Sep 17 00:00:00 2001 From: Lee Chee Yang Date: Thu, 5 Oct 2023 15:04:16 +0800 Subject: xdp-tools: update to 1.2.10 Signed-off-by: Lee Chee Yang Signed-off-by: Anuj Mittal --- .../0001-configure-skip-toolchain-checks.patch | 18 +++++------ .../recipes-support/xdp-tools/xdp-tools_1.2.10.bb | 37 ++++++++++++++++++++++ .../recipes-support/xdp-tools/xdp-tools_1.2.8.bb | 37 ---------------------- 3 files changed, 45 insertions(+), 47 deletions(-) create mode 100644 dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.10.bb delete mode 100644 dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.8.bb diff --git a/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools/0001-configure-skip-toolchain-checks.patch b/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools/0001-configure-skip-toolchain-checks.patch index 32a88b2..0c89152 100644 --- a/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools/0001-configure-skip-toolchain-checks.patch +++ b/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools/0001-configure-skip-toolchain-checks.patch @@ -1,7 +1,7 @@ -From 53f8a8dffa571de99b50f1a7b757cfd7d8c24d21 Mon Sep 17 00:00:00 2001 +From 9c9dce2e5f04de65b7b00321f96fff6071546ea1 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Mon, 17 Oct 2022 15:44:16 +0800 -Subject: [PATCH 1/4] configure: skip toolchain checks +Subject: [PATCH] configure: skip toolchain checks Current logic fetch full command line along with the tool. i.e gcc -m64 -march=skylake -mtune=generic ... @@ -14,17 +14,18 @@ environment too. Upstream-Status: Inappropriate Signed-off-by: Naveen Saini + --- configure | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure -index 70fdfdf..48d1ea5 100755 +index b4e824f..10618fc 100755 --- a/configure +++ b/configure -@@ -38,12 +38,12 @@ check_toolchain() - : ${EMACS=emacs} - : ${ARCH_INCLUDES=} +@@ -69,12 +69,12 @@ check_toolchain() + CLANG=$(find_tool clang "$CLANG") + LLC=$(find_tool llc "$LLC") - for TOOL in $PKG_CONFIG $CC $LD $OBJCOPY $CLANG $LLC $M4; do - if [ ! $(command -v ${TOOL} 2>/dev/null) ]; then @@ -40,7 +41,4 @@ index 70fdfdf..48d1ea5 100755 + #done clang_version=$($CLANG --version | grep -Po '(?<=clang version )[[:digit:]]+') - echo "Found clang binary '$CLANG' with version $clang_version (from '$($CLANG --version | head -n 1)')" --- -2.25.1 - + if [ "$?" -ne "0" ]; then diff --git a/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.10.bb b/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.10.bb new file mode 100644 index 0000000..bd3182d --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.10.bb @@ -0,0 +1,37 @@ +SUMMARY = "Utilities and example programs for use with XDP" +HOMEPAGE = "https://github.com/xdp-project/xdp-tools" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9ee53f8d06bbdb4c11b1557ecc4f8cd5 \ + file://LICENSES/GPL-2.0;md5=994331978b428511800bfbd17eea3001 \ + file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd \ + file://LICENSES/BSD-2-Clause;md5=5d6306d1b08f8df623178dfd81880927" + +DEPENDS += " libbpf clang-native zlib elfutils libpcap" + +SRC_URI = "git://github.com/xdp-project/xdp-tools.git;branch=v1.2;protocol=https \ + file://0001-configure-skip-toolchain-checks.patch \ + file://0002-Makefile-It-does-not-detect-libbpf-header-from-sysro.patch \ + file://0003-Makefile-fix-KeyError-failure.patch \ + file://0004-Makefile-fix-libxdp.pc-error.patch \ + " + +SRCREV = "57a139f9bf6ef644f9c1deb4f7df4bb4c76d6179" + +S = "${WORKDIR}/git" + +inherit pkgconfig + +EXTRA_OEMAKE += "PREFIX=${D}${prefix} LIBDIR=${D}${libdir} BUILD_STATIC_ONLY=1 PRODUCTION=1" + +CFLAGS += "-fPIC" + +export STAGING_INCDIR + +do_install () { + oe_runmake install + + # Remove object files *.o + rm -rf ${D}/${libdir}/bpf +} + +RDEPENDS:${PN} += "bash" diff --git a/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.8.bb b/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.8.bb deleted file mode 100644 index 7cd49a0..0000000 --- a/dynamic-layers/clang-layer/recipes-support/xdp-tools/xdp-tools_1.2.8.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Utilities and example programs for use with XDP" -HOMEPAGE = "https://github.com/xdp-project/xdp-tools" -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9ee53f8d06bbdb4c11b1557ecc4f8cd5 \ - file://LICENSES/GPL-2.0;md5=994331978b428511800bfbd17eea3001 \ - file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd \ - file://LICENSES/BSD-2-Clause;md5=5d6306d1b08f8df623178dfd81880927" - -DEPENDS += " libbpf clang-native zlib elfutils libpcap" - -SRC_URI = "git://github.com/xdp-project/xdp-tools.git;branch=v1.2;protocol=https \ - file://0001-configure-skip-toolchain-checks.patch \ - file://0002-Makefile-It-does-not-detect-libbpf-header-from-sysro.patch \ - file://0003-Makefile-fix-KeyError-failure.patch \ - file://0004-Makefile-fix-libxdp.pc-error.patch \ - " - -SRCREV = "d4ff1f9bcf8b03556b625ab6e16958598482e861" - -S = "${WORKDIR}/git" - -inherit pkgconfig - -EXTRA_OEMAKE += "PREFIX=${D}${prefix} LIBDIR=${D}${libdir} BUILD_STATIC_ONLY=1 PRODUCTION=1" - -CFLAGS += "-fPIC" - -export STAGING_INCDIR - -do_install () { - oe_runmake install - - # Remove object files *.o - rm -rf ${D}/${libdir}/bpf -} - -RDEPENDS:${PN} += "bash" -- cgit v1.2.3-54-g00ecf