diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2009-08-05 17:14:29 +0400 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2009-08-05 17:14:29 +0400 |
| commit | 5d87cec7a3e962afb7cfa621d172abc3effc085d (patch) | |
| tree | 5e26142100749807b517588779120b73a83a30d2 /classes/base.bbclass | |
| parent | c91a54aef8a39e7cbb2571574f56f2cf12104ff1 (diff) | |
| parent | 2880b3877d38bfaa4056af6df7f122a64e955292 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'classes/base.bbclass')
| -rw-r--r-- | classes/base.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index bc50c67d4b..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 @@ -885,7 +888,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 +896,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 "<unknown>" |