diff options
| author |   Jens Rehsack <rehsack@gmail.com> | 2015-10-16 19:14:04 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-27 07:23:21 +0000 |
| commit | af88f538e61afa1b115be4d7afe00d8477f61750 (patch) | |
| tree | 5d7bac0bb0b6270e8e6c7fa2e5b855ae758ff026 | |
| parent | 02c64f7487ca8ec5d32c440f5002c4b8f64b76a6 (diff) | |
| download | bitbake-af88f538e61afa1b115be4d7afe00d8477f61750.tar.gz | |
fetcher: svn: Add support for checkout to a custom path
Add support for the Subversion fetcher to checkout modules to a custom path
than the module name to avoid checkout is always module - svn is path
based and tag/branch-checkout might break builds because of invaid path specs.
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/fetch2/svn.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py index 1733c2beb..8a291935c 100644 --- a/lib/bb/fetch2/svn.py +++ b/lib/bb/fetch2/svn.py @@ -54,6 +54,11 @@ class Svn(FetchMethod): ud.module = ud.parm["module"] + if not "path_spec" in ud.parm: + ud.path_spec = ud.module + else: + ud.path_spec = ud.parm["path_spec"] + # Create paths to svn checkouts relpath = self._strip_leading_slashes(ud.path) ud.pkgdir = os.path.join(data.expand('${SVNDIR}', d), ud.host, relpath) @@ -102,7 +107,7 @@ class Svn(FetchMethod): if command == "fetch": transportuser = ud.parm.get("transportuser", "") - svncmd = "%s co %s %s://%s%s/%s%s %s" % (ud.basecmd, " ".join(options), proto, transportuser, svnroot, ud.module, suffix, ud.module) + svncmd = "%s co %s %s://%s%s/%s%s %s" % (ud.basecmd, " ".join(options), proto, transportuser, svnroot, ud.module, suffix, ud.path_spec) elif command == "update": svncmd = "%s update %s" % (ud.basecmd, " ".join(options)) else: @@ -149,7 +154,7 @@ class Svn(FetchMethod): os.chdir(ud.pkgdir) # tar them up to a defined filename - runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, ud.module), d, cleanup = [ud.localpath]) + runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, ud.path_spec), d, cleanup = [ud.localpath]) def clean(self, ud, d): """ Clean SVN specific files and dirs """ |