From b5f0ba6b5bdf64671e8f3ab3a146e5bf4969e059 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Fri, 17 Oct 2025 21:48:00 +0200 Subject: [PATCH] libjcat: fix ptests Some files are not installed with the testsuite, making it fail. Both of these were fixed upstream, however only one patch applies cleanly. The other is fixed with a single "install" command. Signed-off-by: Gyorgy Sarvari --- .../install_missing_ptest_binary.patch | 25 +++++++++++++++++++ .../recipes-gnome/libjcat/libjcat_0.1.11.bb | 5 ++++ 2 files changed, 30 insertions(+) create mode 100644 meta-oe/recipes-gnome/libjcat/libjcat/install_missing_ptest_binary.patch diff --git a/meta-oe/recipes-gnome/libjcat/libjcat/install_missing_ptest_binary.patch b/meta-oe/recipes-gnome/libjcat/libjcat/install_missing_ptest_binary.patch new file mode 100644 index 0000000000..7a363e9d0f --- /dev/null +++ b/meta-oe/recipes-gnome/libjcat/libjcat/install_missing_ptest_binary.patch @@ -0,0 +1,25 @@ +From a056df0dadd8aa09a750a65f2b7201b8742c9378 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Fri, 29 Apr 2022 18:02:10 +0200 +Subject: [PATCH] installed-tests: install firmware.bin.ed25519 + +This was forgotten in f802f078ec0349e4056bf764ee4da16fe9973978. + +Upstream-Status: Backport [https://github.com/hughsie/libjcat/commit/a056df0dadd8aa09a750a65f2b7201b8742c9378] +Signed-off-by: Gyorgy Sarvari +--- + data/tests/colorhug/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/tests/colorhug/meson.build b/data/tests/colorhug/meson.build +index 7ee3e62..b871500 100644 +--- a/data/tests/colorhug/meson.build ++++ b/data/tests/colorhug/meson.build +@@ -1,6 +1,7 @@ + install_data([ + 'firmware.bin', + 'firmware.bin.asc', ++ 'firmware.bin.ed25519', + 'firmware.bin.p7b', + ], + install_dir: join_paths(installed_test_bindir, 'colorhug'), diff --git a/meta-oe/recipes-gnome/libjcat/libjcat_0.1.11.bb b/meta-oe/recipes-gnome/libjcat/libjcat_0.1.11.bb index bd17e44cd0..34aa2bb48b 100644 --- a/meta-oe/recipes-gnome/libjcat/libjcat_0.1.11.bb +++ b/meta-oe/recipes-gnome/libjcat/libjcat_0.1.11.bb @@ -9,6 +9,7 @@ DEPENDS = "\ SRC_URI = "\ git://github.com/hughsie/libjcat.git;branch=main;protocol=https \ + file://install_missing_ptest_binary.patch \ file://run-ptest \ " SRCREV = "ffa0b5a9a49a7880e9ab3ae3b061080f15e95e15" @@ -32,3 +33,7 @@ GTKDOC_MESON_OPTION = "gtkdoc" RDEPENDS:${PN}:class-target = "\ ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \ " + +do_install_ptest:append(){ + install ${S}/data/tests/pki/test.ed25519 ${D}${libexecdir}/installed-tests/libjcat/pki/ +}