[oe-commits] [meta-openembedded] 54/86: xfsprogs: Fix host contamination

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 9fca96ad91ea8ece70d7bace68d04e0542ca7d0e
Author: Ovidiu Panait <ovidiu.panait at windriver.com>
AuthorDate: Thu Jun 6 11:02:26 2019 +0300

    xfsprogs: Fix host contamination
    
    Currently, the following symbolic links point to the host:
    $ cd xfsprogs/4.18.0-r0/image
    $ find . -type l -iname "lib*" -ls
    ./usr/lib/libhandle.so -> /lib/libhandle.so
    ./lib/libhandle.a -> /usr/lib/libhandle.a
    
    This causes a build failure if the files already exist on the host:
    ERROR: xfsprogs-4.18.0-r0 do_package_write_rpm: Function failed: BUILDSPEC
    ...
    | NOTE: Creating RPM package for xfsprogs-fsck
    | NOTE: Creating RPM package for xfsprogs-mkfs
    | NOTE: Creating RPM package for xfsprogs-repair
    | NOTE: Creating RPM package for libhandle1
    | NOTE: Creating RPM package for xfsprogs-dbg
    | NOTE: Creating RPM package for xfsprogs-staticdev
    | NOTE: Creating RPM package for libhandle1
    | NOTE: Creating RPM package for xfsprogs-doc
    | NOTE: Not creating empty RPM package for xfsprogs-locale
    | NOTE: Creating RPM package for xfsprogs
    | NOTE: Creating RPM package for xfsprogs
    | error: line 175: %package -n libhandle1: package libhandle1 already exists
    ...
    
    Signed-off-by: Ovidiu Panait <ovidiu.panait at windriver.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb
index 88603db..931c64a 100644
--- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb
+++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb
@@ -67,4 +67,7 @@ do_install_append() {
         oe_runmake 'DESTDIR=${D}' install-dev
         rm ${D}${libdir}/*.la
         rmdir --ignore-fail-on-non-empty ${D}${libdir}
+
+        ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a
+        ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.