[OE-core] [PATCH] util-linux: replace package files

[Zhang Xiao]

Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM
package to related library's dev RPM packages.

[YOCTO #4500]
[CQID: WIND00412705]

Signed-off-by: Zhang Xiao <xiao.zhang at windriver.com>
---
 .../util-linux-replace-package-files.patch         |   56 ++++++++++++++++++++
 meta/recipes-core/util-linux/util-linux_2.22.2.bb  |    1 +
 2 files changed, 57 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch

diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch
new file mode 100644
index 0000000..32868cc
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch
@@ -0,0 +1,56 @@
+Upstream-Status: Pending
+Signed-off-by: Zhang Xiao <xiao.zhang at windriver.com> 
+
+Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM
+package to related library's dev RPM packages.
+---
+ libblkid/src/Makemodule.am |    6 +-----
+ libmount/src/Makemodule.am |    6 +-----
+ libuuid/src/Makemodule.am  |    6 +-----
+ 3 files changed, 3 insertions(+), 15 deletions(-)
+
+--- util-linux-2.22.2/libuuid/src/Makemodule.am.orig
++++ util-linux-2.22.2/libuuid/src/Makemodule.am
+@@ -42,11 +42,7 @@ install-exec-hook-libuuid:
+ 	if test "$(usrlib_execdir)" != "$(libdir)"; then \
+ 		mkdir -p $(DESTDIR)$(libdir); \
+ 		mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* $(DESTDIR)$(libdir); \
+-		so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libuuid.so); \
+-		so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
+-		(cd $(DESTDIR)$(usrlib_execdir) && \
+-			rm -f libuuid.so && \
+-			$(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libuuid.so); \
++		mv $(DESTDIR)$(usrlib_execdir)/libuuid.so $(DESTDIR)$(libdir); \
+ 	fi
+ 
+ uninstall-hook-libuuid:
+--- util-linux-2.22.2/libmount/src/Makemodule.am.orig
++++ util-linux-2.22.2/libmount/src/Makemodule.am
+@@ -123,11 +123,7 @@ install-exec-hook-libmount:
+ 	if test "$(usrlib_execdir)" != "$(libdir)"; then \
+ 		mkdir -p $(DESTDIR)$(libdir); \
+ 		mv $(DESTDIR)$(usrlib_execdir)/libmount.so.* $(DESTDIR)$(libdir); \
+-		so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libmount.so); \
+-		so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
+-		(cd $(DESTDIR)$(usrlib_execdir) && \
+-			rm -f libmount.so && \
+-			$(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libmount.so); \
++		mv $(DESTDIR)$(usrlib_execdir)/libmount.so $(DESTDIR)$(libdir); \
+ 	fi
+ 
+ uninstall-hook-libmount:
+--- util-linux-2.22.2/libblkid/src/Makemodule.am.orig
++++ util-linux-2.22.2/libblkid/src/Makemodule.am
+@@ -219,11 +219,7 @@ install-exec-hook-libblkid:
+ 	if test "$(usrlib_execdir)" != "$(libdir)"; then \
+ 		mkdir -p $(DESTDIR)$(libdir); \
+ 		mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* $(DESTDIR)$(libdir); \
+-		so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libblkid.so); \
+-		so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
+-		(cd $(DESTDIR)$(usrlib_execdir) && \
+-			rm -f libblkid.so && \
+-			$(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libblkid.so); \
++		mv $(DESTDIR)$(usrlib_execdir)/libblkid.so $(DESTDIR)$(libdir); \
+ 	fi
+ 
+ uninstall-hook-libblkid:
diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
index 43a55a6..526308d 100644
--- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
@@ -8,6 +8,7 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
             file://configure-sbindir.patch \
             file://fix-configure.patch \
             file://mbsalign-license.patch \
+            file://util-linux-replace-package-files.patch \
 "
 
 SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e"
-- 
1.7.1