X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=e6feb98fc9a6798a66c0bbe62c062e91bdd3f987;hb=2c4104dacd13fbdf5b7fb8a7ee28753b393676e0;hp=842d2455a3cb3e84a10bce45b242e8a890015224;hpb=a2238c134430973ebf6e8cf6af82c5c59186f5e7;p=lxc.git

diff --git a/Makefile b/Makefile
index 842d245..e6feb98 100644
--- a/Makefile
+++ b/Makefile
@@ -1,53 +1,62 @@
-RELEASE=4.4
-
 PACKAGE=lxc-pve
-LXCVER=2.0.7
+LXCVER=3.0.2+pve1
 DEBREL=3
 
 SRCDIR=lxc
-SRCTAR=${SRCDIR}.tgz
+BUILDSRC := $(PACKAGE)-$(LXCVER)
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
 
-DEB1=${PACKAGE}_${LXCVER}-${DEBREL}_${ARCH}.deb
-DEB2=${PACKAGE}-dev_${LXCVER}-${DEBREL}_${ARCH}.deb \
-     ${PACKAGE}-dbg_${LXCVER}-${DEBREL}_${ARCH}.deb
+DEB_BASE=$(PACKAGE)_$(LXCVER)-$(DEBREL)
+DEB1=$(DEB_BASE)_$(ARCH).deb
+DEB2=$(PACKAGE)-dev_$(LXCVER)-$(DEBREL)_$(ARCH).deb \
+     $(PACKAGE)-dbgsym_$(LXCVER)-$(DEBREL)_$(ARCH).deb
 DEBS=$(DEB1) $(DEB2)
-
-all: ${DEBS}
-	echo ${DEBS}
+DSC=$(DEB_BASE).dsc
+TARGZ=$(DEB_BASE).tar.gz
+
+all: $(DEBS)
+	echo $(DEBS)
+
+.PHONY: submodule
+submodule:
+	test -f "$(SRCDIR)/debian/changelog" || git submodule update --init
+
+$(BUILDSRC): lxc debian config | submodule
+	rm -rf $(BUILDSRC)
+	cp -a $(SRCDIR) $(BUILDSRC)
+	cp -a debian $(BUILDSRC)/debian
+	mkdir $(BUILDSRC)/debian/config
+	for i in config/*.conf.in; do \
+	  sed -e 's|@LXCTEMPLATECONFIG@|/usr/share/lxc/config|g' $$i > $(BUILDSRC)/debian/$${i%.in} ; \
+	done
+	echo "git clone git://git.proxmox.com/git/lxc.git\\ngit checkout $(shell git rev-parse HEAD)" > $(BUILDSRC)/debian/SOURCE
 
 .PHONY: deb
-deb: ${DEBS}
+deb: $(DEBS)
 $(DEB2): $(DEB1)
-$(DEB1): ${SRCTAR}
-	rm -rf ${SRCDIR}
-	tar xf ${SRCTAR}
-	cp -a debian ${SRCDIR}/debian
-	echo "git clone git://git.proxmox.com/git/lxc.git\\ngit checkout ${GITVERSION}" >  ${SRCDIR}/debian/SOURCE
-	cd ${SRCDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
-	lintian ${DEBS}
-
-
-.PHONY: download
-download ${SRCTAR}:
-	rm -rf ${SRCDIR} ${SRCTAR}
-	git clone -b lxc-${LXCVER} git://github.com/lxc/lxc
-	tar czf ${SRCTAR}.tmp ${SRCDIR}
-	mv ${SRCTAR}.tmp ${SRCTAR}
+$(DEB1): $(BUILDSRC)
+	rm -f *.deb
+	cd $(BUILDSRC); dpkg-buildpackage -b -us -uc
+	lintian $(DEBS)
+
+.PHONY: dsc
+dsc $(TARGZ): $(DSC)
+$(DSC): $(BUILDSRC)
+	rm -f *.dsc
+	cd $(BUILDSRC); dpkg-buildpackage -S -us -uc -d -nc
+	lintian $(DSC)
 
 .PHONY: upload
-upload: ${DEBS}
-	tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload
+upload: $(DEBS)
+	tar cf - $(DEBS) | ssh repoman@repo.proxmox.com upload --product pve --dist stretch
 
 distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf ${SRCDIR} ${SRCDIR}.tmp *_${ARCH}.deb *.changes *.dsc 
-	find . -name '*~' -exec rm {} ';'
+	rm -rf $(BUILDSRC) *_$(ARCH).deb  *_$(ARCH).dsc *.tar.gz *.changes *.dsc *.buildinfo
 
 .PHONY: dinstall
-dinstall: ${DEBS}
-	dpkg -i ${DEBS}
+dinstall: $(DEBS)
+	dpkg -i $(DEBS)