From: Alexander Kanavin Date: Fri, 10 Feb 2023 06:42:11 +0000 (+0100) Subject: scripts/oe-setup-layers: print a note about submodules if present X-Git-Tag: 2023-04-mickledore~531 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f16c1c0229110c242f2e064d612d0d35823bf8d;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git scripts/oe-setup-layers: print a note about submodules if present Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- diff --git a/scripts/oe-setup-layers b/scripts/oe-setup-layers index d0bc9f16674..461560de9fc 100755 --- a/scripts/oe-setup-layers +++ b/scripts/oe-setup-layers @@ -46,6 +46,9 @@ def _is_layer_at_remote_uri(layerdir, remote, uri): pass return False +def _contains_submodules(layerdir): + return os.path.exists(os.path.join(layerdir,".gitmodules")) + def _do_checkout(args, json): layers = json['sources'] for l_name in layers: @@ -90,6 +93,9 @@ def _do_checkout(args, json): print("Running '{}' in {}".format(cmd, layerdir)) subprocess.check_output(cmd, shell=True, cwd=layerdir) + if _contains_submodules(layerdir): + print("Repo {} contains submodules, use 'git submodule update' to ensure they are up to date".format(layerdir)) + parser = argparse.ArgumentParser(description="A self contained python script that fetches all the needed layers and sets them to correct revisions using data in a json format from a separate file. The json data can be created from an active build directory with 'bitbake-layers create-layers-setup destdir' and there's a sample file and a schema in meta/files/") parser.add_argument('--force-bootstraplayer-checkout', action='store_true',