diff options
| author | Ovidiu Panait <ovidiu.panait@windriver.com> | 2019-06-06 11:02:26 +0300 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-06-15 16:45:33 -0700 |
| commit | 9fca96ad91ea8ece70d7bace68d04e0542ca7d0e (patch) | |
| tree | 59aa4c46e5b0e66ff027b71271aaff4134042461 | |
| parent | 0fd7fa36218bc9e008b4bac115f40c0c3e80028f (diff) | |
| download | meta-openembedded-9fca96ad91ea8ece70d7bace68d04e0542ca7d0e.tar.gz | |
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@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.18.0.bb | 3 |
1 files changed, 3 insertions, 0 deletions
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 88603db805..931c64a14a 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() { | |||
| 67 | oe_runmake 'DESTDIR=${D}' install-dev | 67 | oe_runmake 'DESTDIR=${D}' install-dev |
| 68 | rm ${D}${libdir}/*.la | 68 | rm ${D}${libdir}/*.la |
| 69 | rmdir --ignore-fail-on-non-empty ${D}${libdir} | 69 | rmdir --ignore-fail-on-non-empty ${D}${libdir} |
| 70 | |||
| 71 | ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a | ||
| 72 | ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so | ||
| 70 | } | 73 | } |
