Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Ubuntu template builds

Browse Source 
4.0 template builds use `<package>.install` files with dh_install.  The
differences between Debian and Ubuntu packages also need to be represented
in these files.
This commit is contained in:
Paul Holcomb 2017-11-14 00:04:40 -06:00
parent 28be709238
commit 80b5c94206
No known key found for this signature in database
GPG Key ID: B8951DF9DFAA4CD0
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
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

5
Makefile.builder
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