From patchwork Fri Jan 13 14:56:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 18098 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 1E0C4C67871 for ; Fri, 13 Jan 2023 14:57:16 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web11.88933.1673621827792327185 for ; Fri, 13 Jan 2023 06:57:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VAiBFzy3; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id h16so21306213wrz.12 for ; Fri, 13 Jan 2023 06:57:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bYfCIzoaJznoU+OIpW7XVdeZK/uTWFxVJdRFaySJ3ww=; b=VAiBFzy3Gwc4eZY0pyJvDMcBShf/46vvJX1HKe3v5sVl6JwmuIpsw8S+GBPy8sT9mp Ren+++Qh5vjNeBkNZ9s0v1fNbIJRnYzGDNodzcCTEqTggaNWqj2CSpHwhtoQYCjRwQtc EomKHcGDwjT1oceW8rV+y0gHeQyLDAPZ06a3OVPyuFiZFVAiN8/bzzRoGIs9eQGpuzU0 sHP3ZJw9kOCp1A7AqRMxAqrAe6hnV2uDzLweBoAHAjPukuFnLzBlTBNiZXT0lWwrDnPi bo7v+gR0CL5R2NOh6kYrJbHgWnBqrZVK9jiL2/kwSjxb2j2mZKacQ8AdhONdqj4rRJiS Y2gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=bYfCIzoaJznoU+OIpW7XVdeZK/uTWFxVJdRFaySJ3ww=; b=pELGay4ZXjl4HNokxLmJG5uU/OWQI0lzvBLLDsi3/34fQLaeqO+T2GJDKoX0pKbfG7 VzR7EwweySdIzFp+HUnrUh6BIJrfQPdUj5BMKwkHWcOz+h5tYnaYljtP7RqorHhrH7Z/ y467xMAm+Wyi1NYiWEumcY3DYHsbDABkicqPBJGfQhlyx2+04TELz3WUEXJT0rIy75Ba ILlIlO5MPVxOMj31LCguMG43WlLwg+LxT12aQb5fQLv41rCixEcPcMHom7yN0qZj0XSF Zcb0CV05HFeLoTSL+ZFjpwlAhRFmOkzQXVwoQSvbtwpHLf7V8/ehaaQY9RJC0jK7zi+7 XlyA== X-Gm-Message-State: AFqh2kpfK2De8hH/3I3/vCda+ykkn4FdIoKbneQCHPAqOJjlDbs5qJbn 3cboh6a6VuG2r2sWPuJ5lqlXTAq1H18= X-Google-Smtp-Source: AMrXdXvy1mG/SEHNbE+yBq+LqLHJYFo1hOc1zm6Hzmh2CqCV+tAOXixxMSEtauGnOip7MvUrviRqZQ== X-Received: by 2002:adf:f54d:0:b0:2bd:d85f:55cc with SMTP id j13-20020adff54d000000b002bdd85f55ccmr3845095wrp.21.1673621826064; Fri, 13 Jan 2023 06:57:06 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d20-20020adfa354000000b002bc50ba3d06sm15808417wrb.9.2023.01.13.06.57.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 06:57:05 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/7] ethtool: upgrade 6.0 -> 6.1 Date: Fri, 13 Jan 2023 15:56:54 +0100 Message-Id: <20230113145700.2773771-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 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 ; Fri, 13 Jan 2023 14:57:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175828 Signed-off-by: Alexander Kanavin --- .../0001-marvell.c-define-_GNU_SOURCE.patch | 59 +++++++++++++++++++ .../ethtool/avoid_parallel_tests.patch | 6 +- .../{ethtool_6.0.bb => ethtool_6.1.bb} | 3 +- 3 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch rename meta/recipes-extended/ethtool/{ethtool_6.0.bb => ethtool_6.1.bb} (90%) diff --git a/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch b/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch new file mode 100644 index 0000000000..8a7eeafb9c --- /dev/null +++ b/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch @@ -0,0 +1,59 @@ +From 5112785191e3279c671a027fe797be77e1071ecd Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 2 Jan 2023 13:45:46 +0100 +Subject: [PATCH] marvell.c: use portable integer types + +u_int32_t is not portable, but uint32_t is. + +Upstream-Status: Submitted [by email to mkubecek@suse.cz] +Signed-off-by: Alexander Kanavin + +--- + marvell.c | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/marvell.c b/marvell.c +index d3d570e..3d42eed 100644 +--- a/marvell.c ++++ b/marvell.c +@@ -31,23 +31,23 @@ static void dump_timer(const char *name, const void *p) + static void dump_queue(const char *name, const void *a, int rx) + { + struct desc { +- u_int32_t ctl; +- u_int32_t next; +- u_int32_t data_lo; +- u_int32_t data_hi; +- u_int32_t status; +- u_int32_t timestamp; +- u_int16_t csum2; +- u_int16_t csum1; +- u_int16_t csum2_start; +- u_int16_t csum1_start; +- u_int32_t addr_lo; +- u_int32_t addr_hi; +- u_int32_t count_lo; +- u_int32_t count_hi; +- u_int32_t byte_count; +- u_int32_t csr; +- u_int32_t flag; ++ uint32_t ctl; ++ uint32_t next; ++ uint32_t data_lo; ++ uint32_t data_hi; ++ uint32_t status; ++ uint32_t timestamp; ++ uint16_t csum2; ++ uint16_t csum1; ++ uint16_t csum2_start; ++ uint16_t csum1_start; ++ uint32_t addr_lo; ++ uint32_t addr_hi; ++ uint32_t count_lo; ++ uint32_t count_hi; ++ uint32_t byte_count; ++ uint32_t csr; ++ uint32_t flag; + }; + const struct desc *d = a; + diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index c3cefbb5e6..4994369682 100644 --- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From dea90ab711acad251b5d8536c534409979ea8be4 Mon Sep 17 00:00:00 2001 +From 0d066a901292e6a44ff7bc7ee16f99dd2ba4ea15 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 89d0e70..ab2be9c 100644 +index 3eb4e7b..ee5c72f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 6.0, netdev@vger.kernel.org) + AC_INIT(ethtool, 6.1, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) diff --git a/meta/recipes-extended/ethtool/ethtool_6.0.bb b/meta/recipes-extended/ethtool/ethtool_6.1.bb similarity index 90% rename from meta/recipes-extended/ethtool/ethtool_6.0.bb rename to meta/recipes-extended/ethtool/ethtool_6.1.bb index 8f36520b00..2b9bbe69db 100644 --- a/meta/recipes-extended/ethtool/ethtool_6.0.bb +++ b/meta/recipes-extended/ethtool/ethtool_6.1.bb @@ -9,9 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://run-ptest \ file://avoid_parallel_tests.patch \ + file://0001-marvell.c-define-_GNU_SOURCE.patch \ " -SRC_URI[sha256sum] = "f2168e2b45d7e58ed5b76e5533fd607ca0720c9e631f4271bfe997bf72330796" +SRC_URI[sha256sum] = "1d03f1ce324fbd95591191c42ac0c4c9cc721e067b929083a20a46c4b4731436" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" From patchwork Fri Jan 13 14:56:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 18099 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 445D4C678D7 for ; Fri, 13 Jan 2023 14:57:16 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web10.88821.1673621828303417208 for ; Fri, 13 Jan 2023 06:57:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=aCHiNiwo; spf=pass (domain: gmail.com, ip: 209.85.221.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f47.google.com with SMTP id t5so16908506wrq.1 for ; Fri, 13 Jan 2023 06:57:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=LYF+QjMDq+TY5j5jda9vHlOYpRCgdv0i23UUSNPueGY=; b=aCHiNiwo1hb3hMXYuCWD9FnzKdrpSLIPFshTkR3o9sXK09cSnOZRIFkIHcnC0JEJjD ReVRTHJs/IMN7mYPpczvh9YN1UoEegWfg5PGHpA53G5AJyenvTYAwoO86KWKVb7DHp/C DlsbQDL5UD7SRbsK5Es7sRq3g2LJd/lbeBtxaycx1BVCKNwHz6O0TJt+/kZ7d8767bKd kg6RlYQyGUDs5HLuOl3UzIQQkc2H+SUjfVVEgI4Dn5QVYZm2Lp6s0YigIghpxzG7vi+T iaHnlCjvRVHPexZJRlNq9HCSzk1f3JZSW4owT/pnwOkdWRLDA4FAERN7u2jpfKvxjjDY umVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=LYF+QjMDq+TY5j5jda9vHlOYpRCgdv0i23UUSNPueGY=; b=jPu93Wl/tiMGrtmEMh7LQuz1kKfOvFU9TG8qTu9u6zB8PKc225TVpq/j7pBgKhWqfp UEojr4AukY901zaAMnk1pmpvZuV8OkBIWDQgGDEgq2bUjqQuxqxlr+fxtBxueIEwsyWh GxBuGV9nB5cIl1HRPMfKe91Y0VCLcD+I/5JcAFt0JyMAo9mUJ9Bu811G941mJxXJuG7p bm8G2oKATEinN/xsa8zBnxaWqX8oPziUMiPynT3ZfML+ZEmPX6BzNbKB7ANlDt9BMQJR 0iz+TF/XpypRaiOvZ6KJ+jNg2NeKtD3E/WyFisH38FoPRuz3MixPlKzdH/nmFdjnyW29 0VVg== X-Gm-Message-State: AFqh2kqjxeFSZ3B6WKdSuyX//cCkgldJrP6dOTrH+pDWHLClVVELemv5 ree8ritpP1lK56e/bMQOAFWdvLdcFQQ= X-Google-Smtp-Source: AMrXdXuDBipW6Ezd5t+qYft8TXxhQ1clUaARlUwwf45SabgAl/8afIKTYJarGWwBbXHSB+SFu1G6Gg== X-Received: by 2002:a05:6000:a06:b0:242:4383:7e80 with SMTP id co6-20020a0560000a0600b0024243837e80mr11163wrb.22.1673621826741; Fri, 13 Jan 2023 06:57:06 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d20-20020adfa354000000b002bc50ba3d06sm15808417wrb.9.2023.01.13.06.57.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 06:57:06 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/7] man-pages: upgrade 6.01 -> 6.02 Date: Fri, 13 Jan 2023 15:56:55 +0100 Message-Id: <20230113145700.2773771-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230113145700.2773771-1-alex@linutronix.de> References: <20230113145700.2773771-1-alex@linutronix.de> 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 ; Fri, 13 Jan 2023 14:57:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175829 License-Update: readme rewritten, set of licenses provided explicitly. Signed-off-by: Alexander Kanavin --- .../man-pages/man-pages_6.01.bb | 37 --------------- .../man-pages/man-pages_6.02.bb | 46 +++++++++++++++++++ 2 files changed, 46 insertions(+), 37 deletions(-) delete mode 100644 meta/recipes-extended/man-pages/man-pages_6.01.bb create mode 100644 meta/recipes-extended/man-pages/man-pages_6.02.bb diff --git a/meta/recipes-extended/man-pages/man-pages_6.01.bb b/meta/recipes-extended/man-pages/man-pages_6.01.bb deleted file mode 100644 index 1ad4ed1317..0000000000 --- a/meta/recipes-extended/man-pages/man-pages_6.01.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Linux man-pages" -DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs" -SECTION = "console/utils" -HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" -LICENSE = "GPL-2.0-or-later" - -LIC_FILES_CHKSUM = "file://README;md5=bf1faa9b0245e39a7c0c9690ffdf6e54" -SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" - -SRC_URI[sha256sum] = "c1e8bea88589f1a80b67dafd82fb98b018ddd7f7bfa594f8f79686258d26e784" - -inherit manpages - -MAN_PKG = "${PN}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[manpages] = "" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - oe_runmake install prefix=${prefix} DESTDIR=${D} -} - -# Only deliveres man-pages so FILES:${PN} gets everything -FILES:${PN}-doc = "" -FILES:${PN} = "${mandir}/*" - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE:${PN} = "crypt.3 crypt_r.3 getspnam.3 passwd.5" -ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3" -ALTERNATIVE_LINK_NAME[crypt_r.3] = "${mandir}/man3/crypt_r.3" -ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" -ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" diff --git a/meta/recipes-extended/man-pages/man-pages_6.02.bb b/meta/recipes-extended/man-pages/man-pages_6.02.bb new file mode 100644 index 0000000000..8f1eb38082 --- /dev/null +++ b/meta/recipes-extended/man-pages/man-pages_6.02.bb @@ -0,0 +1,46 @@ +SUMMARY = "Linux man-pages" +DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs" +SECTION = "console/utils" +HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" +LICENSE = "GPL-2.0-or-later & GPL-2.0-only & GPL-1.0-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & MIT" + +LIC_FILES_CHKSUM = "file://README;md5=26901408d8cfd6f6675f8b49daf9cc74 \ + file://LICENSES/BSD-2-Clause.txt;md5=d0f280d1058e77e66264a9b9e10e6c89 \ + file://LICENSES/BSD-3-Clause.txt;md5=71f739ef75581cae312e8c711bcdab16 \ + file://LICENSES/BSD-4-Clause-UC.txt;md5=1da3cf8ad50cd8d5d1de3cfc53196d01 \ + file://LICENSES/GPL-1.0-or-later.txt;md5=e5b7c80002ef72ab868b43ce47b65125 \ + file://LICENSES/GPL-2.0-only.txt;md5=3d26203303a722dedc6bf909d95ba815 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=3d26203303a722dedc6bf909d95ba815 \ + file://LICENSES/Linux-man-pages-copyleft.txt;md5=173b960c686ff2d26f043ddaeb63f6ce \ + file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \ + " +SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" + +SRC_URI[sha256sum] = "968def9e7055c9cbca9a4f21f79677b02ac8b0d2fa62ceea7bd8ef4dcc6cac41" + +inherit manpages + +MAN_PKG = "${PN}" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[manpages] = "" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + oe_runmake install prefix=${prefix} DESTDIR=${D} +} + +# Only deliveres man-pages so FILES:${PN} gets everything +FILES:${PN}-doc = "" +FILES:${PN} = "${mandir}/*" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = "crypt.3 crypt_r.3 getspnam.3 passwd.5" +ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3" +ALTERNATIVE_LINK_NAME[crypt_r.3] = "${mandir}/man3/crypt_r.3" +ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" +ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" From patchwork Fri Jan 13 14:56:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 18095 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 36405C678D4 for ; Fri, 13 Jan 2023 14:57:16 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web10.88822.1673621829021845039 for ; Fri, 13 Jan 2023 06:57:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VVdiDOSp; spf=pass (domain: gmail.com, ip: 209.85.221.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f47.google.com with SMTP id az7so21318167wrb.5 for ; Fri, 13 Jan 2023 06:57:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=kjGqVysgP5cmUJNaj72hoK/m3NL202/PuZpnqKQNLD4=; b=VVdiDOSpMR4/cq35CfLIUywQLlv1zuDTHSO3cihkE1LleJIGThVVxcPZ7A3S24zw8N DwgGyUkemmkpa2R/YQcoacDVcq5UcXKDOZztXHsLzNxdQGWObWsAQZOBhn3tWs7FBBgC D0X56jmMY3OV592M2wUylh2acslsy2Wo0FzAdrFkzbCE+uOUZezNsQVM7tuSMnDVkoSK +AjcDSO2z2qmJEBQcXZN4QoI5HX0LOR2XU4BFRBQKgkx9QzAvd86onrr4YC8etev+3ZR AoX65uQoC9RvaDQhAdQaoxL4ei8FTLlDY29fkIwWpo96sjZYChy9gqJU3zHDlffpoiXo qvmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=kjGqVysgP5cmUJNaj72hoK/m3NL202/PuZpnqKQNLD4=; b=vgc9WqHBx2/NoHm35jCOcb0tDV95UJfMSbpl1xB9LFHlUkna3HrTf+/k3sJTzgEBwz vV1fGSW9oLFTUVix0lo1DWUOM44J2eaCpZwmN/ktwS12uSH/gdQYPtQr4Pk3khO/cwus nrNtRDtTZuDqnrZORtFGSFZHRyrZGXO6bP3rysaLwTd1gn6wr9OCX20K0zGE4qQQm07V pv86TSYLwgGbjd+si4lPzErQ/M6ZHpbpDx8jU1++lrzY+yKgrzKxTZ90hwntGFTURpjt QOpD1UB0g54hXP/6/jChhI3GqB/DlrptA2xL0vROnphAS2mxZCqKaLqFnrRmJwdYf80T tOfA== X-Gm-Message-State: AFqh2kpDchag2Vrpv4TweoJlLlSsGpnekQx5ESaIdLxwWDMIFav9qXjB Ugiu4MM3Q9v3GMMi4YfOXcz36inVPFM= X-Google-Smtp-Source: AMrXdXutdcv4AheSGyMnMYiHDhe49C1Gl+l4JPTrG7qKCHh2tM2VdfrS0t90jIVO+mvWNF+WjNeRdA== X-Received: by 2002:a5d:5257:0:b0:2a8:e91d:ad31 with SMTP id k23-20020a5d5257000000b002a8e91dad31mr23907990wrc.62.1673621827414; Fri, 13 Jan 2023 06:57:07 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d20-20020adfa354000000b002bc50ba3d06sm15808417wrb.9.2023.01.13.06.57.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 06:57:07 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/7] mesa: update 22.2.3 -> 22.3.3 Date: Fri, 13 Jan 2023 15:56:56 +0100 Message-Id: <20230113145700.2773771-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230113145700.2773771-1-alex@linutronix.de> References: <20230113145700.2773771-1-alex@linutronix.de> 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 ; Fri, 13 Jan 2023 14:57:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175830 gallium-xvmc option removed upstream Remove 0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch as upstream code no longer uses these definitions. Signed-off-by: Alexander Kanavin --- ...fine-__NR_futex-if-it-does-not-exist.patch | 34 ------------------- ...k-for-all-linux-host_os-combinations.patch | 14 ++++---- .../{mesa-gl_22.2.3.bb => mesa-gl_22.3.3.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 4 +-- .../mesa/{mesa_22.2.3.bb => mesa_22.3.3.bb} | 0 5 files changed, 8 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch rename meta/recipes-graphics/mesa/{mesa-gl_22.2.3.bb => mesa-gl_22.3.3.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_22.2.3.bb => mesa_22.3.3.bb} (100%) diff --git a/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch b/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch deleted file mode 100644 index e7d92197be..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 859bfc342d1db9b61c43f30d9aa27cea35ca7599 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 16 Oct 2020 11:03:47 -0700 -Subject: [PATCH] futex.h: Define __NR_futex if it does not exist - -__NR_futex is not defines by newer architectures e.g. arc, riscv32 as -they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on -__NR_futex, since this is used in applications, such applications start -to fail to build for these newer architectures. This patch defines a -fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps -working - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- - src/util/futex.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/util/futex.h b/src/util/futex.h -index 2a2a00c..92fc123 100644 ---- a/src/util/futex.h -+++ b/src/util/futex.h -@@ -38,6 +38,10 @@ - #define SYS_futex SYS_futex_time64 - #endif - -+#if !defined(SYS_futex) && defined(SYS_futex_time64) -+# define SYS_futex SYS_futex_time64 -+#endif -+ - static inline long sys_futex(void *addr1, int op, int val1, const struct timespec *timeout, void *addr2, int val3) - { - return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch index ec263ce479..36c33f889b 100644 --- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch @@ -1,4 +1,4 @@ -From d092a9000da62dfccca5b58fca56b94eb9989c48 Mon Sep 17 00:00:00 2001 +From 3b4d6b89f644b43e507c08181fef06db4326f9da Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 14 Nov 2019 13:04:49 -0800 Subject: [PATCH] meson.build: check for all linux host_os combinations @@ -20,19 +20,19 @@ Signed-off-by: Alistair Francis 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 250b528..b5c98f8 100644 +index 172c64a..9b5294c 100644 --- a/meson.build +++ b/meson.build @@ -173,7 +173,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 # Only build shared_glapi if at least one OpenGL API is enabled with_shared_glapi = with_shared_glapi and with_any_opengl --system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system()) -+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux') +-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) ++system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) or host_machine.system().startswith('linux') - dri_drivers = get_option('dri-drivers') - if dri_drivers.length() != 0 -@@ -1091,7 +1091,7 @@ if cc.has_function('reallocarray') + with_freedreno_kgsl = get_option('freedreno-kgsl') + if with_freedreno_kgsl +@@ -1076,7 +1076,7 @@ if cc.has_function('reallocarray') endif # TODO: this is very incomplete diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb b/meta/recipes-graphics/mesa/mesa-gl_22.3.3.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb rename to meta/recipes-graphics/mesa/mesa-gl_22.3.3.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 77aa97069a..5fdb67ca2a 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -17,7 +17,6 @@ PE = "2" SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ - file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ file://0001-util-format-Check-for-NEON-before-using-it.patch \ ${NATIVE_PATCHES} \ " @@ -25,7 +24,7 @@ NATIVE_PATCHES ?= "" # required by mesa-native on Ubuntu 18.04 with gcc 7.5 when DEBUG_BUILD enabled NATIVE_PATCHES:class-native = "file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch" -SRC_URI[sha256sum] = "ee7d026f7b1991dbae0861d359b671145c3a86f2a731353b885d2ea2d5c098d6" +SRC_URI[sha256sum] = "bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" @@ -97,7 +96,6 @@ PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled" X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr" # "x11" requires "opengl" PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}" -PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc" PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" PACKAGECONFIG[dri3] = "-Ddri3=enabled, -Ddri3=disabled, xorgproto libxshmfence" diff --git a/meta/recipes-graphics/mesa/mesa_22.2.3.bb b/meta/recipes-graphics/mesa/mesa_22.3.3.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa_22.2.3.bb rename to meta/recipes-graphics/mesa/mesa_22.3.3.bb From patchwork Fri Jan 13 14:56:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 18096 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 1B5ACC54EBE for ; Fri, 13 Jan 2023 14:57:16 +0000 (UTC) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web10.88823.1673621829622126789 for ; Fri, 13 Jan 2023 06:57:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=diOFSdm7; spf=pass (domain: gmail.com, ip: 209.85.221.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f46.google.com with SMTP id bs20so21322542wrb.3 for ; Fri, 13 Jan 2023 06:57:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=X5AZROxZr6yBCGxtVHmib0SaIprk9wKk7Kt/25/6FmI=; b=diOFSdm78wOr8/lx6DGX+dLZ8YJaIxoN9tf4qWP9F0oVNJBtg3wvNn8Drl2yyFpizH ggu5ZO9osve7P2QBdf/e8+j+2a9IpzE6arZrv/10J+9mfZ/VZKrhL93hDdyNhtY4/p0p ZpSX/ZPp1PNGpsrl1MEly93b30pNw+oYqx4ujhUlyrfEZv//06nCs78OQuDrH5VrWP8A Vgk7yjlsM5JMXWOE6I88BYiTC0lZr7AZ5laM6WIcJvbh50YQ17e7Sc/oGJtwI0+2ESuv 28mLGZ1HkMtaI5sVU6x+zmHE/p7gYzcR8R0/QY/212uN/wsJUta0qE/IEYAvfbv0KGxM nAaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=X5AZROxZr6yBCGxtVHmib0SaIprk9wKk7Kt/25/6FmI=; b=rskGHq77ceJDjH7nJ3VQ5JMIHZifDKqqrsDEneD75ySUgIqvyiIONEslSAhoLiTyDB KRxtieE+NSjt+yp/yvcPUA9lku/g1sA16eelQrtqt2IqaO2z95Dd6TtGUhxT0OLGfwpp 8CFqABtbwmhTmcbdWAUTXYgWnqmzf4awHHVW2j58dJpsyA5rSBVbyoa++uRJsrM8/Ez/ VG7lhVvmIVMeO0NELKv1qYyPfHxyrekGkgXU36BehlK08ll1m++eU4LpoKhtTUdYHXdW kRyA6E8KDhAkjQgqXweI4aUsj599IUBq8TZSc8uoCYTWaUsDfHfH+rMYMrV/ZnJqN2ql W3pQ== X-Gm-Message-State: AFqh2koOzvQsjKq1DT3eoDZFINZg+5G2vIA3OnR4WMkbMZSe18DFhfQg Qa3la5Gta1qpV/8hQwOPgS0Tw9Bgses= X-Google-Smtp-Source: AMrXdXs4oC9cdffpVwvPipsdD+ne1CsRDu7CtRE0w822TJ06yeHm22tnxGTONlnmLtsSM2kuZInE8Q== X-Received: by 2002:adf:ff8a:0:b0:2bd:db1c:8e15 with SMTP id j10-20020adfff8a000000b002bddb1c8e15mr3463102wrr.51.1673621828070; Fri, 13 Jan 2023 06:57:08 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d20-20020adfa354000000b002bc50ba3d06sm15808417wrb.9.2023.01.13.06.57.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 06:57:07 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/7] webkitgtk: submit a patch upstream Date: Fri, 13 Jan 2023 15:56:57 +0100 Message-Id: <20230113145700.2773771-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230113145700.2773771-1-alex@linutronix.de> References: <20230113145700.2773771-1-alex@linutronix.de> 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 ; Fri, 13 Jan 2023 14:57:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175831 Signed-off-by: Alexander Kanavin --- ...1-When-building-introspection-files-do-not-quote-CFLAG.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch index 4ef0dbfe2f..2dab00a075 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch @@ -31,7 +31,7 @@ Traceback (most recent call last): raise DistutilsExecError( distutils.errors.DistutilsExecError: command '/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc' failed with exit code 1 -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/8290] Signed-off-by: Alexander Kanavin From patchwork Fri Jan 13 14:56:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 18097 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 37FFAC678D8 for ; Fri, 13 Jan 2023 14:57:16 +0000 (UTC) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.groups.io with SMTP id smtpd.web11.88937.1673621830287090830 for ; Fri, 13 Jan 2023 06:57:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Far/Ggno; spf=pass (domain: gmail.com, ip: 209.85.221.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f42.google.com with SMTP id bk16so21290406wrb.11 for ; Fri, 13 Jan 2023 06:57:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=62mxDXQuWU8/0eRUfjeJxNKX+PoqeqsAGRo5ggeklfY=; b=Far/GgnosFki7xSAHHTq6dLt3m9PJe1dQBPinSn5l/V1EWFy+idW/EJfWuIls/X0jK VCvdqfEOurRNYxhiq/whVx741cheIlkAt9jVsWghcKnFnNn0N4dw1WjihqaLRWP/tfpd foz+hEjcMx02oPlzjgUM2YezuzbGKaLESNsooiF2S2OJGDiYvsZiV8roHXyktkyb4Om1 1EHEuSyUo4k+3rizmYEShwbTaE5MAcdRr8hOj8FJwo8NOBNhcgZIW+WzxH6lwH6IYZwX oJe2G7iPsaG4x+FaJgqpSS17BiMVHA/ebe3xMi5gljqr31IuUDfvSJE/AZM/ZADjP+jz 2dFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=62mxDXQuWU8/0eRUfjeJxNKX+PoqeqsAGRo5ggeklfY=; b=I64Ec0yFx4ITqt5MbY70Ho9gMPEKUkcnV+J0MZXXwE22OEsAqX4pAW+Qm+9yp1DEuW jwmawOOuCeAo/d07r60J83VNPB+4CqZa8MleVOGzxznXUMGxkjWcz0/68VTbXhc5IWPn G8PTJ2a8LcgQv+xHzabLwCDeouOc2JMW+Y983W8k2WuNQJQuzLNclNn8HF4BSIMAAsZD qMo8zKYWczvXTFWu9vOSwNg8f9O1NynC3tLhlu/6rML5DOjCRS/rEljv2THPO/bswetl eaCU5zOehm6hzt0z2vEk09snCV7cgODi0FbkCDcIxirvBWginonq6F18YKvOHCXhZKhf V9XA== X-Gm-Message-State: AFqh2krsdzc05UK9UwhgonYJ6JWDbdX4WWDjatekgEXmaQl3jvkJIKLJ peoYw/5pNubm6RtzR9PGlC338coV+co= X-Google-Smtp-Source: AMrXdXvEZrSzN4wj2+bVhwr4zwdHCNFEYMygMi72JMv803dQQ+RFORX3TyEDfJAKGYOc01UDPOxIPQ== X-Received: by 2002:a5d:45cc:0:b0:2bd:e8a8:80bf with SMTP id b12-20020a5d45cc000000b002bde8a880bfmr451516wrs.55.1673621828741; Fri, 13 Jan 2023 06:57:08 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d20-20020adfa354000000b002bc50ba3d06sm15808417wrb.9.2023.01.13.06.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 06:57:08 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 5/7] python3-sphinxcontrib-applehelp: update 1.0.2 -> 1.0.3 Date: Fri, 13 Jan 2023 15:56:58 +0100 Message-Id: <20230113145700.2773771-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230113145700.2773771-1-alex@linutronix.de> References: <20230113145700.2773771-1-alex@linutronix.de> 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 ; Fri, 13 Jan 2023 14:57:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175832 Convert to flit, adjust pypi name. Signed-off-by: Alexander Kanavin --- ...lp_1.0.2.bb => python3-sphinxcontrib-applehelp_1.0.3.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/python/{python3-sphinxcontrib-applehelp_1.0.2.bb => python3-sphinxcontrib-applehelp_1.0.3.bb} (62%) diff --git a/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.2.bb b/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb similarity index 62% rename from meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.2.bb rename to meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb index cde0da8265..c97d204c06 100644 --- a/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.2.bb +++ b/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb @@ -3,10 +3,10 @@ HOMEPAGE = "https://www.sphinx-doc.org" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c7715857042d4c8c0105999ca0c072c5" -SRC_URI[sha256sum] = "a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58" +SRC_URI[sha256sum] = "83749f09f6ac843b8cb685277dbc818a8bf2d76cc19602699094fe9a74db529e" -PYPI_PACKAGE = "sphinxcontrib-applehelp" +PYPI_PACKAGE = "sphinxcontrib.applehelp" -inherit pypi setuptools3 +inherit pypi python_flit_core BBCLASSEXTEND = "native nativesdk" From patchwork Fri Jan 13 14:56:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 18100 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 2FA37C61DB3 for ; Fri, 13 Jan 2023 14:57:16 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web11.88938.1673621831309611892 for ; Fri, 13 Jan 2023 06:57:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Vg0kGEiz; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id o15so15436503wmr.4 for ; Fri, 13 Jan 2023 06:57:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=TFheZ4mEZAUPa1t6ZNozCZfJqIMrkiH9rbPYNGkWk5s=; b=Vg0kGEizN7JXjtIlS3dLcpQmDYMf5HeGo1fGKHooPB0cLSTdpbxF/A143KmsujNyPk ZhtIPA4tpiZqQelJPLIv7Hjt/J7Aj7sq02+rGOmvN6k7NfopjtEXhXt31nEw56NY27A3 rNTfGpkJ4/768in0H0tacQOZFZti+sGUyZNTXjwFsyUBkAhpE+W6laUypEGZOeJpwre/ llBiK7lr6tgphbLBpy4khSUWUGaAYcK3diW74GW3oFe7M6mA1iZs2dPzaTEuqR1hURFu pw28cIAcoBT+bNo5fLyc93/zQ5/xNsYrarCPOuYeCexMEgcNXIEwATnFprtVelgonCPp N0RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=TFheZ4mEZAUPa1t6ZNozCZfJqIMrkiH9rbPYNGkWk5s=; b=VvnPi4DVV8fzHv9vC6VhgD4hGYXYaWNYQM6z8tZpYHYDqok2WEwVE+yaQD7HCBGS5S KCFWrp/uAACr1Xrr/cJz9HYfDEazz1XoB/h3mW3geouaJusTI2T7Z/eU6cXjtT+pKdiT 8LyP43D6TZK67RVF9nnACBydNtJO79vpIxo1p6RpUfFbUtSHzcuzyPfey65pRudgRmbU 3qOOynaf5K+hwlG1gspDJbB0DDTV5pQavMT361iMkdnsEGdC/3Q11WA4uahj7AtxfrqS Xg4RE11wcoBUhXE7x9ocaaI2xfylxwtRe5kKSEY0Kc4HfNTVlLmonNDc0KZPVe3Qpj2S I3DQ== X-Gm-Message-State: AFqh2koemGCs8pfIusdPuM9IHEYDQMorpyLGNmRvqh1aqO60pSw8xneD GkhFbG/OUKvljev+o40zHb+szuk0BLY= X-Google-Smtp-Source: AMrXdXtG/swcMZF1A/NSxMDm5y2tJRjVUvH+FMBN9M1WCAiS9hes5vzQiz7OUn1YOxmiaSf+QFNlSw== X-Received: by 2002:a1c:6a14:0:b0:3d1:f302:1975 with SMTP id f20-20020a1c6a14000000b003d1f3021975mr58062811wmc.33.1673621829355; Fri, 13 Jan 2023 06:57:09 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d20-20020adfa354000000b002bc50ba3d06sm15808417wrb.9.2023.01.13.06.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 06:57:09 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 6/7] gdk-pixbuf: remove ptest support Date: Fri, 13 Jan 2023 15:56:59 +0100 Message-Id: <20230113145700.2773771-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230113145700.2773771-1-alex@linutronix.de> References: <20230113145700.2773771-1-alex@linutronix.de> 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 ; Fri, 13 Jan 2023 14:57:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175833 Moving to x86-64-v3 instructions revealed that the recipe was doing an entirely incorrect thing: running native gdk-pixbuf-query-loaders executable against the target set of loader .so binaries. This worked, but only by coincidence, and no longer works on build hosts that do not support v3 instructions. Re-enabling installed tests in a cross compile scenario requires a complete re-think (against the need to run gdk-pixbuf executables to produce the tests), and is best done upstream, so sadly the cross-testing has to be dropped for now. Signed-off-by: Alexander Kanavin --- .../distro/include/ptest-packagelists.inc | 1 - .../0001-Add-use_prebuilt_tools-option.patch | 173 ------------------ .../gdk-pixbuf/gdk-pixbuf_2.42.10.bb | 30 +-- 3 files changed, 3 insertions(+), 201 deletions(-) delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 48dec07577..32c341a9bc 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -20,7 +20,6 @@ PTESTS_FAST = "\ flex-ptest \ gawk-ptest \ gdbm-ptest \ - gdk-pixbuf-ptest \ glib-networking-ptest \ gzip-ptest \ json-c-ptest \ diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch deleted file mode 100644 index 02cc9a2a70..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch +++ /dev/null @@ -1,173 +0,0 @@ -From f81b60ebcbbfd9548c8aa1e388662c429068d1e3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sat, 8 May 2021 21:58:54 +0200 -Subject: [PATCH] Add use_prebuilt_tools option - -This allows using the gdk-pixbuf tools from the host to -build and install tests in a cross-compile scenarion. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/119] -Signed-off-by: Alexander Kanavin - ---- - gdk-pixbuf/meson.build | 11 +++++++++-- - meson.build | 6 +++--- - meson_options.txt | 4 ++++ - tests/meson.build | 16 ++++++++-------- - thumbnailer/meson.build | 24 ++++++++++++++++++------ - 5 files changed, 42 insertions(+), 19 deletions(-) - -diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build -index 54ff9dd..2e321cf 100644 ---- a/gdk-pixbuf/meson.build -+++ b/gdk-pixbuf/meson.build -@@ -342,13 +342,20 @@ foreach bin: gdkpixbuf_bin - include_directories: [ root_inc, gdk_pixbuf_inc ], - c_args: common_cflags + gdk_pixbuf_cflags, - install: true) -- meson.override_find_program(bin_name, bin) -+ if not get_option('use_prebuilt_tools') -+ meson.override_find_program(bin_name, bin) -+ endif - - # Used in tests - set_variable(bin_name.underscorify(), bin) - endforeach - --if not meson.is_cross_build() -+if get_option('use_prebuilt_tools') -+ gdk_pixbuf_query_loaders = find_program('gdk-pixbuf-query-loaders', required: true) -+ gdk_pixbuf_pixdata = find_program('gdk-pixbuf-pixdata', required: true) -+endif -+ -+if not meson.is_cross_build() or get_option('use_prebuilt_tools') - # The 'loaders.cache' used for testing, so we don't accidentally - # load the installed cache; we always build it by default - loaders_cache = custom_target('loaders.cache', -diff --git a/meson.build b/meson.build -index 813bd43..a93e6f7 100644 ---- a/meson.build -+++ b/meson.build -@@ -369,18 +369,18 @@ subdir('gdk-pixbuf') - # i18n - subdir('po') - --if not meson.is_cross_build() -+if not meson.is_cross_build() or get_option('use_prebuilt_tools') - if get_option('tests') - subdir('tests') - endif -- subdir('thumbnailer') - endif -+subdir('thumbnailer') - - # Documentation - build_docs = get_option('gtk_doc') or get_option('docs') - subdir('docs') - --if not meson.is_cross_build() -+if not meson.is_cross_build() or get_option('use_prebuilt_tools') - meson.add_install_script('build-aux/post-install.py', - gdk_pixbuf_bindir, - gdk_pixbuf_libdir, -diff --git a/meson_options.txt b/meson_options.txt -index d198d99..1c899e9 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -53,4 +53,8 @@ option('gio_sniffing', - description: 'Perform file type detection using GIO (Unused on MacOS and Windows)', - type: 'boolean', - value: true) -+option('use_prebuilt_tools', -+ description: 'Use prebuilt gdk-pixbuf tools from the host for cross-compilation', -+ type: 'boolean', -+ value: false) - -diff --git a/tests/meson.build b/tests/meson.build -index 28c2525..d97c02d 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -5,6 +5,12 @@ - # $PATH. Ideally we should use gnome.compile_resources() and let Meson deal with - # this problem: See https://github.com/mesonbuild/meson/issues/8266. - if enabled_loaders.contains('png') and host_system != 'windows' -+ -+ resources_deps = [loaders_cache,] -+ if not get_option('use_prebuilt_tools') -+ resources_deps += [gdk_pixbuf_pixdata,] -+ endif -+ - # Resources; we cannot use gnome.compile_resources() here, because we need to - # override the environment in order to use the utilities we just built instead - # of the system ones -@@ -21,10 +27,7 @@ if enabled_loaders.contains('png') and host_system != 'windows' - '@INPUT@', - '@OUTPUT@', - ], -- depends: [ -- gdk_pixbuf_pixdata, -- loaders_cache, -- ], -+ depends: resources_deps, - ) - - resources_h = custom_target('resources.h', -@@ -40,10 +43,7 @@ if enabled_loaders.contains('png') and host_system != 'windows' - '@INPUT@', - '@OUTPUT@', - ], -- depends: [ -- gdk_pixbuf_pixdata, -- loaders_cache, -- ], -+ depends: resources_deps, - ) - no_resources = false - else -diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build -index b6a206d..9336c21 100644 ---- a/thumbnailer/meson.build -+++ b/thumbnailer/meson.build -@@ -6,13 +6,29 @@ bin = executable('gdk-pixbuf-thumbnailer', - ], - dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ], - install: true) --meson.override_find_program('gdk-pixbuf-thumbnailer', bin) -+if not get_option('use_prebuilt_tools') -+ meson.override_find_program('gdk-pixbuf-thumbnailer', bin) -+endif - - gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types', - 'gdk-pixbuf-print-mime-types.c', -+ install: true, - c_args: common_cflags, - dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ]) - -+if get_option('use_prebuilt_tools') -+ gdk_pixbuf_print_mime_types = find_program('gdk-pixbuf-print-mime-types', required: true) -+endif -+ -+thumbnailer_deps = [loaders_cache,] -+ -+if not get_option('use_prebuilt_tools') -+ thumbnailer_deps += [ -+ gdk_pixbuf_print_mime_types, -+ gdk_pixbuf_pixdata, -+ ] -+endif -+ - custom_target('thumbnailer', - input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', - output: 'gdk-pixbuf-thumbnailer.thumbnailer', -@@ -25,10 +41,6 @@ custom_target('thumbnailer', - '@INPUT@', - '@OUTPUT@', - ], -- depends: [ -- gdk_pixbuf_print_mime_types, -- gdk_pixbuf_pixdata, -- loaders_cache, -- ], -+ depends: thumbnailer_deps, - install: true, - install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb index aa44515fbb..9f1114c7d0 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb @@ -12,20 +12,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SECTION = "libs" -DEPENDS = "glib-2.0 gdk-pixbuf-native shared-mime-info" +DEPENDS = "glib-2.0 shared-mime-info" DEPENDS:remove:class-native = "gdk-pixbuf-native" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ - file://run-ptest \ file://fatal-loader.patch \ - file://0001-Add-use_prebuilt_tools-option.patch \ " SRC_URI[sha256sum] = "ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b" -inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package +inherit meson pkgconfig gettext pixbufcache upstream-version-is-even gobject-introspection gi-docgen lib_package GIR_MESON_OPTION = 'introspection' GIR_MESON_ENABLE_FLAG = "enabled" @@ -36,7 +34,7 @@ LIBV = "2.10.0" GDK_PIXBUF_LOADERS ?= "png jpeg" PACKAGECONFIG = "${GDK_PIXBUF_LOADERS} \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" + " PACKAGECONFIG:class-native = "${GDK_PIXBUF_LOADERS}" PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" @@ -46,14 +44,6 @@ PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" EXTRA_OEMESON = "-Dman=false" -EXTRA_OEMESON:append:class-target = " \ - -Duse_prebuilt_tools=true \ -" - -EXTRA_OEMESON:append:class-nativesdk = " \ - -Duse_prebuilt_tools=true \ -" - PACKAGES =+ "${PN}-xlib" # For GIO image type sniffing @@ -85,9 +75,6 @@ python populate_packages:prepend () { packages = ' '.join(do_split_packages(d, loaders_root, r'^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s')) d.setVar('PIXBUF_PACKAGES', packages) - # The test suite exercises all the loaders, so ensure they are all - # dependencies of the ptest package. - d.appendVar("RDEPENDS:%s-ptest" % d.getVar('PN'), " " + packages) } do_install:append() { @@ -97,13 +84,6 @@ do_install:append() { } -do_install_ptest() { - # Remove a bad fuzzing attempt that sporadically fails without a way to reproduce - rm ${D}/${datadir}/installed-tests/gdk-pixbuf/pixbuf-randomly-modified.test - # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/215 - rm ${D}/${datadir}/installed-tests/gdk-pixbuf/pixbuf-jpeg.test -} - do_install:append:class-native() { find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; @@ -115,10 +95,6 @@ do_install:append:class-native() { XDG_DATA_DIRS=${STAGING_DATADIR} \ GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache - create_wrapper ${D}/${bindir}/gdk-pixbuf-print-mime-types \ - XDG_DATA_DIRS=${STAGING_DATADIR} \ - GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache - create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ XDG_DATA_DIRS=${STAGING_DATADIR} \ GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ From patchwork Fri Jan 13 14:57:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 18094 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 1CA5CC54EBD for ; Fri, 13 Jan 2023 14:57:16 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web10.88826.1673621831707185630 for ; Fri, 13 Jan 2023 06:57:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fWX+7Fb8; spf=pass (domain: gmail.com, ip: 209.85.128.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f47.google.com with SMTP id m8-20020a05600c3b0800b003d96f801c48so18953139wms.0 for ; Fri, 13 Jan 2023 06:57:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=ss9BUCSzK1t0BYLnXI3iWX+m7uYac+v1NhhqMB5KrYQ=; b=fWX+7Fb8yn0OxhkbGQ+mYbeRRxKkAgNVxnUDXo7Mh4GDggVXsBUMEmV9ZljY3PumCj mVe8sbwlUdSWBf5d92qIPohsTA/j9VG1BaGQmcEMlLGQ+jFnxN9yhBZbXBxWaqG7ZOS5 BjiQgBOzUm74PbLPJYC6ZcnzpZaBM4OE1RUIRnp6Nq1vIX2HSuyI3TCyodk14VXAcxOk muY4CdIDakK/uIbQSOlDeoF4PjFvf+CRD9syUkM/eK24VVLQ+fPeNyMJBe9MOxEWgN9j +3bDGadjc1Twsh8XuJ7ZbpucFFlhsZQRzlX/TA+jKAkfJNMfjihu5rK4BCKXRYcUbnHL YGhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=ss9BUCSzK1t0BYLnXI3iWX+m7uYac+v1NhhqMB5KrYQ=; b=ljEaP3Kq5furPu/63OGZF1XEgX5v1R0hAU+kwjiyYadKbGSFGWMTGiJtxODGBeW+Om 6k+15XoaejPckad8AEyQ6Gk8aE4cEeG1+SP6i35iHmgRQBArjQkYTNp7r1PBv8YIIkrG xAHYfhRTugkOeeH/gS8DzyW62gn4UC3f1x5/34txfoxTdLGaaoE5t3aIHOprsyGLNmg+ jtaMRXVb0GhyoyG8pZXBGf1NI2odMkHzB1FHkRgdvcXrGO9ZqThhDR+tYObkR8xpL16M FgCgvIms1/T42mOu7Wug+MKiIDZ4Ivqa+2XkT0Ox+vE9mjHQc4ELDYX5K2z6lhKH61ls 0STw== X-Gm-Message-State: AFqh2krB8J7rLib12/pXUzk8KNmgAB7z8pPvJevr9S6V3geR7cuez+S1 /7psiy2fOqniuMV7wdDyuQFMdPHOh4U= X-Google-Smtp-Source: AMrXdXs5GY2oBWYktzysjeJRynkra2VGF6z4iqQ/GxNrcKA8OhXduXXlwdstsgXYw5H16JFsQoCnZA== X-Received: by 2002:a05:600c:540a:b0:3d9:ebf9:7004 with SMTP id he10-20020a05600c540a00b003d9ebf97004mr16349993wmb.29.1673621830059; Fri, 13 Jan 2023 06:57:10 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id d20-20020adfa354000000b002bc50ba3d06sm15808417wrb.9.2023.01.13.06.57.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 06:57:09 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 7/7] selftest/virgl: use pkg-config from the host Date: Fri, 13 Jan 2023 15:57:00 +0100 Message-Id: <20230113145700.2773771-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230113145700.2773771-1-alex@linutronix.de> References: <20230113145700.2773771-1-alex@linutronix.de> 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 ; Fri, 13 Jan 2023 14:57:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175834 The check needs to report dri location on the host machine, so pkg-config binary needs to be capable of finding the needed dri.pc file on the host, and therefore needs to know where host .pc files are located. This may not be the case when using pkg-config from buildtools, so this forces usage of host pkg-config. runqemu already does the same PATH tweak, so this simply brings the two in sync. Signed-off-by: Alexander Kanavin --- meta/lib/oeqa/selftest/cases/runtime_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index ae79724956..7d99c158e5 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -268,7 +268,7 @@ class TestImage(OESelftestTestCase): except FileNotFoundError: self.fail("/dev/dri directory does not exist; no render nodes available on this machine. %s" %(render_hint)) try: - dripath = subprocess.check_output("pkg-config --variable=dridriverdir dri", shell=True) + dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH pkg-config --variable=dridriverdir dri", shell=True) except subprocess.CalledProcessError as e: self.fail("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.") qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native')