Merge remote-tracking branch 'qubesos/pr/71'

* qubesos/pr/71:
  Fix Ubuntu template builds
This commit is contained in:
Marek Marczykowski-Górecki 2017-11-14 15:07:41 +01:00
commit 589c32b1e3
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -12,6 +12,11 @@ endif
source-debian-quilt-copy-in: VERSION = $(shell cat $(ORIG_SRC)/version) source-debian-quilt-copy-in: VERSION = $(shell cat $(ORIG_SRC)/version)
source-debian-quilt-copy-in: ORIG_FILE = "$(CHROOT_DIR)/$(DIST_SRC)/../qubes-core-agent_$(VERSION).orig.tar.gz" source-debian-quilt-copy-in: ORIG_FILE = "$(CHROOT_DIR)/$(DIST_SRC)/../qubes-core-agent_$(VERSION).orig.tar.gz"
source-debian-quilt-copy-in: source-debian-quilt-copy-in:
if [ $(DISTRIBUTION) == qubuntu ] ; then \
sed -i /avahi-daemon.service.d/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install ;\
sed -i /exim4.service.d/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install ;\
sed -i /netfilter-persistent.service.d/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install ;\
fi
if [ $(DIST) == trusty ] ; then \ if [ $(DIST) == trusty ] ; then \
sed -i /locales-all/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\ sed -i /locales-all/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
fi fi