build: support for the new development/* branches

The build now detects the package maintenance model (separate packaging
and devel branches or the old single packaging branch).

Change-Id: I2e2d22a7582e1c9e70182eea6ce2c3f1f6b97ad5
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index 60ba061fec5267cf3c2fd1ed7ec33b6218cc7d89..0d776264c7d8816ce0deaa92fca59c63f975f4ef 100644 (file)
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -358,6 +358,11 @@ def main(args):
     if args.spec:
         cmd += ['--spec=%s' % args.spec]
 
+    # Determine if we're on devel branch
+    orphan_packaging = configmgr.get('packaging_branch', 'orphan-devel')
+    if orphan_packaging:
+        cmd += ['--spec-commit=%s' % orphan_packaging]
+
     log.debug("running command: %s" % ' '.join(cmd))
     retcode = os.system(' '.join(cmd))
     if retcode != 0: