summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-11-26 10:59:11 -0800
committerKhem Raj <raj.khem@gmail.com>2023-11-26 14:18:58 -0800
commiteff650e3f6d5e28bedd855fa761f3f3f706f74bb (patch)
treed17cad7bd2f30e6ce0168a076255a043e5e75e99
parent20c083b15b6c7ae96be6f9507a58056d49a3e81c (diff)
downloadmeta-openembedded-eff650e3f6d5e28bedd855fa761f3f3f706f74bb.tar.gz
nlohmann-json: Fix SRCREV_FORMAT and do not package git metadata into ptests
SRCREV_FORMAT should append to default for considering both git repositories. the git hook scripts require shell to be installed on target and it may want it from /usr/bin/sh and distro may not provide /usr/bin/sh since its not having usrmerge distro feature. Fixes ERROR: nlohmann-json-3.11.2-r0 do_package_qa: QA Issue: /usr/lib/nlohmann-json/ptest/json_test_data/.git/hooks/update.sample contained in package nlohmann-json-ptest requires /usr/bin/sh, but no providers found in RDEPENDS:nlohmann-json-ptest? [file-rdeps] Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb
index 694d632cb1..350932388c 100644
--- a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb
+++ b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;protocol=https \
16SRCREV = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d" 16SRCREV = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d"
17SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37" 17SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37"
18 18
19SRCREV_FORMAT = "json-test-data" 19SRCREV_FORMAT .= "_json-test-data"
20 20
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
22 22
@@ -36,6 +36,7 @@ do_install_ptest () {
36 install -d ${D}${PTEST_PATH}/tests 36 install -d ${D}${PTEST_PATH}/tests
37 cp -r ${S}/json_test_data/ ${D}${PTEST_PATH}/ 37 cp -r ${S}/json_test_data/ ${D}${PTEST_PATH}/
38 cp -r ${B}/tests/test-* ${D}${PTEST_PATH}/tests 38 cp -r ${B}/tests/test-* ${D}${PTEST_PATH}/tests
39 rm -rf ${D}${PTEST_PATH}/json_test_data/.git
39} 40}
40 41
41 42