[OE-core] [PATCH] mtools: fix broken /usr/bin/lz

[jackie.huang at windriver.com]

From: Wenlin Kang <wenlin.kang at windriver.com>

When build fs with mtools-3.9.9, has file /usr/bin/lz in rootfs,
it is the symlink to uz:

root at qemu3:~# /usr/bin/lz
-sh: /usr/bin/lz: No such file or directory
$root at qemu3:~# ls -l /usr/bin/lz
lrwxrwxrwx 1 root root 2 Jul 18 18:07 /usr/bin/lz -> uz
root at qemu3:~# uz
-sh: uz: command not found

But the uz isn't actually exist, so the result is that lz is a
broken symlink.

The root cause is that uz hasn't been installed when install-scripts.

Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
---
 meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch | 16 ++++++++++++++++
 meta/recipes-devtools/mtools/mtools_3.9.9.bb            |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch

diff --git a/meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch b/meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch
new file mode 100644
index 0000000..eaa3a5f
--- /dev/null
+++ b/meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch
@@ -0,0 +1,16 @@
+Upstream-Status: Backport
+
+Signed-off-by: Wenlin Kang <wenlin.kang at windriver.com>
+
+diff -uarN mtools-3.9.9-org/Makefile.in mtools-3.9.9/Makefile.in
+--- mtools-3.9.9-org/Makefile.in	2014-08-05 16:10:25.782241173 +0800
++++ mtools-3.9.9/Makefile.in	2014-08-05 16:11:30.864155951 +0800
+@@ -250,7 +250,7 @@
+ install-scripts: ${DESTDIR}$(bindir)/mtools
+ 	@$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
+ 	@for j in $(SCRIPTS) ; do \
+-		$(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
++		$(INSTALL_PROGRAM) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
+ 		echo ${DESTDIR}$(bindir)/$$j ; \
+ 	done
+ 	rm -f ${DESTDIR}$(bindir)/lz
diff --git a/meta/recipes-devtools/mtools/mtools_3.9.9.bb b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
index d995c8f..f6dd336 100644
--- a/meta/recipes-devtools/mtools/mtools_3.9.9.bb
+++ b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
@@ -31,7 +31,9 @@ RRECOMMENDS_${PN} = "\
 SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/mtools-${PV}.tar.gz \
 	file://mtools-makeinfo.patch \
 	file://mtools.patch \
-	file://no-x11.patch"
+	file://no-x11.patch \
+	file://fix-broken-lz.patch \
+"
 
 SRC_URI[md5sum] = "3e68b857b4e1f3a6521d1dfefbd30a36"
 SRC_URI[sha256sum] = "af083a73425d664d4607ef6c6564fd9319a0e47ee7c105259a45356cb834690e"
-- 
2.0.0