diff options
| author | Markus Volk <f_l_k@t-online.de> | 2023-09-18 14:57:09 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-20 08:57:26 +0100 |
| commit | e2f723f1abca763cf2f3f562427fafcb5f24e8e9 (patch) | |
| tree | 140f3aaebfcb60e2f2418893f9568409e486796a /meta | |
| parent | b2491d4475f6ae706a31950c0ab95bce028ae9ea (diff) | |
| download | poky-e2f723f1abca763cf2f3f562427fafcb5f24e8e9.tar.gz | |
libxmlb: import recipe from meta-oe
appstream has a dependency on it
- add a patch to fix a reproducibility and runtime issue with ptest
ptest completes without error
- add the recipe to ptest-packagelists.inc
(From OE-Core rev: 334410b10652881bb34dc06f5c68d500c9339b65)
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
4 files changed, 64 insertions, 0 deletions
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index e023891b7b..d5f41a995e 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc | |||
| @@ -47,6 +47,7 @@ PTESTS_FAST = "\ | |||
| 47 | libxml-sax-base-perl \ | 47 | libxml-sax-base-perl \ |
| 48 | libxml-simple-perl \ | 48 | libxml-simple-perl \ |
| 49 | libxml2 \ | 49 | libxml2 \ |
| 50 | libxmlb \ | ||
| 50 | logrotate \ | 51 | logrotate \ |
| 51 | lua \ | 52 | lua \ |
| 52 | lzo \ | 53 | lzo \ |
diff --git a/meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch b/meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch new file mode 100644 index 0000000000..da8ce68df9 --- /dev/null +++ b/meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | From dc208bafc57c1ccaa0ca260f99c8b4c976271ebc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Markus Volk <f_l_k@t-online.de> | ||
| 3 | Date: Sat, 16 Sep 2023 14:02:57 +0200 | ||
| 4 | Subject: [PATCH] xb-self-test.c: hardcode G_TEST_SRCDIR | ||
| 5 | |||
| 6 | This avoids: | ||
| 7 | libxmlb-0.3.14-r0 do_package_qa: QA Issue: File | ||
| 8 | /usr/libexec/installed-tests/libxmlb/xb-self-test in package libxmlb-ptest | ||
| 9 | contains reference to TMPDIR [buildpaths] | ||
| 10 | |||
| 11 | and also fixes the runtime for the ptest. | ||
| 12 | |||
| 13 | Upstream-Status: Inappropriate [oe-specific] | ||
| 14 | |||
| 15 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 16 | --- | ||
| 17 | src/xb-self-test.c | 2 +- | ||
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 19 | |||
| 20 | diff --git a/src/xb-self-test.c b/src/xb-self-test.c | ||
| 21 | index 47d9728..8b3dd0e 100644 | ||
| 22 | --- a/src/xb-self-test.c | ||
| 23 | +++ b/src/xb-self-test.c | ||
| 24 | @@ -2870,7 +2870,7 @@ xb_speed_func(void) | ||
| 25 | int | ||
| 26 | main(int argc, char **argv) | ||
| 27 | { | ||
| 28 | - g_setenv("G_TEST_SRCDIR", SRCDIR, FALSE); | ||
| 29 | + g_setenv("G_TEST_SRCDIR", "/usr/libexec/installed-tests/libxmlb", FALSE); | ||
| 30 | |||
| 31 | g_test_init(&argc, &argv, NULL); | ||
| 32 | |||
| 33 | -- | ||
| 34 | 2.41.0 | ||
| 35 | |||
diff --git a/meta/recipes-gnome/libxmlb/libxmlb/run-ptest b/meta/recipes-gnome/libxmlb/libxmlb/run-ptest new file mode 100644 index 0000000000..6d0bb95d3a --- /dev/null +++ b/meta/recipes-gnome/libxmlb/libxmlb/run-ptest | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | #! /bin/sh | ||
| 2 | |||
| 3 | gnome-desktop-testing-runner libxmlb | ||
diff --git a/meta/recipes-gnome/libxmlb/libxmlb_0.3.14.bb b/meta/recipes-gnome/libxmlb/libxmlb_0.3.14.bb new file mode 100644 index 0000000000..1d3b0de29a --- /dev/null +++ b/meta/recipes-gnome/libxmlb/libxmlb_0.3.14.bb | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | SUMMARY = "A library to help create and query binary XML blobs" | ||
| 2 | HOMEPAGE = "https://github.com/hughsie/libxmlb" | ||
| 3 | LICENSE = "LGPL-2.1-only" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" | ||
| 5 | |||
| 6 | SRC_URI = " \ | ||
| 7 | git://github.com/hughsie/libxmlb.git;branch=main;protocol=https \ | ||
| 8 | file://0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch \ | ||
| 9 | file://run-ptest \ | ||
| 10 | " | ||
| 11 | SRCREV = "aa577b276adc66564f5777f9a522ca3bf0bfa65e" | ||
| 12 | S = "${WORKDIR}/git" | ||
| 13 | |||
| 14 | DEPENDS = "glib-2.0 xz zstd" | ||
| 15 | |||
| 16 | inherit gobject-introspection gtk-doc meson ptest-gnome lib_package pkgconfig | ||
| 17 | |||
| 18 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | ||
| 19 | PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" | ||
| 20 | |||
| 21 | GTKDOC_MESON_OPTION = "gtkdoc" | ||
| 22 | |||
| 23 | FILES:${PN} += "${datadir}" | ||
| 24 | |||
| 25 | BBCLASSEXTEND = "native" | ||
