From a746719a46e9277a118fd7d4a6342bb667034132 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 15 Jan 2013 16:59:57 -0600 Subject: [PATCH] yocto-bsp: add basic git connectivity check yocto-bsp create does a 'git ls-remote git://git.yoctoproject.org/linux-yocto-3.4.git *heads*' to get the set of existing branches from the kernel repo. If the user isn't connected to the network, or if git isn't configured sanely, yocto-bsp fails with an ugly Python backtrace. We should try to avoid this by doing a basic sanity check for those things before actually running the command. The sanity check can be avoided by specifying -s on the yocto-bsp command-line: $ yocto-bsp create -s test qemu Fixes [YOCTO #3279] (From meta-yocto rev: 496e76f9bed2ed5a04ef757724d2e63d05c7a601) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- scripts/lib/bsp/tags.py | 2 +- scripts/yocto-bsp | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/lib/bsp/tags.py b/scripts/lib/bsp/tags.py index 256b25cb04..6d5feb0a59 100644 --- a/scripts/lib/bsp/tags.py +++ b/scripts/lib/bsp/tags.py @@ -41,7 +41,7 @@ INPUT_TYPE_PROPERTY = "type" SRC_URI_FILE = "file://" - +GIT_CHECK_URI = "git://git.yoctoproject.org/linux-yocto-dev.git" diff --git a/scripts/yocto-bsp b/scripts/yocto-bsp index 126fc8dc0d..d269861769 100755 --- a/scripts/yocto-bsp +++ b/scripts/yocto-bsp @@ -58,6 +58,8 @@ def yocto_bsp_create_subcommand(args, usage_str): help = "name of file containing the values for BSP properties as a JSON file") parser.add_option("-c", "--codedump", dest = "codedump", action = "store_true", default = False, help = "dump the generated code to bspgen.out") + parser.add_option("-s", "--skip-git-check", dest = "git_check", action = "store_false", + default = True, help = "skip the git connectivity check") (options, args) = parser.parse_args(args) if len(args) != 2: @@ -73,6 +75,17 @@ def yocto_bsp_create_subcommand(args, usage_str): else: bsp_output_dir = "meta-" + machine + if options.git_check and not options.properties_file: + print "Checking basic git connectivity..." + if not verify_git_repo(GIT_CHECK_URI): + print "Couldn't verify git connectivity, exiting\n" + print "Details: couldn't access %s" % GIT_CHECK_URI + print " (this most likely indicates a network connectivity problem or" + print " a misconfigured git intallation)" + sys.exit(1) + else: + print "Done.\n" + yocto_bsp_create(machine, karch, scripts_path, bsp_output_dir, options.codedump, options.properties_file)