From patchwork Sat Sep 16 17:49:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 30561 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 62291C2BA16 for ; Sat, 16 Sep 2023 17:49:44 +0000 (UTC) Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by mx.groups.io with SMTP id smtpd.web10.16227.1694886577070101552 for ; Sat, 16 Sep 2023 10:49:37 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.81, mailfrom: f_l_k@t-online.de) Received: from fwd79.aul.t-online.de (fwd79.aul.t-online.de [10.223.144.105]) by mailout03.t-online.de (Postfix) with SMTP id 665592C06 for ; Sat, 16 Sep 2023 19:49:33 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([79.219.224.246]) by fwd79.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1qhZQC-25rCxV0; Sat, 16 Sep 2023 19:49:32 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH] libxmlb: fix a reproducibility and runtime issue with ptest Date: Sat, 16 Sep 2023 19:49:15 +0200 Message-ID: <20230916174915.306571-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1694886572-EDFF92E6-83620D50/0/0 CLEAN NORMAL X-TOI-MSGID: a02e6c16-f9c9-41b8-bc37-70fd28c1a974 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 ; Sat, 16 Sep 2023 17:49:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/104904 - add missing HOMEPAGE entry Signed-off-by: Markus Volk --- ...xb-selftest.c-hardcode-G_TEST_SRCDIR.patch | 35 +++++++++++++++++++ .../recipes-gnome/libxmlb/libxmlb_0.3.14.bb | 15 ++++---- 2 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 meta-oe/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch diff --git a/meta-oe/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch b/meta-oe/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch new file mode 100644 index 000000000..da8ce68df --- /dev/null +++ b/meta-oe/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch @@ -0,0 +1,35 @@ +From dc208bafc57c1ccaa0ca260f99c8b4c976271ebc Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Sat, 16 Sep 2023 14:02:57 +0200 +Subject: [PATCH] xb-self-test.c: hardcode G_TEST_SRCDIR + +This avoids: + libxmlb-0.3.14-r0 do_package_qa: QA Issue: File + /usr/libexec/installed-tests/libxmlb/xb-self-test in package libxmlb-ptest + contains reference to TMPDIR [buildpaths] + +and also fixes the runtime for the ptest. + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Markus Volk +--- + src/xb-self-test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xb-self-test.c b/src/xb-self-test.c +index 47d9728..8b3dd0e 100644 +--- a/src/xb-self-test.c ++++ b/src/xb-self-test.c +@@ -2870,7 +2870,7 @@ xb_speed_func(void) + int + main(int argc, char **argv) + { +- g_setenv("G_TEST_SRCDIR", SRCDIR, FALSE); ++ g_setenv("G_TEST_SRCDIR", "/usr/libexec/installed-tests/libxmlb", FALSE); + + g_test_init(&argc, &argv, NULL); + +-- +2.41.0 + diff --git a/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.14.bb b/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.14.bb index d46811124..1d3b0de29 100644 --- a/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.14.bb +++ b/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.14.bb @@ -1,10 +1,13 @@ SUMMARY = "A library to help create and query binary XML blobs" +HOMEPAGE = "https://github.com/hughsie/libxmlb" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" -SRC_URI = "git://github.com/hughsie/libxmlb.git;branch=main;protocol=https \ - file://run-ptest \ - " +SRC_URI = " \ + git://github.com/hughsie/libxmlb.git;branch=main;protocol=https \ + file://0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch \ + file://run-ptest \ +" SRCREV = "aa577b276adc66564f5777f9a522ca3bf0bfa65e" S = "${WORKDIR}/git" @@ -12,13 +15,11 @@ DEPENDS = "glib-2.0 xz zstd" inherit gobject-introspection gtk-doc meson ptest-gnome lib_package pkgconfig -PACKAGECONFIG ??= "\ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ -" +PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" GTKDOC_MESON_OPTION = "gtkdoc" -FILES:${PN}-bin += "${libexecdir}/*" +FILES:${PN} += "${datadir}" BBCLASSEXTEND = "native"