diff options
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | Makefile | 14 | ||||
m--------- | openssh | 0 |
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 | ||
@@ -50,11 +50,15 @@ endif | |||
50 | 50 | ||
51 | include user.mk | 51 | include user.mk |
52 | 52 | ||
53 | .PHONY: rootfs | 53 | SUBMODULES = fsmgr kiki openssh |
54 | rootfs: | 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 | |||
61 | rootfs: $(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 | |||