summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--Makefile14
m---------openssh0
3 files changed, 12 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index 65e3a9e..8c2d318 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
4[submodule "kiki"] 4[submodule "kiki"]
5 path = kiki 5 path = kiki
6 url = d@cryptonomic.net:public_git/kiki.git 6 url = d@cryptonomic.net:public_git/kiki.git
7[submodule "openssh"]
8 path = openssh
9 url = d@cryptonomic.net:public_git/openssh.git
diff --git a/Makefile b/Makefile
index 32df6da..b93941f 100644
--- a/Makefile
+++ b/Makefile
@@ -50,11 +50,15 @@ endif
50 50
51include user.mk 51include user.mk
52 52
53.PHONY: rootfs 53SUBMODULES = fsmgr kiki openssh
54rootfs: 54.PHONY: rootfs submodule $(SUBMODULES)
55 [ -e fsmgr/Makefile ] || git submodule update --init 55
56 $(MAKE) -C fsmgr 56$(SUBMODULES):
57 $(MAKE) -C fsmgr install 57 [ -e $@/Makefile ] || git submodule update --init
58 $(MAKE) -C $@
59 $(MAKE) -C $@ install
60
61rootfs: $(SUBMODULES)
58 $(MAKE) -C rootfs 62 $(MAKE) -C rootfs
59 sudo mkdir -p /srv/nbd 63 sudo mkdir -p /srv/nbd
60 sudo ln -sf "$$PWD"/rootfs/samizdat.btrfs /srv/nbd/samizdat.btrfs 64 sudo ln -sf "$$PWD"/rootfs/samizdat.btrfs /srv/nbd/samizdat.btrfs
diff --git a/openssh b/openssh
new file mode 160000
Subproject 8a34eb2de148e1e504043d4bbf98fd45b36bbc9