Merge branch 'r3-templates' of github.com:nrgaway/core-agent-linux into r3-templates

Conflicts:
	debian/rules
This commit is contained in:
Jason Mehring 2015-02-11 08:06:45 -05:00
commit 6e3be531c5
No known key found for this signature in database
GPG Key ID: 1BB9B1FB5A4C6DAD
2 changed files with 5 additions and 0 deletions

View File

@ -191,6 +191,10 @@ install-common:
install -d $(DESTDIR)/home_volatile/user install -d $(DESTDIR)/home_volatile/user
install -d $(DESTDIR)/rw install -d $(DESTDIR)/rw
# Create a quilt orig package so we can build xen in Debian
dist:
tar cvfz "../qubes-core-agent_$(VERSION).orig.tar.gz" --exclude-vcs --exclude=debian .
install-deb: install-deb:
mkdir -p $(DESTDIR)/etc/apt/sources.list.d mkdir -p $(DESTDIR)/etc/apt/sources.list.d
sed -e "s/@DIST@/`lsb_release -cs`/" misc/qubes-r3.list.in > $(DESTDIR)/etc/apt/sources.list.d/qubes-r3.list sed -e "s/@DIST@/`lsb_release -cs`/" misc/qubes-r3.list.in > $(DESTDIR)/etc/apt/sources.list.d/qubes-r3.list

1
debian/patches/series vendored Normal file
View File

@ -0,0 +1 @@
qrexec_disable_all_warnings_as_errors.patch