X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=2829539594829afaa6075c200e4c8448bb97a686;hb=ddbddff76659270935d3aa4e0a8d115dc637a787;hp=dc15a87aaf2ee77d87866f95b4c57413ff914737;hpb=d8c0a1213b82ccfdf7915e94d0d5515232d88976;p=pve-manager.git

diff --git a/Makefile b/Makefile
index dc15a87a..28295395 100644
--- a/Makefile
+++ b/Makefile
@@ -1,112 +1,77 @@
+include /usr/share/dpkg/default.mk
 include defines.mk
 
-DESTDIR=
-
-#SUBDIRS = bin lib www aplinfo
-SUBDIRS = aplinfo PVE bin www po
-
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
-
-DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
-
-all: ${SUBDIRS}
-
-check:
-	${MAKE} -C bin/test check
-
-%:
-	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+export PVERELEASE = $(shell echo $(DEB_VERSION_UPSTREAM) | cut -d. -f1-2)
+export VERSION = $(DEB_VERSION_UPSTREAM_REVISION)
 
-pve-repo-ca-certificates.crt:
-	rm -rf ca-tmp
-	mkdir ca-tmp
-	cd ca-tmp; wget http://aia.startssl.com/certs/sub.class1.server.ca.pem
-	cd ca-tmp; wget http://aia.startssl.com/certs/ca.pem
-	cd ca-tmp; cat *.pem >../$@
+BUILDDIR = $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
-.PHONY: dinstall
-dinstall: ${DEB}
-	dpkg -i ${DEB}
-
-country.dat: country.pl
-	./country.pl > country.dat
+DSC=$(PACKAGE)_$(DEB_VERSION).dsc
+DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
 
