summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-08-19 15:07:05 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-24 01:23:34 (GMT)
commit1eb4426599ca86c77ab08c5184f6011d09aec314 (patch)
treed62827730f5bac779baedfcc5b077ae69b8eaa6b /scripts/combo-layer
parent6f5066a3a012ebc2eb82c92b6808582397e304b4 (diff)
downloadpoky-1eb4426599ca86c77ab08c5184f6011d09aec314.tar.gz
scripts/combo-layer: fix configuration file handling
(From OE-Core rev: e83017fe9e1dc89860a43d41d0480d1371539e44) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 07b3382..f8763ee 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -339,8 +339,8 @@ Action:
339 update get patches from component repos and apply them to the combo repo 339 update get patches from component repos and apply them to the combo repo
340 splitpatch [commit] generate commit patch and split per component, default commit is HEAD""") 340 splitpatch [commit] generate commit patch and split per component, default commit is HEAD""")
341 341
342 parser.add_option("-c", "--conf", help = "specify the config file. default is conf/combolayer.conf", 342 parser.add_option("-c", "--conf", help = "specify the config file (conf/combo-layer.conf is the default).",
343 action = "store", dest = "conffile", default = "combo-layer.conf") 343 action = "store", dest = "conffile", default = "conf/combo-layer.conf")
344 344
345 parser.add_option("-i", "--interactive", help = "interactive mode, user can edit the patch list and patches", 345 parser.add_option("-i", "--interactive", help = "interactive mode, user can edit the patch list and patches",
346 action = "store_true", dest = "interactive", default = False) 346 action = "store_true", dest = "interactive", default = False)