Allow build for Xenial in 4.0

This commit is contained in:
unman 2017-11-14 01:35:36 +00:00
parent 28be709238
commit 54867b6eab
No known key found for this signature in database
GPG Key ID: FDD1B8244731B36C
2 changed files with 7 additions and 0 deletions

View File

@ -302,6 +302,8 @@ endif
ifeq ($(shell lsb_release -is), Debian) ifeq ($(shell lsb_release -is), Debian)
install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/ install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
else ifeq ($(shell lsb_release -is), Ubuntu)
install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
else else
install -m 0644 misc/py2/qubesxdg.py* $(DESTDIR)/$(PYTHON2_SITELIB)/ install -m 0644 misc/py2/qubesxdg.py* $(DESTDIR)/$(PYTHON2_SITELIB)/
endif endif

View File

@ -15,6 +15,11 @@ source-debian-quilt-copy-in:
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
if [ $(DIST) == xenial ] ; then \
sed -i /avahi-daemon.service.d/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install;\
sed -i /exim4/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install;\
sed -i /netfilter-persistent/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install;\
fi
if [ $(DIST) == zesty ] ; then \ if [ $(DIST) == zesty ] ; then \
sed -i /initscripts/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\ sed -i /initscripts/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
fi fi