From 11f327a4705f281e32b44ebb401f6e6d5ad0211c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 22 Jul 2009 10:28:45 +0200 Subject: base bbclass: try to find the git binaries in PATH instead of BBPATH * Also, how do I get the build banner back? This bug went unnoticed due to it being gone --- classes/base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index bc50c67d4b..9c51c0a08e 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -885,7 +885,7 @@ def base_get_metadata_svn_revision(path, d): def base_get_metadata_git_branch(path, d): import os - branch = os.popen('cd %s; PATH=%s git symbolic-ref HEAD 2>/dev/null' % (path, d.getVar("BBPATH", 1))).read().rstrip() + branch = os.popen('cd %s; PATH=%s git symbolic-ref HEAD 2>/dev/null' % (path, d.getVar("PATH", 1))).read().rstrip() if len(branch) != 0: return branch.replace("refs/heads/", "") @@ -893,7 +893,7 @@ def base_get_metadata_git_branch(path, d): def base_get_metadata_git_revision(path, d): import os - rev = os.popen("cd %s; PATH=%s git show-ref HEAD 2>/dev/null" % (path, d.getVar("BBPATH", 1))).read().split(" ")[0].rstrip() + rev = os.popen("cd %s; PATH=%s git show-ref HEAD 2>/dev/null" % (path, d.getVar("PATH", 1))).read().split(" ")[0].rstrip() if len(rev) != 0: return rev return "" -- cgit v1.2.3 From 775c746f69a6eb9cfacc76b6c8c97f4296f59f8b Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 1 Aug 2009 15:07:41 +0200 Subject: base.bbclass: Strip -sdk from the PN for BPN as well This is fixing the compilation of libtool-sdk_2.6.6a which is currently the only user of BPN. --- classes/base.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 9c51c0a08e..ef6c0abf8f 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -216,6 +216,9 @@ def base_package_name(d): pn = pn[0:-8] elif pn.endswith("-intermediate"): pn = pn[0:-13] + elif pn.endswith("-sdk"): + pn = pn[0:-4] + return pn -- cgit v1.2.3