summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhongxu <hongxu.jia@windriver.com>2021-08-04 21:08:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-05 08:53:40 +0100
commit28b66dcb72fa72e49f4f53ef7bf27b8e16f6c65e (patch)
tree1726377fd34aa2df75ebfcfda02f8ab2b280b87f
parent1c240f920907518c8982d3164205fa13e6c04f84 (diff)
downloadpoky-28b66dcb72fa72e49f4f53ef7bf27b8e16f6c65e.tar.gz
createrepo-c: fix createrepo-c failed in nativesdk
In sdk, call createrepo-c failed with: ... $ createrepo_c --update ./test_repo/rpm Directory walk started Critical: Failed to detect compression for file ./test_repo/rpm/cortexa72/hello-2.10-r0.cortexa72.rpm: magic_load() failed: could not find any valid magic files! ... Since commit [ea666fbc74 createrepo-c: set path to magic database for native and nativesdk] applied, the MAGIC is incorrectly assigned. The variable datadir will be expanded automatically for nativesdk, do not need to add prefix ${SDKPATHNATIVE} to MAGIC (From OE-Core rev: 54368f1b02e1ac4aa068515730a8c8bcd3683eb3) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb
index 6313afc108..500b508d72 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb
@@ -33,8 +33,8 @@ do_install:append:class-native() {
33do_install:append:class-nativesdk() { 33do_install:append:class-nativesdk() {
34 create_wrapper ${D}/${bindir}/createrepo_c \ 34 create_wrapper ${D}/${bindir}/createrepo_c \
35 RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ 35 RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \
36 MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc 36 MAGIC=${datadir}/misc/magic.mgc
37 create_wrapper ${D}/${bindir}/modifyrepo_c \ 37 create_wrapper ${D}/${bindir}/modifyrepo_c \
38 MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc 38 MAGIC=${datadir}/misc/magic.mgc
39 rm -rf ${D}/etc 39 rm -rf ${D}/etc
40} 40}