summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-11-02 14:35:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-07 14:05:35 (GMT)
commitfd471a13371ef82b50db5a80fc624264edb8b9c2 (patch)
tree6b75e3fbbe302d44937ab8be5b339e706230a438 /scripts/combo-layer
parent2293acaa7fb40fd5aad8a0e5deda6bc1097067b9 (diff)
downloadpoky-fd471a13371ef82b50db5a80fc624264edb8b9c2.tar.gz
scripts/combo-layer: make init set up initial component data
The "init" subcommand will now copy the current state of each component repository into the combo layer repository, set last_revision for each component, and then use "git add" to set up the initial commit (but will not actually make the initial commit - that is left up to the user). Also take the opportunity to bump the version number. (From OE-Core rev: d4d491aa118b6cbe895167c62a46d883abc7b4ab) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer22
1 files changed, 20 insertions, 2 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index d6d238d..db38a95 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -26,7 +26,7 @@ import logging
26import subprocess 26import subprocess
27import ConfigParser 27import ConfigParser
28 28
29__version__ = "0.1.0" 29__version__ = "0.2.0"
30 30
31def logger_create(): 31def logger_create():
32 logger = logging.getLogger("") 32 logger = logging.getLogger("")
@@ -146,7 +146,7 @@ def runcmd(cmd,destdir=None):
146def action_init(conf, args): 146def action_init(conf, args):
147 """ 147 """
148 Clone component repositories 148 Clone component repositories
149 Check git initialised and working tree is clean 149 Check git is initialised; if not, copy initial data from component repos
150 """ 150 """
151 for name in conf.repos: 151 for name in conf.repos:
152 ldir = conf.repos[name]['local_repo_dir'] 152 ldir = conf.repos[name]['local_repo_dir']
@@ -155,6 +155,24 @@ def action_init(conf, args):
155 subprocess.check_call("git clone %s %s" % (conf.repos[name]['src_uri'], ldir), shell=True) 155 subprocess.check_call("git clone %s %s" % (conf.repos[name]['src_uri'], ldir), shell=True)
156 if not os.path.exists(".git"): 156 if not os.path.exists(".git"):
157 runcmd("git init") 157 runcmd("git init")
158 for name in conf.repos:
159 ldir = conf.repos[name]['local_repo_dir']
160 logger.info("copying data from %s..." % name)
161 dest_dir = conf.repos[name]['dest_dir']
162 if dest_dir and dest_dir != ".":
163 extract_dir = os.path.join(os.getcwd(), dest_dir)
164 os.makedirs(extract_dir)
165 else:
166 extract_dir = os.getcwd()
167 file_filter = conf.repos[name].get('file_filter',"")
168 runcmd("git archive master | tar -x -C %s %s" % (extract_dir, file_filter), ldir)
169 lastrev = runcmd("git rev-parse HEAD", ldir).strip()
170 conf.update(name, "last_revision", lastrev)
171 runcmd("git add .")
172 logger.info("Initial combo layer repository data has been created; please make any changes if desired and then use 'git commit' to make the initial commit.")
173 else:
174 logger.info("Repository already initialised, nothing to do.")
175
158 176
159def check_repo_clean(repodir): 177def check_repo_clean(repodir):
160 """ 178 """