mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-07 15:40:01 +00:00
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>
This commit is contained in:
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;protocol=https \
|
|||||||
SRCREV = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d"
|
SRCREV = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d"
|
||||||
SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37"
|
SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37"
|
||||||
|
|
||||||
SRCREV_FORMAT = "json-test-data"
|
SRCREV_FORMAT .= "_json-test-data"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
@@ -36,6 +36,7 @@ do_install_ptest () {
|
|||||||
install -d ${D}${PTEST_PATH}/tests
|
install -d ${D}${PTEST_PATH}/tests
|
||||||
cp -r ${S}/json_test_data/ ${D}${PTEST_PATH}/
|
cp -r ${S}/json_test_data/ ${D}${PTEST_PATH}/
|
||||||
cp -r ${B}/tests/test-* ${D}${PTEST_PATH}/tests
|
cp -r ${B}/tests/test-* ${D}${PTEST_PATH}/tests
|
||||||
|
rm -rf ${D}${PTEST_PATH}/json_test_data/.git
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user