[oe-commits] [openembedded-core] 09/24: texinfo-dummy-native: Allow to coexist with texinfo-native

git at git.openembedded.org git at git.openembedded.org
Sun Feb 2 16:53:38 UTC 2020


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 7ab4bb112d8f51a5eee24ab77b80a330aead52a0
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Jan 29 11:38:07 2020 +0000

    texinfo-dummy-native: Allow to coexist with texinfo-native
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 .../recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
index 1254bc8..3732d4f 100644
--- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
+++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
@@ -13,15 +13,19 @@ NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
 
 inherit native
 
+#
+# To avoid texinfo-dummy-native and texinfo-native conflicting we install to base_bindir
+# which is later in PATH than bindir where texinfo-native installs
+#
 do_install_name() {
-    FILENAME="${D}${bindir}/$1"
+    FILENAME="${D}${base_bindir}/$1"
     # Using ln causes problems with rm_work
     cp -T "${S}/template.py" "$FILENAME"
     chmod +x $FILENAME
 }
 
 do_install() {
-    mkdir -p "${D}${bindir}"
+    mkdir -p "${D}${base_bindir}"
     for i in makeinfo pod2texi texi2dvi pdftexi2dvi texindex texi2pdf \
              txixml2texi texi2any install-info ginstall-info \
              update-info-dir; do

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list