From a6a8ab75957bc675c025d927f0b7e54cb6d3674a Mon Sep 17 00:00:00 2001 From: Diego Santa Cruz Date: Fri, 26 Feb 2021 12:33:32 +0100 Subject: createrepo-c: set path to magic database for native and nativesdk The modifyrepo_c tool can use the magic database for input files (e.g., if the file has no recognized extension) and fails if none can be found. This adds a wrapper that sets MAGIC to point to the proper place, it also sets up MAGIC in the createrepo_c wrapper since that tool also takes input files. (From OE-Core rev: ea666fbc74163e7ef27a52a072b75fd1f5ac5c25) Signed-off-by: Diego Santa Cruz Signed-off-by: Richard Purdie --- meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb index 350b183542..e0433806b2 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb @@ -24,11 +24,17 @@ BBCLASSEXTEND = "native nativesdk" # Direct createrepo to read rpm configuration from our sysroot, not the one it was compiled in do_install_append_class-native() { create_wrapper ${D}/${bindir}/createrepo_c \ - RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm + RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ + MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc + create_wrapper ${D}/${bindir}/modifyrepo_c \ + MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc } do_install_append_class-nativesdk() { create_wrapper ${D}/${bindir}/createrepo_c \ - RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm + RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ + MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc + create_wrapper ${D}/${bindir}/modifyrepo_c \ + MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc rm -rf ${D}/etc } -- cgit v1.2.3-54-g00ecf