summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2020-05-07 15:59:50 -0400
committerAndrew Cady <d@jerkface.net>2020-05-07 15:59:50 -0400
commitc6a2a6a6e8fd6476bc9a656934dcaded7fc56147 (patch)
tree618e2ef54d62b67f360ed99090b578c3eb13356e
parent53e15e684d3db7c4b354ec5e465b6c7cf1eb1559 (diff)
use mk-build-deps to install build deps
-rw-r--r--.gitignore2
-rw-r--r--Makefile6
-rw-r--r--build-deps.control10
-rw-r--r--build-deps.txt7
4 files changed, 14 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 7484342..384a284 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ ssh-askpass-gnome-dbgsym_7.9p1-10_amd64.deb
36ssh-askpass-gnome_7.9p1-10_amd64.deb 36ssh-askpass-gnome_7.9p1-10_amd64.deb
37ssh_7.9p1-10_all.deb 37ssh_7.9p1-10_all.deb
38rootfs/_build/ 38rootfs/_build/
39/build-dep-stamp 39/build-deps-stamp
40stack.yaml.lock 40stack.yaml.lock
41samizdat.iso 41samizdat.iso
42TEST_CHILD.*.log 42TEST_CHILD.*.log
diff --git a/Makefile b/Makefile
index f071c77..35e7e80 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,9 @@ install-stack:
19stack: 19stack:
20 @which stack >/dev/null || make install-stack 20 @which stack >/dev/null || make install-stack
21 21
22build-deps: build-dep-stamp 22build-deps: build-deps-stamp
23build-dep-stamp: build-deps.txt 23build-deps-stamp: build-deps.control
24 sudo apt-get install --no-upgrade $$(cat build-deps.txt) 24 sudo mk-build-deps --root-cmd sudo build-deps.control --install --remove
25 touch $@ 25 touch $@
26 26
27dynmenu: src/dynmenu.cpp | build-deps 27dynmenu: src/dynmenu.cpp | build-deps
diff --git a/build-deps.control b/build-deps.control
new file mode 100644
index 0000000..fc3eaeb
--- /dev/null
+++ b/build-deps.control
@@ -0,0 +1,10 @@
1Source: sami
2Build-Depends: bridge-utils,
3 build-essential,
4 devscripts,
5 libbz2-dev,
6 libncurses-dev,
7 libssl-dev,
8 parted,
9 qemu-system-x86,
10 uml-utilities
diff --git a/build-deps.txt b/build-deps.txt
deleted file mode 100644
index ca68e52..0000000
--- a/build-deps.txt
+++ /dev/null
@@ -1,7 +0,0 @@
1build-essential
2libncurses-dev
3libbz2-dev
4libssl-dev
5devscripts
6parted
7qemu-system-x86