From 7308da9ccd4b8b9b5077aacd0442be28a6c73c61 Mon Sep 17 00:00:00 2001 From: Wenlin Kang Date: Thu, 16 Oct 2014 06:26:49 -0400 Subject: mtools: fix broken /usr/bin/lz When build fs with mtools-3.9.9, has file /usr/bin/lz in rootfs, it is the symlink to uz: root@qemu3:~# /usr/bin/lz -sh: /usr/bin/lz: No such file or directory $root@qemu3:~# ls -l /usr/bin/lz lrwxrwxrwx 1 root root 2 Jul 18 18:07 /usr/bin/lz -> uz root@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 Signed-off-by: Jackie Huang --- .../mtools/mtools/fix-broken-lz.patch | 23 ++++++++++++++++++++++ meta/recipes-devtools/mtools/mtools_3.9.9.bb | 4 +++- 2 files changed, 26 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 0000000000..cb454917ff --- /dev/null +++ b/meta/recipes-devtools/mtools/mtools/fix-broken-lz.patch @@ -0,0 +1,23 @@ +Upstream-Status: Backport + +Signed-off-by: Wenlin Kang +Signed-off-by: Jackie Huang +--- + Makefile.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.in b/Makefile.in +index 8f9305a..694e837 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -251,6 +251,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 +-- +2.0.0 + diff --git a/meta/recipes-devtools/mtools/mtools_3.9.9.bb b/meta/recipes-devtools/mtools/mtools_3.9.9.bb index d995c8f042..f6dd3361c9 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" -- cgit 1.2.3-korg