summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2019-10-06 18:24:11 -0400
committerAndrew Cady <d@jerkface.net>2019-10-06 20:57:52 -0400
commit726968c22c2e5746258a0b7930f4946c7b896fe0 (patch)
treea7a1ec6da0c679d2f8c761e6058f01310cd8ea59
parent9edda48c7263f2f02d289267be2ae750a6909214 (diff)
allow using alternative rootfs image via rootfs= parameter
-rw-r--r--Makefile6
-rw-r--r--rootfs/Makefile4
2 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 5596f5d..b64cab9 100644
--- a/Makefile
+++ b/Makefile
@@ -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
75rootfs = samizdat
74 76
75define get_kernel_version 77define get_kernel_version
76egrep '^ii linux-image-(amd64|686)' rootfs/_build/samizdat.pkgs.txt | \ 78egrep '^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 @@
1fsmgr := $(shell which fsmgr) 1fsmgr := $(shell which fsmgr)
2sudo := $(shell [ "$$(id -u)" = 0 ] || echo sudo) 2sudo := $(shell [ "$$(id -u)" = 0 ] || echo sudo)
3 3
4rootfs = samizdat
5
4all: 6all:
5 $(sudo) $(fsmgr) build samizdat 7 $(sudo) $(fsmgr) build $(rootfs)