diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | 3rdparty/libhwbase | 0 | ||||
| -rw-r--r-- | Makefile.inc | 23 |
3 files changed, 18 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index ad6b899c4e..c545ccdef4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,3 +15,6 @@ [submodule "3rdparty/chromeec"] path = 3rdparty/chromeec url = ../chrome-ec.git +[submodule "libhwbase"] + path = 3rdparty/libhwbase + url = ../libhwbase.git diff --git a/3rdparty/libhwbase b/3rdparty/libhwbase new file mode 160000 +Subproject 5e9b1b50e7ac90f68ca2ea798ef656ac863c285 diff --git a/Makefile.inc b/Makefile.inc index db4cdee943..666baaab36 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -567,14 +567,21 @@ gitconfig: chmod +x .git/hooks/$$hook; \ fi; \ done - # Now set up thehooks for 3rdparty/blobs - if [ -d .git/modules/3rdparty/blobs/hooks -a \ - \( util/gitconfig/commit-msg -nt .git/modules/3rdparty/blobs/hooks/commit-msg -o \ - ! -x .git/modules/3rdparty/blobs/hooks/commit-msg \) ]; then \ - sed -e "s,%MAKE%,$(MAKE),g" util/gitconfig/commit-msg > .git/modules/3rdparty/blobs/hooks/commit-msg; \ - chmod +x .git/modules/3rdparty/blobs/hooks/commit-msg; \ - fi - [ -d 3rdparty/blobs ] && cd 3rdparty/blobs && git config remote.origin.push HEAD:refs/for/master + # Now set up thehooks for 3rdparty/ + for hooks in .git/modules/{3rdparty/blobs,libhwbase}/hooks; do \ + if [ -d $$hooks -a \ + \( util/gitconfig/commit-msg -nt $$hooks/commit-msg -o \ + ! -x $$hooks/commit-msg \) ]; then \ + sed -e "s,%MAKE%,$(MAKE),g" util/gitconfig/commit-msg > $$hooks/commit-msg; \ + chmod +x $$hooks/commit-msg; \ + fi \ + done + for d in 3rdparty/{blobs,libhwbase}; do \ + if [ -d $$d ]; then \ + (cd $$d; \ + git config remote.origin.push HEAD:refs/for/master); \ + fi; \ + done git config remote.origin.push HEAD:refs/for/master git config alias.sup '!git submodule update --remote --rebase && git submodule update --init --checkout' git config alias.sup-destroy '!git submodule deinit --force "$$(git rev-parse --show-toplevel)"; git submodule init && git submodule update --checkout' |