From 0433f28ee975eb4637b51ac16fc6751fae19634e Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 30 Aug 2019 15:06:46 +0800 Subject: xfsprogs: support usrmerge Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb') diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb index bed80a615f..5ab1d028fc 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb @@ -11,6 +11,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ file://0001-build-Check-for-sync_file_range-libc-function.patch \ file://0001-Check-for-MAP_SYNC-in-sys-mman.h.patch \ file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ + file://0001-support-usrmerge.patch \ " SRC_URI[md5sum] = "5ca3f79e76e3fb984a03d1b42a2e60ba" SRC_URI[sha256sum] = "7b500e148cebd08f99e37cf744c7843817b37e7be2a32c4dc57d6ea16e3019ae" @@ -68,6 +69,8 @@ do_install_append() { 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 + if [ ${libdir} != ${base_libdir} ];then + ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a + ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so + fi } -- cgit v1.2.3-54-g00ecf