diff options
| author | Diego Santa Cruz <Diego.SantaCruz@spinetix.com> | 2021-02-26 12:33:32 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-27 22:40:41 +0000 |
| commit | a6a8ab75957bc675c025d927f0b7e54cb6d3674a (patch) | |
| tree | 6a1fc05ecef4433c46388676f6a11ddfe20de875 | |
| parent | 40d9466b8ce70ddfffc768132ae9875f75acebb1 (diff) | |
| download | poky-a6a8ab75957bc675c025d927f0b7e54cb6d3674a.tar.gz | |
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 <Diego.SantaCruz@spinetix.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb | 10 |
1 files changed, 8 insertions, 2 deletions
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" | |||
| 24 | # Direct createrepo to read rpm configuration from our sysroot, not the one it was compiled in | 24 | # Direct createrepo to read rpm configuration from our sysroot, not the one it was compiled in |
| 25 | do_install_append_class-native() { | 25 | do_install_append_class-native() { |
| 26 | create_wrapper ${D}/${bindir}/createrepo_c \ | 26 | create_wrapper ${D}/${bindir}/createrepo_c \ |
| 27 | RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm | 27 | RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ |
| 28 | MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc | ||
| 29 | create_wrapper ${D}/${bindir}/modifyrepo_c \ | ||
| 30 | MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc | ||
| 28 | } | 31 | } |
| 29 | 32 | ||
| 30 | do_install_append_class-nativesdk() { | 33 | do_install_append_class-nativesdk() { |
| 31 | create_wrapper ${D}/${bindir}/createrepo_c \ | 34 | create_wrapper ${D}/${bindir}/createrepo_c \ |
| 32 | RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm | 35 | RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ |
| 36 | MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc | ||
| 37 | create_wrapper ${D}/${bindir}/modifyrepo_c \ | ||
| 38 | MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc | ||
| 33 | rm -rf ${D}/etc | 39 | rm -rf ${D}/etc |
| 34 | } | 40 | } |
