From b445ebce5002f5df6aba59bbdfc250d1bcd75f77 Mon Sep 17 00:00:00 2001 From: unman Date: Tue, 23 May 2017 23:59:41 +0100 Subject: [PATCH] Enable build for Zesty --- Makefile | 2 +- Makefile.builder | 3 +++ debian/control | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 13cc271..255b664 100644 --- a/Makefile +++ b/Makefile @@ -281,7 +281,7 @@ else install -m 0644 misc/py2/xdg.py* $(DESTDIR)/$(PYTHON_SITEARCH)/qubes/ endif -ifneq (,$(filter xenial stretch, $(shell lsb_release -cs))) +ifneq (,$(filter xenial zesty stretch, $(shell lsb_release -cs))) mkdir -p $(DESTDIR)/etc/systemd/system/ install -m 0644 vm-systemd/haveged.service $(DESTDIR)/etc/systemd/system/ endif diff --git a/Makefile.builder b/Makefile.builder index 193af89..d202433 100644 --- a/Makefile.builder +++ b/Makefile.builder @@ -16,6 +16,9 @@ source-debian-quilt-copy-in: if [ $(DIST) == trusty ] ; then \ sed -i /locales-all/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\ fi + if [ $(DIST) == zesty ] ; then \ + sed -i /initscripts/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\ + fi -$(shell $(ORIG_SRC)/debian-quilt $(ORIG_SRC)/series-debian-vm.conf $(CHROOT_DIR)/$(DIST_SRC)/debian/patches) tar cfz $(ORIG_FILE) --exclude-vcs --exclude=rpm --exclude=pkgs --exclude=deb --exclude=debian -C $(CHROOT_DIR)/$(DIST_SRC) . diff --git a/debian/control b/debian/control index 7c0e3a4..4f354e5 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: qubes-core-agent Section: admin Priority: extra -Maintainer: Davíð Steinn Geirsson +Maintainer: unman Build-Depends: libqrexec-utils-dev, libqubes-rpc-filecopy-dev (>= 3.1.3),