diff --git a/run_sdk_container b/run_sdk_container index f394b026ec..61b27662ab 100755 --- a/run_sdk_container +++ b/run_sdk_container @@ -103,6 +103,8 @@ if [ -z "$stat" ] ; then docker create $tty -i \ -v /dev:/dev \ -v "$(pwd)/sdk_container:/mnt/host/source/" \ + -v "$(pwd)/sdk_container/git-override/.git-coreos-overlay:/mnt/host/source/src/third_party/coreos-overlay/.git" \ + -v "$(pwd)/sdk_container/git-override/.git-portage-stable:/mnt/host/source/src/third_party/portage-stable/.git" \ -v "$(pwd)/__build__/images:/mnt/host/source/src/build" \ -v "$(pwd):/mnt/host/source/src/scripts" \ $gpg_volumes \ diff --git a/sdk_container/git-override/.git-coreos-overlay b/sdk_container/git-override/.git-coreos-overlay new file mode 100644 index 0000000000..507e22fe6e --- /dev/null +++ b/sdk_container/git-override/.git-coreos-overlay @@ -0,0 +1 @@ +gitdir: ../../scripts/.git/modules/sdk_container/src/third_party/coreos-overlay diff --git a/sdk_container/git-override/.git-portage-stable b/sdk_container/git-override/.git-portage-stable new file mode 100644 index 0000000000..b3af445704 --- /dev/null +++ b/sdk_container/git-override/.git-portage-stable @@ -0,0 +1 @@ +gitdir: ../../scripts/.git/modules/sdk_container/src/third_party/portage-stable diff --git a/sdk_container/git-override/README.md b/sdk_container/git-override/README.md new file mode 100644 index 0000000000..d3c2dcf51c --- /dev/null +++ b/sdk_container/git-override/README.md @@ -0,0 +1,5 @@ +# GIT overrides for submodules + +In the SDK container, the scripts root is at a different relative path to the submodules. +The overrides in this directory are into coreos-overlay/.git and portage-stable.gitso the submodules find itheir parents. +