-.PHONY: ${DEB}
-${DEB} deb:
-	make clean
-	rm -rf dest
-	mkdir dest
-	make DESTDIR=`pwd`/dest install
-	mkdir dest/DEBIAN
-	sed -e s/@VERSION@/${VERSION}/ -e s/@PACKAGE@/${PACKAGE}/ -e s/@PACKAGERELEASE@/${PACKAGERELEASE}/ debian/control.in >dest/DEBIAN/control
-	install -m 0644 debian/conffiles dest/DEBIAN
-	install -m 0755 debian/config dest/DEBIAN
-	install -m 0644 debian/templates dest/DEBIAN
-	install -m 0755 debian/postinst dest/DEBIAN
-	install -m 0755 debian/prerm dest/DEBIAN
-	install -m 0755 debian/postrm dest/DEBIAN
-	install -m 0644 debian/triggers dest/DEBIAN
-	echo "git clone git://git.proxmox.com/git/pve-manager.git\\ngit checkout ${GITVERSION}" >  dest/usr/share/doc/${PACKAGE}/SOURCE
-	gzip --best dest/usr/share/man/*/*
-	gzip --best dest/usr/share/doc/${PACKAGE}/changelog.Debian
-	dpkg-deb --build dest
-	mv dest.deb ${DEB}
-	rm -rf dest
-	# supress lintian error: statically-linked-binary usr/bin/pvemailforward
-	lintian -X binaries ${DEB}	
+DESTDIR=
+SUBDIRS = aplinfo PVE bin www services configs network-hooks test
+
+all: $(SUBDIRS)
+	set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i; done
+
+.PHONY: check
+check: bin test www
+	$(MAKE) -C bin check
+	$(MAKE) -C test check
+	$(MAKE) -C www check
+
+GITVERSION:=$(shell git rev-parse --short=16 HEAD)
+$(BUILDDIR):
+	rm -rf $@ $@.tmp
+	mkdir $@.tmp
+	rsync -a * $@.tmp
+	echo "git clone git://git.proxmox.com/git/pve-manager.git\\ngit checkout $(GITVERSION)" >  $@.tmp/debian/SOURCE
+	echo "REPOID_GENERATED=$(GITVERSION)" > $@.tmp/debian/rules.env
+	mv $@.tmp $@
+
+.PHONY: deb dsc
+deb: $(DEB)
+$(DEB): $(BUILDDIR)
+	cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
+	lintian $(DEB)
+
+dsc:
+	rm -rf $(BUILDDIR) $(DSC)
+	$(MAKE) $(DSC)
+	lintian $(DSC)
+$(DSC): $(BUILDDIR)
+	cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
+
+sbuild: $(DSC)
+	sbuild $<
 
 .PHONY: upload
-upload: ${DEB} check
-	./repoid.pl .git check
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-	mkdir -p /pve/${RELEASE}/extra
-	rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-	rm -f /pve/${RELEASE}/extra/Packages*
-	cp ${DEB} /pve/${RELEASE}/extra
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
-
-#.PHONY: poupload
-#poupload:
-#	rsync po/*.po po/pve-manager.pot pve.proxmox.com:/home/ftp/sources/po-files/
-
-.PHONY: aplupload
-aplupload:
-	./aplinfo/apltest.pl
-	gpg -bas -u support@proxmox.com aplinfo/aplinfo.dat
-	gzip -c aplinfo/aplinfo.dat > aplinfo.dat.gz
-	scp aplinfo/aplinfo.dat aplinfo.dat.gz aplinfo/aplinfo.dat.asc download1.proxmox.com:/home/ftp/appliances/
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
+upload: $(DEB)
+	tar cf - $(DEB) | ssh -X repoman@repo.proxmox.com upload --product pve --dist $(UPLOAD_DIST)
 
 .PHONY: install
-install: country.dat vznet.conf vzdump.conf vzdump-hook-script.pl pve-apt.conf pve-repo-ca-certificates.crt
-	install -d -m 0700 -o www-data -g www-data ${DESTDIR}/var/log/pveproxy
-	install -D -m 0644 debian/pve.logrotate ${DESTDIR}/etc/logrotate.d/pve
-	install -d ${DESTDIR}/usr/share/${PACKAGE}
-	install -d ${DESTDIR}/usr/share/man/man1
-	install -d ${DOCDIR}/examples
-	install -d ${DESTDIR}/var/lib/${PACKAGE}
-	install -d ${DESTDIR}/var/lib/vz/images
-	install -d ${DESTDIR}/var/lib/vz/template/cache
-	install -d ${DESTDIR}/var/lib/vz/template/iso
-	install -d ${DESTDIR}/var/lib/vz/template/qemu
-	install -D -m 0644 pve-apt.conf ${DESTDIR}/etc/apt/apt.conf.d/75pveconf
-	install -D -m 0644 pve-sources.list ${DESTDIR}/etc/apt/sources.list.d/pve-enterprise.list
-	install -D -m 0644 pve-repo-ca-certificates.crt ${DESTDIR}/etc/apt/pve-repo-ca-certificates.crt
-	install -D -m 0644 vzdump.conf ${DESTDIR}/etc/vzdump.conf
-	install -D -m 0755 vznet.conf ${DESTDIR}/etc/vz/vznet.conf
-	install -m 0644 vzdump-hook-script.pl ${DOCDIR}/examples/vzdump-hook-script.pl
-	install -m 0644 copyright ${DOCDIR}
-	install -m 0644 debian/changelog.Debian ${DOCDIR}
-	install -m 0644 country.dat ${DESTDIR}/usr/share/${PACKAGE}
-	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+install: vzdump-hook-script.pl
+	install -d -m 0700 -o www-data -g www-data $(DESTDIR)/var/log/pveproxy
+	install -d $(DOCDIR)/examples
+	install -d $(DESTDIR)/var/lib/$(PACKAGE)
+	install -d $(DESTDIR)/var/lib/vz/images
+	install -d $(DESTDIR)/var/lib/vz/template/cache
+	install -d $(DESTDIR)/var/lib/vz/template/iso
+	install -m 0644 vzdump-hook-script.pl $(DOCDIR)/examples/vzdump-hook-script.pl
+	install -m 0644 spice-example-sh $(DOCDIR)/examples/spice-example-sh
+	set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 
 .PHONY: distclean
 distclean: clean
-	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
 
 .PHONY: clean
 clean:
-	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
-	find . -name '*~' -exec rm {} ';'
-	rm -rf dest country.dat *.deb ca-tmp
+	set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
+	rm -f $(PACKAGE)*.tar* country.dat *.deb *.dsc *.build *.buildinfo *.changes
+	rm -rf dest $(PACKAGE)-[0-9]*/
+
+.PHONY: dinstall
+dinstall: $(DEB)
+	dpkg -i $(DEB)