bzip2: improve symlink creation

This recipe inherits relative_symlinks as otherwise ${bindir}/bunzip2 is
an absolute link to ${bindir}/bzip2.  However, we drop the Makfile.am
into the tree so instead of working around the problem, we can just fix
the Makefile rules directly.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-extended/bzip2/bzip2/Makefile.am b/meta/recipes-extended/bzip2/bzip2/Makefile.am
index d12d3a45e479312f2cfd00bb3795a1874a0cfe41..c0aed80ce6286f7693a957de7d25a3c8cf18438b 100644 (file)
--- a/meta/recipes-extended/bzip2/bzip2/Makefile.am
+++ b/meta/recipes-extended/bzip2/bzip2/Makefile.am
@@ -60,12 +60,12 @@ install-ptest:
        ln -s $(bindir)/bzip2           $(DESTDIR)/bzip2
 
 install-exec-hook:
-       ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bunzip2$(EXEEXT)
-       ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bzcat$(EXEEXT)
-       ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzegrep$(EXEEXT)
-       ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzfgrep$(EXEEXT)
-       ln -s $(bindir)/bzmore$(EXEEXT) $(DESTDIR)$(bindir)/bzless$(EXEEXT)
-       ln -s $(bindir)/bzdiff$(EXEEXT) $(DESTDIR)$(bindir)/bzcmp$(EXEEXT)
+       ln -s bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bunzip2$(EXEEXT)
+       ln -s bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bzcat$(EXEEXT)
+       ln -s bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzegrep$(EXEEXT)
+       ln -s bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzfgrep$(EXEEXT)
+       ln -s bzmore$(EXEEXT) $(DESTDIR)$(bindir)/bzless$(EXEEXT)
+       ln -s bzdiff$(EXEEXT) $(DESTDIR)$(bindir)/bzcmp$(EXEEXT)
 
 install-data-hook:
        echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzegrep.1

diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
index 5b10821ccb066878d851be76bbc1e7d1eb6731f8..9cecf6a331b60406690e2e372eda4f2ef4f66b75 100644 (file)
--- a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
@@ -38,7 +38,7 @@ PACKAGES =+ "libbz2"
 
 CFLAGS += "-fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64"
 
-inherit autotools update-alternatives ptest relative_symlinks
+inherit autotools update-alternatives ptest
 
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE:${PN} = "bunzip2 bzcat bzip2"