bitbake.conf: Define USRBINPATH globally instead of individually

Many recipes are now having to define PERLPATH and PYTHONPATH variables.
Creating USRBINPATH in bitbake.conf means we can remove all these lines
from the many recipes now needing this and simplify the code changes
needed in each case, reducing the chance of errors being introduced.

Also fixup glib python binary location issue and fix function indentation.

(From OE-Core rev: cf63d9068c3a8c635dfc240d30dfff278be9b0e2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 1 insertions, 4 deletions

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 9a7febe666..119b443649 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -77,9 +77,6 @@ DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through
 
 inherit libc-common multilib_header
 
-PERLPATH = "${bindir}/env perl"
-PERLPATH_virtclass-nativesdk = "/usr/bin/env perl"
-
 do_install_append () {
         rm -f ${D}${sysconfdir}/localtime
         rm -rf ${D}${localstatedir}
@@ -87,7 +84,7 @@ do_install_append () {
         oe_multilib_header bits/syscall.h
 
         if [ -f ${D}${bindir}/mtrace ]; then
-                sed -i -e '1s,#!.*perl,#! ${PERLPATH},' -e '2s,exec.*perl,exec ${PERLPATH},' ${D}${bindir}/mtrace
+                sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace
         fi
 }