From patchwork Mon Apr 10 18:58: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: 22506 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 76DA4C76196 for ; Mon, 10 Apr 2023 18:58:41 +0000 (UTC) Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by mx.groups.io with SMTP id smtpd.web10.54244.1681153117622691887 for ; Mon, 10 Apr 2023 11:58:37 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20210112 header.b=NlL2Bgvv; spf=pass (domain: gmail.com, ip: 209.85.218.53, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f53.google.com with SMTP id ga37so14971334ejc.0 for ; Mon, 10 Apr 2023 11:58:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681153116; x=1683745116; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=GmF7wJYj4uE02ul6k0j7RpcP0vXUhbnV4IT9kqd5KR4=; b=NlL2BgvvmiBw2eO5tkvUotN4okAjl4gG+eEm/s0qtxCTd+0+x6DCLHhxLbKXEwjgG9 p5jYQruMQ5+rmoadn1tcGapAhjRzGpTKF0SbQpzVE6b5I1tI/a/fcOULFCOvar8rB11S QRdqoWKSWGjyHMgwCeP2eEObghNljI6ywkZo9tluE8rnYqGkZHH0baQ1HkhE9lnDOpM3 a1SMOm8zMHADogKxywSdaWBwO2eW6nXYQPjkBMTuTc0CZdFLecoKLiVMaavqjnbyAiH8 HTq0jpjyVtms3fb356xGI3d4a/n07QHXVhlI+XZSMZimx/FREkNopwBpxku7lnv2hQJ2 oBow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681153116; x=1683745116; 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=GmF7wJYj4uE02ul6k0j7RpcP0vXUhbnV4IT9kqd5KR4=; b=RviP2BblynN4V+frBvm60yh4g2+RSqA0CEhNqtipMrAtEOeC1nNbs9p8nCKhyBQLym gVO7gBy6yUivolwSiC+WXCYGtjKDLokRryBX3ebfZUKmEYE5nRRRrZaCs2SuKh81AfC8 JyETCPcMyIbKvdbNMtSR8iBNIwqR1Z/InHGgNbJ+a2A6xYY/1qOH6fVWUUuknOLoBWcq BnQdCgEKBFPxrzukLlcXxWMJHAISiJVkRphTiGSkopN/8Wqb4I1301CXyvR4UDt3Gyd/ cf8wyjkgUn5m7WpOfrm3Ssu49I1usbjbeJQTeHMShKkNyc9dajS7dTUAKMvZZAilZSfU ta7w== X-Gm-Message-State: AAQBX9foUdruWYaq1NGjWneywy9isTATRV33XqavA528clAw4KEFsgDv ClthDXYHNUa2cmJv4j3oprZWV43S2xg= X-Google-Smtp-Source: AKy350YrmIS9Kdnzx7bYkOEDqhmC1CQzeNsKrnqWb1FL0SVDpRUU5mJZF8ZIsdcAX0SdpjoxrrMfrA== X-Received: by 2002:a17:906:388c:b0:947:4828:4399 with SMTP id q12-20020a170906388c00b0094748284399mr7556734ejd.12.1681153116023; Mon, 10 Apr 2023 11:58: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 xd4-20020a170907078400b0094a941ad8f0sm1098552ejb.193.2023.04.10.11.58.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 11:58:35 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa , Martin Jansa , Khem Raj Subject: [meta-oe][kirkstone][PATCH 1/9] jack: fix compatibility with python-3.11 Date: Mon, 10 Apr 2023 20:58:11 +0200 Message-Id: <20230410185819.2416704-1-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.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 ; Mon, 10 Apr 2023 18:58:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102043 From: Martin Jansa Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- ...U-mode-bit-for-opening-files-in-pyth.patch | 52 +++++++++++++++++++ .../recipes-multimedia/jack/jack_1.19.20.bb | 4 +- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-multimedia/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch b/meta-oe/recipes-multimedia/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch new file mode 100644 index 0000000000..d3b203111f --- /dev/null +++ b/meta-oe/recipes-multimedia/jack/jack/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch @@ -0,0 +1,52 @@ +From 415d50fc56b82963e5570c7738c61b22f4a83748 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Mon, 11 Jul 2022 00:56:28 +0200 +Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python + +The 'U' mode bit is removed in python 3.11. It has been +deprecated for a long time. The 'U' mode bit has no effect +so this change doesn't change any behavior. + +See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api + +Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/884] +--- + waflib/ConfigSet.py | 2 +- + waflib/Context.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index b300bb56..84736c9c 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -312,7 +312,7 @@ class ConfigSet(object): + :type filename: string + """ + tbl = self.table +- code = Utils.readf(filename, m='rU') ++ code = Utils.readf(filename, m='r') + for m in re_imp.finditer(code): + g = m.group + tbl[g(2)] = eval(g(3)) +diff --git a/waflib/Context.py b/waflib/Context.py +index 9fee3fa1..761b521f 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -266,7 +266,7 @@ class Context(ctx): + cache[node] = True + self.pre_recurse(node) + try: +- function_code = node.read('rU', encoding) ++ function_code = node.read('r', encoding) + exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict) + finally: + self.post_recurse(node) +@@ -662,7 +662,7 @@ def load_module(path, encoding=None): + + module = imp.new_module(WSCRIPT_FILE) + try: +- code = Utils.readf(path, m='rU', encoding=encoding) ++ code = Utils.readf(path, m='r', encoding=encoding) + except EnvironmentError: + raise Errors.WafError('Could not read the file %r' % path) + diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb b/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb index 452f066559..ea8c0f385a 100644 --- a/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb +++ b/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb @@ -14,7 +14,9 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libsamplerate0 libsndfile1 readline" -SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https" +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https \ + file://0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch \ +" SRCREV = "a2fe7ec2fdbd315f112c8035282d94a429451178" S = "${WORKDIR}/git" From patchwork Mon Apr 10 18:58: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: 22509 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 8D5C8C77B74 for ; Mon, 10 Apr 2023 18:58:41 +0000 (UTC) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mx.groups.io with SMTP id smtpd.web11.52985.1681153118418951678 for ; Mon, 10 Apr 2023 11:58:38 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20210112 header.b=piSTXUBY; spf=pass (domain: gmail.com, ip: 209.85.218.43, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f43.google.com with SMTP id dm2so14736166ejc.8 for ; Mon, 10 Apr 2023 11:58:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681153117; x=1683745117; 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=0cRCCgTpTXPe3v71O3gFnsQ9wZmzaBgDgCIQiAAKm6Q=; b=piSTXUBYW1bafRoBHfeNRS+A1KZl8WEU+ctvRbJTJwdP0klyDnQKowGoiDfHs2YSEp J08ddjEdNALekFtfqmX13Ul4pQgU/m14Oe48JyGLquHDiQJH0bH9hLrG9qj14h4KykFp PDFzrS4fYkeuqCf6Xs3H7dc408EX3sDSn6vzkutOWyauUz3OfRDEk/uM4xcAtMIXUQGF Ym7oSqAMq9RKvxeM8lnHzy0If7Li+phjaRqdBQ2fquQT1OKA/DWePmK141pO8NrCpa0F 6lnuS9GaG3lQf4HU0p6IgzjrrMk5/RV4f0dvwnG5iw27qnkRdecYfeVIaFXpLpFYBjl8 jPPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681153117; x=1683745117; 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=0cRCCgTpTXPe3v71O3gFnsQ9wZmzaBgDgCIQiAAKm6Q=; b=wggF1R6RSKqjsqNgKomHWjEh4z6WwcYYLRtp6xeuzZmQsVAhiyNMLSj/5nWdz/CjBp bcKdwHxZuJK2R2gTEg0D0zXOXzaGG/uAsITotEYG/MK1sim1q1z95XVPIkYHd/QqHy8L nzgepsXzx5r1DFirvuaR1YA9ML+IxNbwEelJV4frOmIM25VEUEccouTMtKAvOuQyuvKl UDtFOicTjluWX5+ejqEYAk9LROrHfs71q5Uqcr7aZOh2s2IMPGlIgDBxg6JMOSCI/zH+ UOTqlS8U3xMULDgHz71zXG8ST2ngdgtXCFNs+yMMyRPDCJVHXVIPgjP7RASQTM14TAkW Izgw== X-Gm-Message-State: AAQBX9dS7JaKRtH+kEeKkYzKivZ/04xT/IOyvTESTioQQbn40D9s3wgG 1KEwp62ly/qf4Yg9lP0AX17ZQcxdmwU= X-Google-Smtp-Source: AKy350aVXru4T0zq51rnpfnCkFynWwBXA93EaTGWvaTHjON2xTreXAmaxVszMFiuMwbfH7ouWsEITw== X-Received: by 2002:a17:906:3958:b0:94a:4ec9:cf27 with SMTP id g24-20020a170906395800b0094a4ec9cf27mr5235640eje.20.1681153116751; Mon, 10 Apr 2023 11:58: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 xh8-20020a170906da8800b0094809142160sm5288321ejb.55.2023.04.10.11.58.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 11:58:36 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Wang Mingyu , Khem Raj Subject: [meta-oe][kirkstone][PATCH 2/9] openwsman: Change download branch from master to main. Date: Mon, 10 Apr 2023 20:58:12 +0200 Message-Id: <20230410185819.2416704-2-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230410185819.2416704-1-Martin.Jansa@gmail.com> References: <20230410185819.2416704-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 ; Mon, 10 Apr 2023 18:58:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102044 From: Wang Mingyu Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb index af0a3c2bd2..6801020ef9 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb +++ b/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb @@ -17,7 +17,7 @@ REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "d8eba6cb6682b59d84ca1da67a523520b879ade6" -SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=master;protocol=https \ +SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=main;protocol=https \ file://libssl-is-required-if-eventint-supported.patch \ file://openwsmand.service \ file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ From patchwork Mon Apr 10 18:58:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 22508 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 852C7C77B75 for ; Mon, 10 Apr 2023 18:58:41 +0000 (UTC) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web10.54245.1681153119041711349 for ; Mon, 10 Apr 2023 11:58:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20210112 header.b=KyAChDoX; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id jg21so14292877ejc.2 for ; Mon, 10 Apr 2023 11:58:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681153117; x=1683745117; 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=5K9bnRrci2eYUece1R+dc97K2aWiIbx4QWgQnf/gi7M=; b=KyAChDoXHSD8TEGEi6PJjpqp2EfPhsmh0Pv8X5mnIZQiX1mstIAaN8QKEsqAzpFNEK irKGP6JSLjsb4HKiFj9dvQgoRLf2PHqQt4qjEO2hRhun/vBryrts0+PFzdV9G8qn/G1B 4r69gTyhP+NqsFe64DA54M8lFXAOMOFDW3Lcrx6GsGBbaAYorDjp+BK6Hv4BdZ6Th6xS z7l16lbdo4Rv4Ni/fThzLa6zCJh5foSk2ayuOfkLxTciV7V0kOXk2ZivXUoyIXL5LoUE 2oc6gCTYzoU4TxorkmXoo3OTEgd2irDPNpKgH6TlW2k6btX3ioJ5zrO9g/gcKdcTN16s cAcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681153117; x=1683745117; 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=5K9bnRrci2eYUece1R+dc97K2aWiIbx4QWgQnf/gi7M=; b=DZ5j4c0az89VftfwjozOkwRL6kEDKGvny1elZkQZYVj30coRoaviY6Mqx7GKd8hHEt syBdWgRWXLkpGF4kDgEF7rYFWxwHtNd7u6mYrVqtmg1NYfQgwxOc26+3Ue0NBNYkF9za vxvrXov/KUbsk6ZU/yy+1Z2V3bo5QdxruyRRKG2md/9UXt3YnYmGn20R9FO6osxPHWr2 nG0cIkPGdSL3Ad2/x8K0DAjx079A3V1D+rewbhni1z40eaGcVdribUD/ypYVU0rBU+Qw lcg33sa0iZ23BIoR6OIp/U9uiDSc0CJ+fAFc+ematkMYku9WAsRjehTAkW6PQg+dPbC8 GOzg== X-Gm-Message-State: AAQBX9fMdbqdRZzenF3DDxu25ZZKsGiU8N4gRvZSkXTg9+d1vyM0Fa5f wOn2qJxbOl03Ouc2cX272KVvHnBheQ8= X-Google-Smtp-Source: AKy350aoGKAM85HB5wvNDyG7FjcEs1VZtV1BX2Rgl0Zeck9tnf1X7rN9aDH5fBNLR7tc2E6hDHsdSg== X-Received: by 2002:a17:906:3a16:b0:925:5eb8:92fd with SMTP id z22-20020a1709063a1600b009255eb892fdmr8378667eje.14.1681153117588; Mon, 10 Apr 2023 11:58:37 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id g23-20020a1709067c5700b00947c0df0fc4sm5393504ejp.19.2023.04.10.11.58.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 11:58:37 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa , Martin Jansa , Khem Raj Subject: [meta-oe][kirkstone][PATCH 3/9] restinio: fix S variable in multilib builds Date: Mon, 10 Apr 2023 20:58:13 +0200 Message-Id: <20230410185819.2416704-3-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230410185819.2416704-1-Martin.Jansa@gmail.com> References: <20230410185819.2416704-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 ; Mon, 10 Apr 2023 18:58:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102045 From: Martin Jansa * do_populate_lic as well as do_configure fails in multilib builds, because S points to empty: lib32-restinio/0.6.13-r0/lib32-restinio-0.6.13/dev Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../recipes-connectivity/restinio/restinio_0.6.13.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb b/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb index e715135dc3..03eff43dd2 100644 --- a/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb +++ b/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb @@ -9,11 +9,11 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://../LICENSE;md5=f399b62ce0a152525d1589a5a40c0ff6" DEPENDS = "asio fmt http-parser" -SRC_URI = "https://github.com/Stiffstream/restinio/releases/download/v.${PV}/restinio-${PV}.tar.bz2" +SRC_URI = "https://github.com/Stiffstream/restinio/releases/download/v.${PV}/${BP}.tar.bz2" SRC_URI[md5sum] = "37a4310e98912030a74bdd4ed789f33c" SRC_URI[sha256sum] = "b35d696e6fafd4563ca708fcecf9d0cf6705c846d417b5000f5252e0188848e7" -S = "${WORKDIR}/${PN}-${PV}/dev" +S = "${WORKDIR}/${BP}/dev" inherit cmake From patchwork Mon Apr 10 18:58:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 22507 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 84C3FC77B71 for ; Mon, 10 Apr 2023 18:58:41 +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.52986.1681153119836012052 for ; Mon, 10 Apr 2023 11:58:40 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20210112 header.b=UgtGYfWT; 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 gb34so14797839ejc.12 for ; Mon, 10 Apr 2023 11:58:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681153118; x=1683745118; 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=ghz35UFcABDSNTkCDiR+8LDvBvR49aLkfVPq+4doTWg=; b=UgtGYfWTVrJ9Cx0jD0nR0GGa0FNr8ncQuJHAvsR/GAfWYUEfnndGrrlcbZYVFDiOg9 iAEPRx7KMJg4UMFfa51gs5F5gYkswXX/slsOQ9PqlYbZIE+7LAzm/0TKnnD9Bw5GWSc/ nzvxNsz9fUhT6k/p4429MKunUJSWK24igLzl1keJfgo+R1rfPH8XyVtqvtrpjVxDyU/1 7957tnSqPgrSKU+/LWBaODAEZG9aUqMa2rLwIvBYDT73CzdM4hR4DPt91uTFjcvxOevk SBro4PkoAUJnVxqWbQ07Du7xGJCT9lGIkWK8urDZWtdrVZ1F7QfHYU8dao4iPRT1OjAK eI7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681153118; x=1683745118; 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=ghz35UFcABDSNTkCDiR+8LDvBvR49aLkfVPq+4doTWg=; b=j7pnUrOdxWdbFAlNdkrqp7/VFlqELdCb60G2yTLBrPTNVQbsR74SeNATQEyPjLeFst twKdPR7NVWfwUprRybfkTG9Q9T2mJx/jGmzpfE+OfMlEJEIB2k8bJ9eOLwZ6laUQe5Cc 0RQgw5/HLZDC4VmM5gbeNfOsXX1G/Xwk7JRbENjUWMvm8Mr1WjPd10aJckCoyyo2iLzm z+4DY8apehV2HeuoulcZl1BCdGhFkJge1xJgzeX9VoX6lsaWtY7GTdqzk9XNsDa9KS4d 3yyvqJlo9bXZ+A4A1rObdV7qqmB9TP9Q5llgDVagCMnqXXZjaczt/4sQaWXsBrcbgGVb 08HQ== X-Gm-Message-State: AAQBX9dNILJdS3R7rSFaf4Ac6hjvNLH97CeOSpac12Fj2FV/R0ZENs9Q CCEQ2omEbsX6bb+YCk3QQwHsJRTHhRw= X-Google-Smtp-Source: AKy350aLlykpOAlBDkxr37FtXppOoCL2btv2pLtYOEKOzwgBd6r2WguG7LPsPux7wLIqllyh93g2Ng== X-Received: by 2002:a17:907:c21:b0:94d:de69:287b with SMTP id ga33-20020a1709070c2100b0094dde69287bmr1533584ejc.22.1681153118307; Mon, 10 Apr 2023 11:58:38 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id kq9-20020a170906abc900b0094a5edc82b3sm2083007ejb.162.2023.04.10.11.58.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 11:58:38 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa , Martin Jansa , Khem Raj Subject: [meta-oe][kirkstone][PATCH 4/9] mongodb: fix chown user for multilib builds Date: Mon, 10 Apr 2023 20:58:14 +0200 Message-Id: <20230410185819.2416704-4-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230410185819.2416704-1-Martin.Jansa@gmail.com> References: <20230410185819.2416704-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 ; Mon, 10 Apr 2023 18:58:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102046 From: Martin Jansa * the user is named mongodb (BPN) and in multilib builds this fails with: chown: invalid user: 'lib32-mongodb:lib32-mongodb' Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../meta-python/recipes-dbs/mongodb/mongodb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ff4a16e9f2..0969fb6ce2 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 @@ -117,7 +117,7 @@ scons_do_install() { # install mongo data folder install -m 755 -d ${D}${localstatedir}/lib/${BPN} - chown ${PN}:${PN} ${D}${localstatedir}/lib/${BPN} + chown ${BPN}:${BPN} ${D}${localstatedir}/lib/${BPN} # Create /var/log/mongodb in runtime. if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then From patchwork Mon Apr 10 18:58:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 22510 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 7E8EAC77B61 for ; Mon, 10 Apr 2023 18:58:41 +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.54246.1681153120525040489 for ; Mon, 10 Apr 2023 11:58:40 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20210112 header.b=GK+5TzZe; 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 xi5so14621936ejb.13 for ; Mon, 10 Apr 2023 11:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681153119; x=1683745119; 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=uhVaattAVFkxSldh4LfVFZNETAXhhIpQHfxH9vU9WMk=; b=GK+5TzZeVnHH6cBf3ALlu8hK4yMO27d7nTWoZx/fDIl54VL/XC/OxU/6/c1ejTqtoV xLXQSLKhaG5MYjh+JTCzsOeBlDNs3py06vNvT/y9AALDmCiiTQi4ZqwKNmxTdZz7Lunw SOR1ehQoV+UfRw63j1wSMjwBGj65OH7ExH6UMM1agKy5fITfjA+BR4hDuR+AkdJmRk38 wr1reSzVzIDlPs246ancEB43VUNZ05zVtHcLwNhUqbjtdpyK3AAPksFluzuD+m6mhrkY jmp6CDenIjSb7Y7c1fGD1ShLmLcTUwv1/pz6lgxmHrZjB47ykLlduDl73dAW9sH3Jsfh wIOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681153119; x=1683745119; 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=uhVaattAVFkxSldh4LfVFZNETAXhhIpQHfxH9vU9WMk=; b=T1wYbJmKrlFX/TcXk+hQxSD127Di7cfnUdY780LfZuiowQa82ReQPCx2CBpjC4peFH 3ic9lIhXwiln2faVZfi76LAMhSWeVMlSwe/LTLT0ZNjCcHdxUD1fFvTAxma3vCkrLxwe jPSCFV5t+qMkdiXhx27AxOMk3moK6Nr9FGkAcwJx6neVJTDssPrlgJMm44EloH4Kbgra iTQl4RJW/6IcoV5attbYXh5CYAZqgQ7Z+gOwQpBWijnjvH+uQ7+Fx06o4ZYXe1NCF98J yj1aCa7rmB3dIs4PT8KHNC8Fab6PZx4C/O+Dv0HDKokJv7pA9UABZhDOht/dCUNTcda8 Cl+g== X-Gm-Message-State: AAQBX9cGKRurCDuFnlc4thvgt9jd65QsqzqXueiKBoNcTf8owy1/6VzA uyrrAQ/RN5JVsNx0gqsm9kt+actWvtM= X-Google-Smtp-Source: AKy350YRgZFtQDnIdcHP7SpbSffm2mSbZZHfTlRqQmi8IOLgSpKO8xjM3PkqwsXioRSAHQgz+5AUGg== X-Received: by 2002:a17:906:d0da:b0:8b1:3483:e3d5 with SMTP id bq26-20020a170906d0da00b008b13483e3d5mr7379792ejb.48.1681153119037; Mon, 10 Apr 2023 11:58:39 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id j6-20020a170906278600b0093e39b921c8sm5255114ejc.164.2023.04.10.11.58.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 11:58:38 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][kirkstone][PATCH 5/9] postfix: Fix build on systems with linux 6.x Date: Mon, 10 Apr 2023 20:58:15 +0200 Message-Id: <20230410185819.2416704-5-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230410185819.2416704-1-Martin.Jansa@gmail.com> References: <20230410185819.2416704-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 ; Mon, 10 Apr 2023 18:58:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102048 From: Khem Raj * cherry-picked from langdale "postfix: Upgrade to 3.7.3" commit dd5226bed9cc76f2a26a1dce046d9de98c8b4cb4 without the upgrade. Signed-off-by: Khem Raj --- ...kedefs-Account-for-linux-6.x-version.patch | 35 +++++++++++++++++++ .../recipes-daemons/postfix/postfix_3.6.7.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-networking/recipes-daemons/postfix/files/0006-makedefs-Account-for-linux-6.x-version.patch diff --git a/meta-networking/recipes-daemons/postfix/files/0006-makedefs-Account-for-linux-6.x-version.patch b/meta-networking/recipes-daemons/postfix/files/0006-makedefs-Account-for-linux-6.x-version.patch new file mode 100644 index 0000000000..ad1704520c --- /dev/null +++ b/meta-networking/recipes-daemons/postfix/files/0006-makedefs-Account-for-linux-6.x-version.patch @@ -0,0 +1,35 @@ +From e5ddcf9575437bacd64c2b68501b413014186a6a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 19 Oct 2022 10:15:01 -0700 +Subject: [PATCH] makedefs: Account for linux 6.x version + +Major version has bumped to 6 and script needs to know that + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + makedefs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/makedefs ++++ b/makedefs +@@ -613,7 +613,7 @@ EOF + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC-gcc} -shared"} + ;; +- Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR ++ Linux.[3-6]*) SYSTYPE=LINUX$RELEASE_MAJOR + case "$CCARGS" in + *-DNO_DB*) ;; + *-DHAS_DB*) ;; +--- a/src/util/sys_defs.h ++++ b/src/util/sys_defs.h +@@ -751,7 +751,7 @@ extern int initgroups(const char *, int) + /* + * LINUX. + */ +-#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) ++#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) || defined(LINUX6) + #define SUPPORTED + #define UINT32_TYPE unsigned int + #define UINT16_TYPE unsigned short diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.6.7.bb b/meta-networking/recipes-daemons/postfix/postfix_3.6.7.bb index e91e677790..17864b8915 100644 --- a/meta-networking/recipes-daemons/postfix/postfix_3.6.7.bb +++ b/meta-networking/recipes-daemons/postfix/postfix_3.6.7.bb @@ -12,6 +12,7 @@ SRC_URI += "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \ file://0004-Fix-icu-config.patch \ file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ + file://0006-makedefs-Account-for-linux-6.x-version.patch \ " SRC_URI[sha256sum] = "e471df7e0eb11c4a1e574b6d7298f635386e2843b6b3584c25a04543d587e07f" UPSTREAM_CHECK_REGEX = "postfix\-(?P3\.6(\.\d+)+).tar.gz" From patchwork Mon Apr 10 18:58:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 22505 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 76DD1C77B6F for ; Mon, 10 Apr 2023 18:58:41 +0000 (UTC) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web10.54245.1681153119041711349 for ; Mon, 10 Apr 2023 11:58:40 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20210112 header.b=oNlA7L2n; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id jg21so14293144ejc.2 for ; Mon, 10 Apr 2023 11:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681153119; x=1683745119; 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=7TRLtEwL0S4fA6sLLvaQ3rRB2LVya8b6Z1SbXd43X/c=; b=oNlA7L2n/gO0+ql/f+n3RL8OYtYlecazYWS+MpL5AUeAEZ99ymRwBDKlsleIFC+t01 m1D9zdSgJtL8EPSsuyTOnsFluUwQaYMNU2x0JncqPP6j9/UbZPC79Qtj0/KxjqrIvsqI Wsq1ZLgwKSibUmCUbegtYHwJVddrHExEdn3l5MQeQCZgBiWu/h2gs21LXVJLocPBThWF cZp7VazDxLPFt8esY90+rldXLoxz1wL99ziAnC+6jq/EnxQVbnW5988Ng0Bhf6vaklnQ 3IEEZajMajZX2UhtpoW2zKWnWhXhqgji5xrQo5YEv4MjCewpY9rLt41WcO1fLYPgxk/0 va4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681153119; x=1683745119; 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=7TRLtEwL0S4fA6sLLvaQ3rRB2LVya8b6Z1SbXd43X/c=; b=0FVdRz9SQ71iuJixzS+/1kUkr2VYWSWHPfEjc+QGuww+wC0MrRdnAb05jhQEb1LKK/ 7OLKY7rSed7jDkyjWnR+qljSvWTiIM03xIsbqSqnW5FRIRCDGI18ICF8d7uFhXMJaJKd bqp0KUOUSKOrfXvblyKlMCh0YMbxaCWh4YkTcN9qruPKsasNXok/nvYSksyeWoPisn/C THyWsc1rTdzwO0eZA856W4oVjwiRs88jHqcHXvX8JxKlF0d/mGwwNB2P1LN5rMSBbHlV o8QcxyaL6a/32mH9c8qZDjHSGT/rFqYn+Adh1rmxaPcMjinG9injQppaKFSuIgNC8Q4I wCTg== X-Gm-Message-State: AAQBX9djinF51D8yQEKCP9TFwey4fpWXwNgCzeFChIViFiTyGbMyXMpN lBReCEVqUaLjj61osMZQjpLe/cwp8wY= X-Google-Smtp-Source: AKy350ZvmNhfe8iLwzMH3rcTOsmF+gSx4k+xR1nQ9LETsFfAYn8Vm6Ttuj7Itnv9rLmxUfj3EXuKoQ== X-Received: by 2002:a17:906:1f54:b0:94a:773:7121 with SMTP id d20-20020a1709061f5400b0094a07737121mr8499306ejk.42.1681153119754; Mon, 10 Apr 2023 11:58:39 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id gv11-20020a1709072bcb00b009273859a9bdsm5279796ejc.122.2023.04.10.11.58.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 11:58:39 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa , Martin Jansa , Khem Raj Subject: [meta-oe][kirkstone][PATCH 6/9] pahole: respect libdir Date: Mon, 10 Apr 2023 20:58:16 +0200 Message-Id: <20230410185819.2416704-6-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230410185819.2416704-1-Martin.Jansa@gmail.com> References: <20230410185819.2416704-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 ; Mon, 10 Apr 2023 18:58:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102047 From: Martin Jansa * use the same expression as cmake.bbclass is using: CMAKE_INSTALL_LIBDIR:PATH=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix') + '/')} but ${baselib} should work here as well Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/pahole/pahole_1.22.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/pahole/pahole_1.22.bb b/meta-oe/recipes-devtools/pahole/pahole_1.22.bb index 449508a5d5..ec642ec3b2 100644 --- a/meta-oe/recipes-devtools/pahole/pahole_1.22.bb +++ b/meta-oe/recipes-devtools/pahole/pahole_1.22.bb @@ -21,7 +21,7 @@ inherit cmake pkgconfig PACKAGECONFIG[python3] = ",,python3-core,python3-core" -EXTRA_OECMAKE = "-D__LIB=lib -DCMAKE_BUILD_TYPE=Release -DLIBBPF_EMBEDDED=OFF" +EXTRA_OECMAKE = "-D__LIB=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix') + '/')} -DCMAKE_BUILD_TYPE=Release -DLIBBPF_EMBEDDED=OFF" FILES:${PN} = "${bindir}/pahole \ ${libdir}/libdwarves.so* \ From patchwork Mon Apr 10 18:58:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 22511 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 75722C77B6F for ; Mon, 10 Apr 2023 18:58:51 +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.52987.1681153121972529624 for ; Mon, 10 Apr 2023 11:58:42 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20210112 header.b=e3aoG2/w; 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-5047074939fso13461054a12.1 for ; Mon, 10 Apr 2023 11:58:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681153120; x=1683745120; 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=ahmRrvIDoYAOLiz7IHcgAKyZqoXrFe879ITy6r3KMHE=; b=e3aoG2/w3EjRQVao9r9g8x7EbgQL96pS3Ox8XhJ9jsSEqm6boz7Q87k3xH3uc27QLL EmKUm3/cKjqtOKu8wz8/XQxeqiygg75IU7XYKwFrMa+D/YxpYZrf6B8NPGcNKa5p+dkD DMQxGFD43M6pmaNxTUd86LRWoB/3ds1+s4xlXBmemVFB9HqvKTCCkFyuBEuWYLtNX47y TVKZO9oDMIq+Xsix8/wjDwHvmXywmGh36umb0ZQwI6nfwT3HxT9rU5BeCfE5gYZsLd5n spwX7m86KQJ3cYyWm7bJQmCV2Parm06hJk0pVPzHEguRl4Ftte5gXFNlA5DL7LtJiGc3 ZbiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681153120; x=1683745120; 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=ahmRrvIDoYAOLiz7IHcgAKyZqoXrFe879ITy6r3KMHE=; b=dGoLeDi0v/9b+1JQi0pzGQmhq1npsqabdWZb7GXmDCNKQG5+mNkj4crEB5WL5RKh4u dPUBRg9+k8CnU0xWmO8J/GDjubdXddSTKTmFokwEv29oAhs7ha7+uuHggau81e28ppCj 0klEklDyU2XWpvVIq85ghvhTXoq/97xtCZ7nsMqMEgskm/tHo2/8DKTDpLeZHHecC42/ ZKfXSPtht5m3aIXzNRF6RUun+AyDsfHkyAG8eZa4apmXpMNWvFbJBZuENfwGAUvmFeHD 1Y6rxV8+bKGg35JU4T2D438BLfYfvtgmjvN2R92V+dFaJoA4J3mM7DYPjQtm35+xrCJk 1E7A== X-Gm-Message-State: AAQBX9dfT8Oy8tb4EVVtTuLHOUlf6X8sCQiixk9c4ZeJIiXENurIiYzn XJKLOEAuTJRqCjfVlTd+vbmGNWWky/c= X-Google-Smtp-Source: AKy350YJFgt6cYYCEwK/GpfK4CBUADwMbJxqsYwDAKl0OUnqabz7eHMNKUt3mvEQ4NyipF7SPuRuVA== X-Received: by 2002:aa7:c490:0:b0:504:9350:f458 with SMTP id m16-20020aa7c490000000b005049350f458mr6061634edq.1.1681153120425; Mon, 10 Apr 2023 11:58:40 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id s10-20020a508d0a000000b00501d5432f2fsm3564886eds.60.2023.04.10.11.58.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 11:58:40 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa , Martin Jansa , Khem Raj Subject: [meta-oe][kirkstone][PATCH 7/9] lvgl,lv-lib-png,lv-drivers: fix installed-vs-shipped QA issue with multilib Date: Mon, 10 Apr 2023 20:58:17 +0200 Message-Id: <20230410185819.2416704-7-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230410185819.2416704-1-Martin.Jansa@gmail.com> References: <20230410185819.2416704-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 ; Mon, 10 Apr 2023 18:58:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102049 From: Martin Jansa * with multilib BASELIB is just "lib" while baselib is "lib64" and libdir is "/usr/lib64". * fixes: ERROR: QA Issue: lvgl: Files/directories were installed but not shipped in any package: /usr/lib /usr/lib/liblvgl.a Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. lvgl: 2 installed and not shipped files. [installed-vs-shipped] * lowercase baselib should work for ppc64 as well (I hope) # $baselib [3 operations] # set oe-core/meta/conf/bitbake.conf:10 # "${BASELIB}" # set oe-core/meta/conf/bitbake.conf:11 # [vardepvalue] "${baselib}" # set oe-core/meta/conf/multilib.conf:2 # "${@d.getVar('BASE_LIB:tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}" # pre-expansion value: # "${@d.getVar('BASE_LIB:tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}" baselib="lib64" * simplify destsuffix/S setting * I was surprised that ${WORKDIR}/${PN}-${PV} works in multilib build but then I've noticed that it's because destsuffix is set to S which is a bit uncommon, so drop that and use default "git" * use ${STAGING_INCDIR} instead of ${RECIPE_SYSROOT}/${includedir} Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb | 8 ++++---- meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb | 8 +++++--- meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb b/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb index 1a94215839..cf33c69048 100644 --- a/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" # TODO: Pin upstream release (current v7.11.0-80-g419a757) -SRC_URI = "git://github.com/lvgl/lv_drivers;destsuffix=${S};protocol=https;nobranch=1" +SRC_URI = "git://github.com/lvgl/lv_drivers;protocol=https;nobranch=1" SRCREV = "419a757c23aaa67c676fe3a2196d64808fcf2254" DEPENDS = "libxkbcommon lvgl wayland" @@ -19,15 +19,15 @@ REQUIRED_DISTRO_FEATURES = "wayland" inherit cmake inherit features_check -S = "${WORKDIR}/${PN}-${PV}" +S = "${WORKDIR}/git" LVGL_CONFIG_WAYLAND_HOR_RES ?= "480" LVGL_CONFIG_WAYLAND_VER_RES ?= "320" -EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${BASELIB}" +EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${baselib}" TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1" -TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl" +TARGET_CFLAGS += "-I${STAGING_INCDIR}/lvgl" # Upstream does not support a default configuration # but propose a default "disabled" template, which is used as reference diff --git a/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb b/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb index 032e85f522..22b4826403 100644 --- a/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb +++ b/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb @@ -8,21 +8,23 @@ DESCRIPTION = "Allow the use of PNG images in LVGL. This implementation uses lod LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" -SRC_URI = "git://github.com/lvgl/lv_lib_png;destsuffix=${S};protocol=https;nobranch=1" +SRC_URI = "git://github.com/lvgl/lv_lib_png;;protocol=https;nobranch=1" SRCREV = "bf1531afe07c9f861107559e29ab8a2d83e4715a" +S = "${WORKDIR}/git" + # because of lvgl dependency REQUIRED_DISTRO_FEATURES = "wayland" DEPENDS += "lvgl" -EXTRA_OECMAKE += "-DLIB_INSTALL_DIR=${BASELIB}" +EXTRA_OECMAKE += "-DLIB_INSTALL_DIR=${baselib}" inherit cmake inherit features_check TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1" -TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl" +TARGET_CFLAGS += "-I${STAGING_INCDIR}/lvgl" FILES:${PN}-dev = "\ ${includedir}/lvgl/lv_lib_png/ \ diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb index 2005afa2fd..ea74c59185 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb @@ -8,7 +8,7 @@ SUMMARY = "Light and Versatile Graphics Library" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" -SRC_URI = "gitsm://github.com/lvgl/lvgl;destsuffix=${S};protocol=https;nobranch=1" +SRC_URI = "gitsm://github.com/lvgl/lvgl;protocol=https;nobranch=1" SRCREV = "d38eb1e689fa5a64c25e677275172d9c8a4ab2f0" REQUIRED_DISTRO_FEATURES = "wayland" @@ -16,8 +16,8 @@ REQUIRED_DISTRO_FEATURES = "wayland" inherit cmake inherit features_check -EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${BASELIB}" -S = "${WORKDIR}/${PN}-${PV}" +EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${baselib}" +S = "${WORKDIR}/git" LVGL_CONFIG_LV_MEM_CUSTOM ?= "0" From patchwork Mon Apr 10 18:58:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 22512 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 7572EC76196 for ; Mon, 10 Apr 2023 18:58:51 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web11.52988.1681153122607584755 for ; Mon, 10 Apr 2023 11:58:42 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20210112 header.b=P1q2DJ/d; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-94a34a14a54so143862566b.1 for ; Mon, 10 Apr 2023 11:58:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681153121; x=1683745121; 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=r10PaH+mABbNHFJjo5h/YTMoNhGvAmpd9lCWbi4gfVA=; b=P1q2DJ/dqBqpqmt0emTVntDz9FKveknsEJRPnmjYRdlacAxjVmtv/NoSYRA5cNHnvX Ox/UhGok645uTdjjtlA8JA1oBVg3rB/Wwn1YNe+Q65gE5+1Fhxvd2aSlxjO4FVsWppXT N6ymvtUDQAHrsHuCOaSp31Okpmg2JPkkA6q/fRXhv5CiNDhUhE2eLSgEjFDnV6A23Rmp /jG/Ct8dFhhxsOqnxBJ7YcLcaglqBBcJvQlY4NiWMn9v/UiWo60uhqMZk0Jcg8lC7IRW MKB8UDhQESVvjDCVvihYFgZm/dT/0yUwZoJwMK2+hUbS3PODha1yKmwqHxNgwFdTExc7 MyFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681153121; x=1683745121; 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=r10PaH+mABbNHFJjo5h/YTMoNhGvAmpd9lCWbi4gfVA=; b=47XEBhQRGTshz+71Lquws9rYjpt4rXPJcc9crFkcxNuwi+hnWb859E/Z8rB2tlMHg+ 4ypXSQgSFjPTTA5uChhLIZiL9MVQ2K96QZ+5pHZRRG4owV/exyXvwbRSswbjxj/JX+6w 57ysuEvqaVox++Fwp+KQn6K3LNttKooBbAwWuaJU7QNwwCe/03D0EDqBvWTyDSv/ZMFq J0QWhCfrjtv7vcD+4cD1ue+s1lYM0XPC5Nk8C72AeFoXFACqk+AaJAvizT9kinqg5gCI 14UDZdYfT9VhNp4/jjLd95uc4adAWWOqksZF9tn1jfE0wOLlt8BSGXgZvTIMNZV6qW5Q iCog== X-Gm-Message-State: AAQBX9ekBSU1uPW/Fj4d+cWJc0hbc4nEc933MxpYjwKsV6Qt2VOaLQh/ 3hDozBuMX2586td8u1fV2rsyjqap/wA= X-Google-Smtp-Source: AKy350a1Al3XkT0yEuOpU+fW5bo6p4RAerflisaWQP8WhA7cZfZmBjdj1hP2Dqz+wF17gX/0U5J0Xg== X-Received: by 2002:a50:ee06:0:b0:502:2a76:5781 with SMTP id g6-20020a50ee06000000b005022a765781mr10353053eds.5.1681153121051; Mon, 10 Apr 2023 11:58:41 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id co2-20020a0564020c0200b005049297c5d4sm2345131edb.56.2023.04.10.11.58.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 11:58:40 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][kirkstone][PATCH 8/9] lirc: fix do_install with multilib Date: Mon, 10 Apr 2023 20:58:18 +0200 Message-Id: <20230410185819.2416704-8-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230410185819.2416704-1-Martin.Jansa@gmail.com> References: <20230410185819.2416704-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 ; Mon, 10 Apr 2023 18:58:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102050 * use ${S} instead of ${WORKDIR}/${PN}-${PV} and ${BP} instead of ${PN}-${PV} to fix build with multilib, where PN is lib32-lirc, but S is correctly set as ${WORKDIR}/${BP} and do_install fails with: mkdir: cannot create directory ‘lib32-lirc/0.10.1-r0/lib32-lirc-0.10.1/python-pkg/dist/’: No such file or directory Signed-off-by: Martin Jansa --- .../meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb index fe9685924b..226543bbd8 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb @@ -49,9 +49,9 @@ do_configure:append() { # Create PYTHON_TARBALL which LIRC needs for install-nodist_pkgdataDATA do_install:prepend() { - rm -rf ${WORKDIR}/${PN}-${PV}/python-pkg/dist/ - mkdir ${WORKDIR}/${PN}-${PV}/python-pkg/dist/ - tar --exclude='${WORKDIR}/${PN}-${PV}/python-pkg/*' -czf ${WORKDIR}/${PN}-${PV}/python-pkg/dist/${PN}-${PV}.tar.gz ${S} + rm -rf ${S}/python-pkg/dist/ + mkdir ${S}/python-pkg/dist/ + tar --exclude='${S}/python-pkg/*' -czf ${S}/python-pkg/dist/${BP}.tar.gz ${S} } # In code, path to python is a variable that is replaced with path to native version of it From patchwork Mon Apr 10 18:58:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 22513 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 87A95C77B61 for ; Mon, 10 Apr 2023 18:58:51 +0000 (UTC) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by mx.groups.io with SMTP id smtpd.web11.52990.1681153123331810073 for ; Mon, 10 Apr 2023 11:58:43 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20210112 header.b=KGiM3+uO; spf=pass (domain: gmail.com, ip: 209.85.208.52, mailfrom: martin.jansa@gmail.com) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-50489c0dcb9so1409990a12.2 for ; Mon, 10 Apr 2023 11:58:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681153122; x=1683745122; 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=Pm16gROop0d/Sq+r+P26cLkl8psiYgSSWhpPYksFpy0=; b=KGiM3+uO5VX0U4UIXXR16yasaHNjirlfQiwb800FAPW6bN+8qIbd50unodhAQLdIoI CmENuky7N4tKhLvDoXZVIdA/Kvo63h0FiFs/8y06LykKb0kH3hiTeO2pdbxMRx6lDipF PHCEM2VqOvf8YhI/Xc9yrL6symXGFAVDYHovStUeIoCkKZJWPNvg8o4twvnEsa/j96dp VN3Xilxo3gfmxjlEzqQBLzjXR3NC6hPZ0u/eNbKNwhU0iaPRz5fOWRJ/YmGTcOAc7JBo 2f2VEh0TlL7N3cFG+FdgIrMbFTlGYu8RTX38LOBOYl8nOWAh6hX7b9hRgfxVrE2RXODv e8jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681153122; x=1683745122; 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=Pm16gROop0d/Sq+r+P26cLkl8psiYgSSWhpPYksFpy0=; b=zLbj9ZFbHTJ8pU37McpdFNAF3eb3/Aba3IU5cR6poUyePLrVD0f4I26ZiuSZRqTl2t L3RyvpU4GmV0i5pG6FyebnJCxw7JsOHF/hqN/ZtgsXJq9VHHhkVs5bNVEv9mkLOwlCsP seCGn18Sj/QEjsVt8Zy3VI0+GbBJ7NFW3ZEikthiL7n3BRimEhzOO1f2a9QKgIJbYJT9 jw/yqcTO7DxcLekj5h456MZ/dYpCKWr6oyyek2tFkxPpuQQ/xEX+0WQLDlW2g3MEkfjZ O5sZtva/c7b+XrbVEJ2xR4IKzMMCE63SmaEZaICLerLddxb7lIlOaRo4NsBbYp6wZRZa 6wpw== X-Gm-Message-State: AAQBX9dMomMNmctVPQioQXf67mXpVWdqfJ4y7NYnPaOqNcXKmAwhgOp3 I9iHQclOCO6AawYooWjXuJwodRYl2WE= X-Google-Smtp-Source: AKy350a/ed69JuabkZzwfpmWXqdBBrEPIlIFivk1l0xzI+rI4OaE/pZF5+dWbH6FXrlODSqbcK1Wrg== X-Received: by 2002:aa7:c0c7:0:b0:4fb:395a:6aa4 with SMTP id j7-20020aa7c0c7000000b004fb395a6aa4mr10067562edp.31.1681153121744; Mon, 10 Apr 2023 11:58:41 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id i13-20020a50c3cd000000b004fa012332ecsm3707139edf.1.2023.04.10.11.58.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 11:58:41 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][kirkstone][PATCH 9/9] dleyna-{server,renderer}: fix dev-so QA issue with multilib Date: Mon, 10 Apr 2023 20:58:19 +0200 Message-Id: <20230410185819.2416704-9-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230410185819.2416704-1-Martin.Jansa@gmail.com> References: <20230410185819.2416704-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 ; Mon, 10 Apr 2023 18:58:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102051 * the libdir is arch specific, but the subdirectory is always BPN * fixes: lib32-dleyna-server-0.6.0+gitAUTOINC+eb895ae827: non -dev/-dbg/nativesdk- package lib32-dleyna-server contains symlink .so '/usr/lib/dleyna-server/libdleyna-server-1.0.so' [dev-so] lib32-dleyna-renderer-0.6.0: non -dev/-dbg/nativesdk- package lib32-dleyna-renderer contains symlink .so '/usr/lib/dleyna-renderer/libdleyna-renderer-1.0.so' [dev-so] Signed-off-by: Martin Jansa --- .../recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb | 2 +- .../recipes-multimedia/dleyna/dleyna-server_0.6.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb b/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb index 3e43c0d2a7..e7f918333a 100644 --- a/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb +++ b/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb @@ -22,4 +22,4 @@ inherit autotools pkgconfig CFLAGS += " -I${S}" FILES:${PN} += "${datadir}/dbus-1" -FILES:${PN}-dev += "${libdir}/${PN}/*.so" +FILES:${PN}-dev += "${libdir}/${BPN}/*.so" diff --git a/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb b/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb index b25e446c41..071379758c 100644 --- a/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb +++ b/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb @@ -19,4 +19,4 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig FILES:${PN} += "${datadir}/dbus-1" -FILES:${PN}-dev += "${libdir}/${PN}/*.so" +FILES:${PN}-dev += "${libdir}/${BPN}/*.so"