summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2021-03-13 15:02:29 -0500
committerAndrew Cady <d@jerkface.net>2021-03-13 15:02:29 -0500
commita2645185d49edbdeb1d0a44a26cc69d43232b2fe (patch)
tree9181ed3b3f2d89fd2e18429689fef526357f51e2
parentf902b9688ca7ec3b1590faca68567cbd12e44e6c (diff)
bump version. drop internal builds of libfido2 and dh-runit. depend on sid. drop gtk support.HEADmaster
-rw-r--r--.gitignore1
-rw-r--r--Makefile53
m---------dh-runit0
m---------libfido20
4 files changed, 11 insertions, 43 deletions
diff --git a/.gitignore b/.gitignore
index bd6235b5c..c8faa0cb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@ debian/openssh-sftp-server/DEBIAN/md5sums
49debian/openssh-sftp-server/usr/share/doc/openssh-sftp-server 49debian/openssh-sftp-server/usr/share/doc/openssh-sftp-server
50debian/openssh-sftp-server/usr/share/man/man8/sftp-server.8.gz 50debian/openssh-sftp-server/usr/share/man/man8/sftp-server.8.gz
51install-stamp 51install-stamp
52install-deps-stamp
diff --git a/Makefile b/Makefile
index 292fed9e4..69ccb1bb9 100644
--- a/Makefile
+++ b/Makefile
@@ -5,66 +5,33 @@ endef
5arch := $(shell dpkg-architecture -q DEB_HOST_ARCH) 5arch := $(shell dpkg-architecture -q DEB_HOST_ARCH)
6version := $(shell $(call get_package_version, .)) 6version := $(shell $(call get_package_version, .))
7 7
8fido_version := $(shell $(call get_package_version, libfido2))
9dh_runit_version := $(shell $(call get_package_version, dh-runit))
10# fido_version = 1.4.0-2
11# dh_runit_version = 2.8.11
12
13packages = openssh-client openssh-server openssh-sftp-server 8packages = openssh-client openssh-server openssh-sftp-server
14 9
15package_files = $(addsuffix _$(version)_$(arch).deb,$(addprefix ../,$(packages))) 10package_files = $(addsuffix _$(version)_$(arch).deb,$(addprefix ../,$(packages)))
16 11
17fido_package_files = \
18 fido2-tools_$(fido_version)_$(arch).deb \
19 fido2-tools-dbgsym_$(fido_version)_$(arch).deb \
20 libfido2-1_$(fido_version)_$(arch).deb \
21 libfido2-1-dbgsym_$(fido_version)_$(arch).deb \
22 libfido2-dev_$(fido_version)_$(arch).deb \
23 libfido2-doc_$(fido_version)_all.deb
24
25dh_runit_package_files = \
26 dh-runit_$(dh_runit_version)_all.deb \
27 runit-helper_$(dh_runit_version)_all.deb
28
29committed_build_products = config.guess config.h.in config.sub configure aclocal.m4 12committed_build_products = config.guess config.h.in config.sub configure aclocal.m4
30 13
31.DEFAULT_GOAL = build-stamp 14.DEFAULT_GOAL = build-stamp
32 15
33gitignore: 16gitignore:
34 git checkout $(committed_build_products) 17 git checkout $(committed_build_products)
18 rm -f debian/autoreconf.after debian/autoreconf.before
35 19
36build-stamp: libfido2/install-stamp dh-runit/install-stamp 20SID_TOOL = apt -o Debug::pkgProblemResolver=yes --no-install-recommends -t sid
37
38BB_TOOL = apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -t buster-backports
39 21
40build-stamp: pkgs=$(package_files) 22build-stamp: pkgs=$(package_files)
41libfido2/build-stamp: pkgs=$(fido_package_files)
42libfido2/build-stamp: mbd_tool="-t $(BB_TOOL)"
43dh-runit/build-stamp: pkgs=$(dh_runit_package_files)
44
45build-stamp libfido2/build-stamp dh-runit/build-stamp:
46 cd $(dir $@) && mk-build-deps $(mbd_tool) ./debian/control --install --root-cmd sudo --remove || true
47 cd $(dir $@) && dpkg-buildpackage -us -uc -nc
48 for pkg in $(pkgs); do [ -e "$$pkg" ] || exit; done
49 touch $@
50 23
51$(package_files): build-stamp 24install-deps-stamp:
52$(fido_package_files): libfido2/build-stamp 25 DEB_BUILD_PROFILES=pkg.openssh.nognome mk-build-deps --tool="$(SID_TOOL)" ./debian/control --install --root-cmd sudo --remove || true
53$(dh_runit_package_files): dh-runit/build-stamp 26 touch $@
54 27
55install: libfido2/install-stamp dh-runit/install-stamp install-stamp 28build-stamp: install-deps-stamp
29 DEB_BUILD_PROFILES=pkg.openssh.nognome dpkg-buildpackage -us -uc -nc
56 30
57libfido2/install-stamp: dh-runit/install-stamp libfido2/build-stamp 31$(package_files): build-stamp
58 sudo dpkg -i \
59 libfido2-1_$(fido_version)_$(arch).deb \
60 libfido2-dev_$(fido_version)_$(arch).deb
61 touch $@
62 32
63dh-runit/install-stamp: dh-runit/build-stamp 33build-stamp:
64 sudo dpkg -i \ 34install: build-stamp install-stamp
65 dh-runit_$(dh_runit_version)_all.deb \
66 runit-helper_$(dh_runit_version)_all.deb
67 touch $@
68 35
69install-stamp: $(package_files) 36install-stamp: $(package_files)
70 sudo dpkg -i $(package_files) 37 sudo dpkg -i $(package_files)
diff --git a/dh-runit b/dh-runit
deleted file mode 160000
Subproject 1e70c78bb3a793ff2d5fc2f89f139dc46502e8e
diff --git a/libfido2 b/libfido2
deleted file mode 160000
Subproject 5f90f3751072c849a242a3633a2ce893794e960