diff options
author | Andrew Cady <d@jerkface.net> | 2019-10-06 18:24:11 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2019-10-06 20:57:52 -0400 |
commit | 726968c22c2e5746258a0b7930f4946c7b896fe0 (patch) | |
tree | a7a1ec6da0c679d2f8c761e6058f01310cd8ea59 | |
parent | 9edda48c7263f2f02d289267be2ae750a6909214 (diff) |
allow using alternative rootfs image via rootfs= parameter
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | rootfs/Makefile | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -70,10 +70,12 @@ rootfs: | |||
70 | [ -e install-stamp ] || sudo make install-stamp | 70 | [ -e install-stamp ] || sudo make install-stamp |
71 | $(MAKE) -C rootfs | 71 | $(MAKE) -C rootfs |
72 | sudo mkdir -p /srv/nbd | 72 | sudo mkdir -p /srv/nbd |
73 | sudo ln -sf "$$PWD"/rootfs/samizdat.btrfs /srv/nbd/samizdat.btrfs | 73 | sudo ln -sf "$$PWD"/rootfs/$(rootfs).btrfs /srv/nbd/samizdat.btrfs |
74 | |||
75 | rootfs = samizdat | ||
74 | 76 | ||
75 | define get_kernel_version | 77 | define get_kernel_version |
76 | egrep '^ii linux-image-(amd64|686)' rootfs/_build/samizdat.pkgs.txt | \ | 78 | egrep '^ii linux-image-(amd64|686)' rootfs/_build/$(rootfs).pkgs.txt | \ |
77 | (read _ pkg ver _; apt-cache show $$pkg=$$ver) | \ | 79 | (read _ pkg ver _; apt-cache show $$pkg=$$ver) | \ |
78 | grep Depends | \ | 80 | grep Depends | \ |
79 | (read _ a; echo $${a#linux-image-}) | 81 | (read _ a; echo $${a#linux-image-}) |
diff --git a/rootfs/Makefile b/rootfs/Makefile index 8ddebcf..9bb30a0 100644 --- a/rootfs/Makefile +++ b/rootfs/Makefile | |||
@@ -1,5 +1,7 @@ | |||
1 | fsmgr := $(shell which fsmgr) | 1 | fsmgr := $(shell which fsmgr) |
2 | sudo := $(shell [ "$$(id -u)" = 0 ] || echo sudo) | 2 | sudo := $(shell [ "$$(id -u)" = 0 ] || echo sudo) |
3 | 3 | ||
4 | rootfs = samizdat | ||
5 | |||
4 | all: | 6 | all: |
5 | $(sudo) $(fsmgr) build samizdat | 7 | $(sudo) $(fsmgr) build $(rootfs) |