From patchwork Sun Sep 3 13:32:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 29895 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8846CC83F2C for ; Sun, 3 Sep 2023 13:32:36 +0000 (UTC) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.web11.27501.1693747955756881362 for ; Sun, 03 Sep 2023 06:32:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=UYP/XrL9; spf=pass (domain: gmail.com, ip: 209.85.218.54, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-99c3d3c3db9so93068666b.3 for ; Sun, 03 Sep 2023 06:32:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693747954; x=1694352754; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MHvKODJxTlknl7AjtdX+5nukPOb5ahmUtLU+swULZpQ=; b=UYP/XrL9WnWHLgJyd0gHxFZb8dBG9j/xvFmxv5NHW4lR30mVyuu8BNB9B2kW9Ym1cF 99oPBW5JHIHBnKmXQ5z9aOBZZ26qNp7UohLdHCESmUOpD284bh6oBDoU/R60SoXVKV92 HOsfoXo6IpkQ/0AWcLPr4O+7EhX3Ys6uELdBJFa6YkdKv/rNxGCHSTae41bnoVJeBhGa 6jcqUAmieKtaStOJsTp9LXolyZA9cjp3m8P18zW1DLxT5D0bpYuWMMm7423EcNf8sA+J GJRIGEpuMuXvru3O52liLewfE8V1TvIj29hdJTefe63CnxwaAK0zyMPZDgymvPSJgXuz 64YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693747954; x=1694352754; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MHvKODJxTlknl7AjtdX+5nukPOb5ahmUtLU+swULZpQ=; b=aEb5zl68KtyjwJ+HYnukYSvHK26+nNwZDVDTl9HM2It2lF5GYzXaTwkO6k5bHpZGfI QNubo4hawRNld4DJJwdJkZpbryQWf3cH4w3OXAWy1W80foS34jHo6eC74edqiL9eoCxt 1aM4PhlnBT+eu+SCbHjtGR+Y2rtMslPXGWRs36geRcIA8r9fsAeSwAXnY/ao7AqeP5pA 0hpm4wgoXBiR8QPqrqYdXPvQ+C7ZUEbww9ri+4KZ6xVq1VpJcpVMSPqtVlTl7OEYqe5U 3YC2fesJf5sN/hkbV4HCKNLkCjjzXeVcqe02xwPNf/Deqtj+z0cMsHwGB9cJTGaU1mKH iI7Q== X-Gm-Message-State: AOJu0YwkYwKq+sgKrQQa9GM7faAivYK+XTjAoWDpNQlaDVF4FX74g6kr DlukL8ajSuE8qtbKSFZLwKoZILi1388= X-Google-Smtp-Source: AGHT+IHD715UmqqkYZ59g/TuFY0dOZQdf/vGibQJrQtsQIxpk/SPxcK4JfZFDJAe+Ld+EAWPqdlXXg== X-Received: by 2002:a17:906:5db4:b0:9a1:e011:1a62 with SMTP id n20-20020a1709065db400b009a1e0111a62mr4784227ejv.38.1693747953698; Sun, 03 Sep 2023 06:32:33 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id q8-20020a170906940800b00988c0c175c6sm4785965ejx.189.2023.09.03.06.32.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 06:32:33 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][PATCH 1/4] mongodb: enable hardware crc32 only with crc in TUNE_FEATURES Date: Sun, 3 Sep 2023 15:32:09 +0200 Message-ID: <20230903133212.455899-1-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 03 Sep 2023 13:32:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/104697 * see https://jira.mongodb.org/browse/SERVER-30893 * fixes: aarch64-oe-linux-gcc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type --sysroot=TOPDIR/BUILD/work/mach-oe-linux/mongodb/4.4.13-r0/recipe-sysroot -o build/opt/third_party/wiredtiger/src/checksum/arm64/crc32-arm64.o -c -std=c11 -fno-omit-frame-pointer -fno-strict-aliasing -fasynchronous-unwind-tables -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -O2 -Wno-unused-local-typedefs -Wno-unused-function -Wno-deprecated-declarations -Wno-unused-const-variable -Wno-unused-but-set-variable -Wno-missing-braces -Wno-exceptions -fstack-protector-strong -fPIE -DNDEBUG -D_XOPEN_SOURCE=700 -D_GNU_SOURCE -D_FORTIFY_SOURCE=2 -DBOOST_THREAD_VERSION=5 -DBOOST_THREAD_USES_DATETIME -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS -DBOOST_ENABLE_ASSERT_DEBUG_HANDLER -DBOOST_LOG_NO_SHORTHAND_NAMES -DBOOST_LOG_USE_NATIVE_SYSLOG -DBOOST_LOG_WITHOUT_THREAD_ATTR -DABSL_FORCE_ALIGNED_ACCESS -DHAVE_VERBOSE -DHAVE_FALLOCATE -DHAVE_SYNC_FILE_RANGE -DHAVE_ARM_NEON_INTRIN_H -D_GNU_SOURCE -DHAVE_BUILTIN_EXTENSION_ZLIB -DHAVE_BUILTIN_EXTENSION_SNAPPY -DHAVE_BUILTIN_EXTENSION_ZSTD -Isrc/third_party/zstandard-1.4.3/zstd/lib -Isrc/third_party/snappy-1.1.7 -Ibuild/opt/third_party/wiredtiger -Isrc/third_party/wiredtiger -Ibuild/opt/third_party/wiredtiger/src/include -Isrc/third_party/wiredtiger/src/include -Ibuild/opt/third_party/wiredtiger/build_linux -Isrc/third_party/wiredtiger/build_linux src/third_party/wiredtiger/src/checksum/arm64/crc32-arm64.c cc1: warning: command-line option '-Wno-exceptions' is valid for C++/ObjC++ but not for C /tmp/ccGvwFgu.s: Assembler messages: /tmp/ccGvwFgu.s:45: Error: selected processor does not support `crc32cb w2,w2,w3' /tmp/ccGvwFgu.s:77: Error: selected processor does not support `crc32cx w2,w2,x4' /tmp/ccGvwFgu.s:103: Error: selected processor does not support `crc32cb w2,w2,w0' Signed-off-by: Martin Jansa --- .../meta-python/recipes-dbs/mongodb/mongodb_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index 0ce58b13c4..21c3b10148 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -91,6 +91,7 @@ EXTRA_OESCONS = "PREFIX=${prefix} \ --use-system-zlib \ --nostrip \ --endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ + --use-hardware-crc32=${@bb.utils.contains('TUNE_FEATURES', 'crc', 'on', 'off', d)} \ --wiredtiger='${WIREDTIGER}' \ --separate-debug \ ${PACKAGECONFIG_CONFARGS}" From patchwork Sun Sep 3 13:32:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 29897 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7808DC83F2C for ; Sun, 3 Sep 2023 13:32:46 +0000 (UTC) Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by mx.groups.io with SMTP id smtpd.web10.27429.1693747956134655241 for ; Sun, 03 Sep 2023 06:32:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=ExDaYC6q; spf=pass (domain: gmail.com, ip: 209.85.208.44, mailfrom: martin.jansa@gmail.com) Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-52683b68c2fso723297a12.0 for ; Sun, 03 Sep 2023 06:32:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693747954; x=1694352754; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zOAsK9yGewhlljVjjkKRA8dRZqj2ipNpBRwMXZuLUL0=; b=ExDaYC6qxpi0VgwRVHrNzg4xBAoC14RZll5HKvkAbHOAQF491XJz8smhh+1Eou5hvc 3pyjAJzi/7dSGrdqzgdOMlvgAa7Bkzxq7bhgI4zxo0UgJy2w55CX828qW3sKpxjfMvbE rKK3y8fpYVh8WACip1s2kg0KIR2TDnP7IkJIDKU4+R3FuaEYsXHeM1VdsuHxL9LpDntm dkbHxJWhLI7EycO9We7R+boRygep/GNuDm+lvr1G4FBU60gE36l8bWO4qBHvI1ik56mA //2wL19OuPIfWpTpjmMJAJ9LPhOSGzJrymV8aCtQnuQsshA4VmyWwNu31y9y6SZy/qeP CK5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693747954; x=1694352754; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zOAsK9yGewhlljVjjkKRA8dRZqj2ipNpBRwMXZuLUL0=; b=SeAX46D0G8tukUeRB3govOoXfJksfL6xAIFs+DovggC4ZfFxUE8bWaeTSVxDuNgvZ6 URYeYnWPj7XrYSYbVbrMkH6hnwSGD1i5UR/RDmtPUdtFxsc6PYGxp8hTSJQMW7+HDnR1 Z0GKA/i9rF53/IqbjCI3EaGmoPOHsxl11XQzYnLTkMNvlPwhoxDkXT9xTBhx3Zo2Gjbc 6GyjeI6qxiHyA7HTZ+uxXKJKSh9onmEEeDyufz707AU/KdA6jGQnmRTdZy3R3b5oAVAW uZcfyhxYxxy1qg+XwS88lRsa5Q3Q67E4erppd3boiP6yi1mdUW/8MZByngNPseFBQ1ul P42Q== X-Gm-Message-State: AOJu0YzLMwIJim/DI+XW01rit57/K9jXkytmW9163ZNpYMg5Z2RvEuZY C7CT4I5wBOJ6U+QhCQvJDUQLgL6u0M4= X-Google-Smtp-Source: AGHT+IE9SdV7/auJgKYdTWr2+Q6HaUUXjbmvJOaUNxRUbPKz113/MCkQLaAuxOeNGNlOueBHUcwFrQ== X-Received: by 2002:aa7:d9cd:0:b0:522:3a89:a7bc with SMTP id v13-20020aa7d9cd000000b005223a89a7bcmr4909432eds.42.1693747954562; Sun, 03 Sep 2023 06:32:34 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id r7-20020aa7cb87000000b0052996528b81sm4478602edt.45.2023.09.03.06.32.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 06:32:34 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][PATCH 2/4] libcyusbserial: fix installed-vs-shipped QA issue with multilib Date: Sun, 3 Sep 2023 15:32:10 +0200 Message-ID: <20230903133212.455899-2-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230903133212.455899-1-Martin.Jansa@gmail.com> References: <20230903133212.455899-1-Martin.Jansa@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 03 Sep 2023 13:32:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/104698 * testing ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} existence doesn't really work in cross compilation and on some hosts was causing: ERROR: QA Issue: libcyusbserial: Files/directories were installed but not shipped in any package: /usr/lib/libcyusbserial.so.1 /usr/lib/libcyusbserial.so Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. libcyusbserial: 2 installed and not shipped files. [installed-vs-shipped] with multilib using /usr/lib32 or /usr/lib64 when the same didn't exist on host. Signed-off-by: Martin Jansa --- ...on-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch | 43 +++++++++++++++++++ .../libcyusbserial/libcyusbserial_git.bb | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch new file mode 100644 index 0000000000..d9e10469d3 --- /dev/null +++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch @@ -0,0 +1,43 @@ +From 655c5c32b37a2bea12389ed69c0869215fcf5abe Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 3 Sep 2023 11:22:35 +0200 +Subject: [PATCH] CMakeLists.txt: don't fall back CMAKE_INSTALL_LIBDIR to lib + +* testing ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} existence + doesn't really work in cross compilation and on some hosts was causing: + + ERROR: QA Issue: libcyusbserial: Files/directories were installed but not shipped in any package: + /usr/lib/libcyusbserial.so.1 + /usr/lib/libcyusbserial.so + Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. + libcyusbserial: 2 installed and not shipped files. [installed-vs-shipped] + + with multilib using /usr/lib32 or /usr/lib64 when the same didn't + exist on host. + +Upstream-Status: Pending +Signed-off-by: Martin Jansa +--- + lib/CMakeLists.txt | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 2b031cb..53a7263 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -6,15 +6,6 @@ if (NOT CMAKE_INSTALL_LIBDIR) + include(GNUInstallDirs) + endif (NOT CMAKE_INSTALL_LIBDIR) + +-# Fall back to just "lib" if the item provided by GNUInstallDirs doesn't exist +-# For example, on Ubuntu 13.10 with CMake 2.8.11.2, +-# /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} doesn't exist. +-if (NOT EXISTS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +- message(STATUS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} does not exist. Defaulting libcyusbserial install location to ${CMAKE_INSTALL_PREFIX}/lib.") +- set(CMAKE_INSTALL_LIBDIR lib) +-endif() +- +- + ################################################################################ + # Include paths + ################################################################################ diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb index 81453fb888..a69194996b 100644 --- a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb +++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb @@ -8,7 +8,9 @@ DEPENDS = "libusb udev" PV = "1.0.0+git${SRCPV}" SRCREV = "655e2d544183d094f0e2d119c7e0c6206a0ddb3f" -SRC_URI = "git://github.com/cyrozap/${BPN}.git;branch=master;protocol=https" +SRC_URI = "git://github.com/cyrozap/${BPN}.git;branch=master;protocol=https \ + file://0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch \ +" S = "${WORKDIR}/git" From patchwork Sun Sep 3 13:32:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 29896 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 764E4C83F2D for ; Sun, 3 Sep 2023 13:32:46 +0000 (UTC) Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by mx.groups.io with SMTP id smtpd.web11.27502.1693747957482950579 for ; Sun, 03 Sep 2023 06:32:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=byD9O4xd; spf=pass (domain: gmail.com, ip: 209.85.208.47, mailfrom: martin.jansa@gmail.com) Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-52c4d3ff424so884475a12.0 for ; Sun, 03 Sep 2023 06:32:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693747956; x=1694352756; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uYq7ZnKYvl3axtGENLWcxI/lOnRWzmvQP0/re3H5j2E=; b=byD9O4xdsMZaKLoinaNsBxpoCmJPR98N7Etg058hWnuclwXhf0IeJybYXEQH7Yz3u5 ZqhgipYpLYZNdg7bU0KX9tKbmzfB+cDVSSFILyLpcObqS3upLsG9jjWs9E4eBQDCVzCj ENq5nZlVwPNFBx1zFaYFDtDByBgxLvoVhm76ud2/d11smbLWn1hPAYbCmnJ3SfULbEM4 a9ajswHwSd5Txpwz0EJUGWbmLa+l2gCfyko4nFGy6AnZcEHZpDdTWZh5SRDCrX2R6Ppu 8f/GIF6ICmAVdjMmerOfqfvvNZIbjdtVzP87O5BkkTdYouSx7o6zpka2SfBqR9sRTiGj Cpzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693747956; x=1694352756; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uYq7ZnKYvl3axtGENLWcxI/lOnRWzmvQP0/re3H5j2E=; b=NPUqyWPJDCD3wmA2Wvl6mXDrnvBPhZs9Zy6vbvVqBN5nFuuRG5rB0MDSkDZoQYbtsB qAk5veMW2GIFDCfxEKvpSQisZgeYdSng7iOLGgFZcdbivZ9FNJmE3pZNjWYrM8LNmw1l Xp0RnC5N3C6xeiJ45m9Kd6D/rIYnO3vUHGF2QTnWVaJHuX9DevZXpUpkUVDbGJTCfsbx YuXAUV+GgbQWnC1BP9lvaLv38zYt72+HlTivQAGJdkWQ/HGOiRtxw3zVyMONj59pgyyr OfsvmyH12DHHhziUIHyHsyHYZEDT+iID21143H+d3C8LSffffn1sAbtAwqf0UTV2zZMe B1pQ== X-Gm-Message-State: AOJu0Yx4YXMekgeWkzWHbQYdSxVC7ODV4dNTD4czGRZtTpu+EhWc1iin TBKdTHYw0MttPLD7vHCCmrO8M/9FeKg= X-Google-Smtp-Source: AGHT+IF+t7juoCqNfv8AstXmk1emf91HwxYIP6DxVoru5AO5KDC5X8eYiyq0B71g6iH9eK+imcQyqw== X-Received: by 2002:a17:906:6a8d:b0:99b:627b:e96d with SMTP id p13-20020a1709066a8d00b0099b627be96dmr5648633ejr.44.1693747955843; Sun, 03 Sep 2023 06:32:35 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id kt8-20020a170906aac800b0099df2ddfc37sm4725270ejb.165.2023.09.03.06.32.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 06:32:35 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][PATCH 3/4] khronos-cts.inc: respect MLPREFIX when appending DEPENDS with anonymous python Date: Sun, 3 Sep 2023 15:32:11 +0200 Message-ID: <20230903133212.455899-3-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230903133212.455899-1-Martin.Jansa@gmail.com> References: <20230903133212.455899-1-Martin.Jansa@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 03 Sep 2023 13:32:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/104699 * this causes 2 issues: lib32-opengl-es-cts depending on 64bit wayland and wayland-protocols: $ bitbake-getvar -r lib32-opengl-es-cts DEPENDS # # $DEPENDS [14 operations] # set /OE/build/oe-core/openembedded-core/meta/conf/bitbake.conf:309 # "" # set /OE/build/oe-core/openembedded-core/meta/conf/documentation.conf:137 # [doc] "Lists a recipe's build-time dependencies (i.e. other recipe files)." # :prepend /OE/build/oe-core/openembedded-core/meta/classes-global/base.bbclass:57 # "${BASEDEPENDS} " # :prepend /OE/build/oe-core/openembedded-core/meta/classes-recipe/pkgconfig.bbclass:7 # "pkgconfig-native " # :prepend /OE/build/oe-core/openembedded-core/meta/classes-recipe/cmake.bbclass:10 # "cmake-native " # :append /OE/build/oe-core/openembedded-core/meta/classes-recipe/python3native.bbclass:11 # " python3-native " # append /OE/build/oe-core/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc:28 # "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" # :append[libc-musl] /OE/build/oe-core/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc:38 # " libexecinfo" # rename (to) classextend.py:108 [map_depends_variable] # "DEPENDS_NONML" # set classextend.py:109 [map_depends_variable] # "${@oe.classextend.get_depends('DEPENDS', d)}" # append classextend.py:110 [map_depends_variable] # [vardeps] " DEPENDS_NONML" # append cmake.bbclass:25 [__anon_30__OE_build_oe_core_openembedded_core_meta_classes_recipe_cmake_bbclass] # " ninja-native" # append khronos-cts.inc:77 [__anon_80__OE_build_oe_core_meta_openembedded_meta_oe_recipes_graphics_vk_gl_cts_khronos_cts_inc] # " wayland-native wayland wayland-protocols" # append khronos-cts.inc:79 [__anon_80__OE_build_oe_core_meta_openembedded_meta_oe_recipes_graphics_vk_gl_cts_khronos_cts_inc] # " virtual/libx11 virtual/egl " # pre-expansion value: # "${@oe.classextend.get_depends('DEPENDS', d)} ninja-native wayland-native wayland wayland-protocols virtual/libx11 virtual/egl " DEPENDS="cmake-native lib32-libpng pkgconfig-native python3-lxml-native python3-native qemu-native virtual/lib32-arm-oemllib32-linux-gnueabi-compilerlibs virtual/arm-oemllib32-linux-gnueabi-gcc virtual/lib32-libc virtual/lib32-libgles2 lib32-zlib ninja-native wayland-native wayland wayland-protocols virtual/libx11 virtual/egl " * lib32-opengl-es-cts-dev runtime depending on 64bit wayland-dev wayland-protocols-dev as caught by multilib QA check: ERROR: QA Issue: lib32-opengl-es-cts package lib32-opengl-es-cts-dev - suspicious values 'wayland-dev wayland-protocols-dev' in RRECOMMENDS [multilib] Signed-off-by: Martin Jansa --- meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 097acc1a0b..72005636ea 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -74,9 +74,9 @@ python __anonymous() { distrofeatures = (d.getVar("DISTRO_FEATURES") or "") if not bb.utils.contains_any("PACKAGECONFIG", ["surfaceless", "wayland", "x11_egl", "x11_glx", "x11_egl_glx"], True, False, d): if "wayland" in distrofeatures: - d.appendVar("DEPENDS", " wayland-native wayland wayland-protocols") + d.appendVar("DEPENDS", " wayland-native ${MLPREFIX}wayland ${MLPREFIX}wayland-protocols") if "x11" in distrofeatures: - d.appendVar("DEPENDS", " virtual/libx11 virtual/egl ") + d.appendVar("DEPENDS", " virtual/${MLPREFIX}libx11 virtual/${MLPREFIX}egl ") } CTSDIR = "/usr/lib/${BPN}" From patchwork Sun Sep 3 13:32:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 29898 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79B85CA0FE3 for ; Sun, 3 Sep 2023 13:32:46 +0000 (UTC) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.web10.27430.1693747958632871671 for ; Sun, 03 Sep 2023 06:32:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=S21C/L0Q; spf=pass (domain: gmail.com, ip: 209.85.218.54, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-99bc9e3cbf1so130343066b.0 for ; Sun, 03 Sep 2023 06:32:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693747957; x=1694352757; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DYQpHIdY7B3UxWn3XqaFQetfR2oCs38WX5nTOqKcLAs=; b=S21C/L0Qgbx3hfA9/n6/a2E4GNexF77ATtEBD6OiRDAFmBWWfCNVQNUY494FGY+4En sjUZwZkPBOcmn/Xk72tCjdkwbN7I97ks3PK8OoL389A3sutFDG6HE8WRCOgcj7H+LhC6 hekN7ewSe13wSggLopHWqpVBddBslOHhoHCM4egUxQA7KtSJU3kuxkvFZLsSJgYcmHNA 8FMf7l8rM+p31lrooiLppeV3Oz1czpfLQyGKonkEVuA22Mxen0wRxmyDevXkqwuItCWD WqfvixH9WQIlxjHwpQubFC3WxWOZ7BWfTYwkUOUxUKIzBkIVtSDl55yB0eA8eCV+sWv3 hlFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693747957; x=1694352757; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DYQpHIdY7B3UxWn3XqaFQetfR2oCs38WX5nTOqKcLAs=; b=bDzMFF+FcElYT1cmb2BnxTC0jn+SbWmxiVTfDiA4jazvUcrzzSPBnuqPl1svfkYy4F 2KuhTwtkZ4qdmTd7N5oapucguepXMtfamHToxuAMPeweDwCk6Qhosp0uLvWcXI5dMx3O UEYxn/KSRTh/zAlqjf3Hl4Z9tL9okgtYqKQK8vshtad8pMuNilUhKWtOPUrvQ0sZfc0H tqlpNO9iTT2NLtIn6XAbWX880ZEMrX6ylcX6JN0VEK4aAYVjsB2MYPUhU7Lc9CEpszXK fyPeDP5MqFk3aPmg+Q/UbKzhJDW05zahhkSQIwZc5+lNrcGbEEX4B/jG1XI9Skqgs8AK Yifg== X-Gm-Message-State: AOJu0Yz2WFmpPo3y05iV77P1YSsZ1tvHtklhDY55lLx47ne+HyGu+CNX udtjaJ7wNqQbXizQoKlhraYI94ypktE= X-Google-Smtp-Source: AGHT+IH75nS3WzBwfShuMXTA+VLr0m6AUgvuQkGpxdazr4m2TPMWaLe5t//otuDB2/cqNyx5S2TsOA== X-Received: by 2002:a17:906:c148:b0:96f:9cea:a34d with SMTP id dp8-20020a170906c14800b0096f9ceaa34dmr12069608ejc.21.1693747956970; Sun, 03 Sep 2023 06:32:36 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id j8-20020a170906830800b009a19701e7b5sm4788975ejx.96.2023.09.03.06.32.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Sep 2023 06:32:36 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][PATCH 4/4] tcpreplay: fix pcap detection with /usr/lib32 multilib Date: Sun, 3 Sep 2023 15:32:12 +0200 Message-ID: <20230903133212.455899-4-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230903133212.455899-1-Martin.Jansa@gmail.com> References: <20230903133212.455899-1-Martin.Jansa@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 03 Sep 2023 13:32:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/104700 * use BPN, BP where useful * use prefix instead of hardcoding /usr * add patch to search also in lib32 subdir of --with-libpcap value to fix: checking for libpcap... configure: error: "Unable to find matching library for header file in TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-tcpreplay/4.4.4-r0/lib32-recipe-sysroot/usr" Signed-off-by: Martin Jansa --- ...fy-search-dirs-for-pcap-and-add-lib3.patch | 82 +++++++++++++++++++ .../tcpreplay/tcpreplay_4.4.4.bb | 9 +- 2 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch new file mode 100644 index 0000000000..709d2cccbc --- /dev/null +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch @@ -0,0 +1,82 @@ +From 5f8c78362b3b1e06f5adff2d4b140509c4799894 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 3 Sep 2023 12:31:59 +0200 +Subject: [PATCH] configure.ac: unify search dirs for pcap and add lib32 + +* add lib32 because when building lib32-tcpreplay it's + impossible to set --with-libpcap so that it would find + both include files as well as the library in lib32 directory + +* maybe it would be beneficial to split --with-libpcap + into --with-libpcap-includedir --with-libpcap-libdir as this + already searches in the --with-libpcap value with and + without any "lib" prefix, but include files always expect + "include" dir there + +* most of this code was added in: + https://github.com/appneta/tcpreplay/commit/202b8e82f9fd3c84ce5804577caeb36a33baabe7#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810R570 + +* then search for + ${host_cpu} lib/${host_cpu} (without -${host_os} suffix) + and ${build_arch}-${host_os} lib/${build_arch}-${host_os} + was added, but only for search of dynamic library in: + https://github.com/appneta/tcpreplay/commit/c3d5236563985a99f8bb02c3f1bd6950e3929047 + +* ${build_arch}-${host_os} lib/${build_arch}-${host_os} + was later replaced with: + lib/${MULTIARCH} ${MULTIARCH} + and it was added to static library search as well + + but for dynamic library it was searching in reversed order: + ${MULTIARCH} lib/${MULTIARCH} + https://github.com/appneta/tcpreplay/commit/ed9e3a818bde04813144014561e62f018c9eb85f + + I don't think this reversed order was intentional, just unify all 4 cases + to use the same directories in the same order + +Signed-off-by: Martin Jansa +Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/819] +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 387219de..26ba31a5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -671,7 +671,7 @@ AC_ARG_WITH(libpcap, + LPCAPINCDIR=${testdir} + if test $dynamic_link = yes; then + for ext in .dylib .so .tbd ; do +- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do ++ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do + sharefile=$(ls ${testdir}/$dir/libpcap${ext}* 2> /dev/null | sort | head -n1) + if test -n "${sharefile}"; then + LPCAP_LD_LIBRARY_PATH="$(dirname ${sharefile})" +@@ -690,7 +690,7 @@ AC_ARG_WITH(libpcap, + dnl If dynamic library not found, try static + dnl + for ext in ${libext} .a .A.tbd ; do +- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do ++ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do + staticfile=$(ls ${testdir}/$dir/libpcap${ext} 2> /dev/null | sort | head -n1) + if test -n "${staticfile}"; then + LPCAPLIB="${staticfile}" +@@ -771,7 +771,7 @@ AC_ARG_WITH(libpcap, + LPCAPINCDIR="${testdir}/include" + if test $dynamic_link = yes; then + for ext in .dylib .so .tbd; do +- for dir in . lib lib64 ${host_cpu} lib/${host_cpu} ${host_cpu}-${host_os} lib/${host_cpu}-${host_os} ${MULTIARCH} lib/${MULTIARCH}; do ++ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do + sharefile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1) + if test -n "${sharefile}"; then + LPCAPLIB="-L$(dirname ${sharefile}) -lpcap" +@@ -790,7 +790,7 @@ AC_ARG_WITH(libpcap, + dnl If dynamic library not found, try static + dnl + for ext in ${libext} .a .A.tbd ; do +- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do ++ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do + staticfile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1) + if test -n "${staticfile}"; then + LPCAPLIB="${staticfile}" diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb index c7d14e2ab6..53f17c9619 100644 --- a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb @@ -7,9 +7,10 @@ SECTION = "net" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8" -SRC_URI = "https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcpreplay-${PV}.tar.gz \ - file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \ - " +SRC_URI = "https://github.com/appneta/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ + file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \ + file://0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch \ +" SRC_URI[sha256sum] = "44f18fb6d3470ecaf77a51b901a119dae16da5be4d4140ffbb2785e37ad6d4bf" @@ -17,7 +18,7 @@ UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" DEPENDS = "libpcap" -EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}/usr" +EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}${prefix}" inherit siteinfo autotools-brokensep