X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=20c2e4004c2ac2dc483d369c9da65af117ccc4b8;hb=5c8b444abdf75bfc9eb9893a7e9f6237c95ac337;hp=c959b960ebd34398874c18a984a858fb43a52e80;hpb=63e8653c326c7e3888db009c06ae7624159694e8;p=lxc.git

diff --git a/Makefile b/Makefile
index c959b96..20c2e40 100644
--- a/Makefile
+++ b/Makefile
@@ -1,57 +1,60 @@
-RELEASE=4.0
-
 PACKAGE=lxc-pve
-LXCVER=1.1.4
-DEBREL=1
+LXCVER=3.0.0
+DEBREL=2
 
 SRCDIR=lxc
-SRCTAR=${SRCDIR}.tgz
+BUILDSRC := $(SRCDIR).tmp
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
 
-DEBS=					\
-${PACKAGE}_${LXCVER}-${DEBREL}_amd64.deb  			\
-${PACKAGE}-dev_${LXCVER}-${DEBREL}_amd64.deb  			\
-${PACKAGE}-dbg_${LXCVER}-${DEBREL}_amd64.deb
+DEB1=${PACKAGE}_${LXCVER}-${DEBREL}_${ARCH}.deb
+DEB2=${PACKAGE}-dev_${LXCVER}-${DEBREL}_${ARCH}.deb \
+     ${PACKAGE}-dbgsym_${LXCVER}-${DEBREL}_${ARCH}.deb
+DEBS=$(DEB1) $(DEB2)
 
 all: ${DEBS}
 	echo ${DEBS}
 
-deb ${DEBS}: ${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 stable-1.1 git://github.com/lxc/lxc
-	tar czf ${SRCTAR}.tmp ${SRCDIR}
-	mv ${SRCTAR}.tmp ${SRCTAR}
+.PHONY: submodule
+submodule:
+	test -f "${SRCDIR}/debian/changelog" || git submodule update --init
+
+.PHONY: deb
+deb: ${DEBS}
+$(DEB2): $(DEB1)
+$(DEB1): | submodule
+	rm -f *.deb
+	rm -rf $(BUILDSRC)
+	mkdir $(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 $(GITVERSION)" > $(BUILDSRC)/debian/SOURCE
+	cd $(BUILDSRC); dpkg-buildpackage -rfakeroot -b -us -uc
+	lintian $(DEBS)
+
+.PHONY: update-template-configs
+update-template-configs:
+	test -d lxc-templates || git clone https://github.com/lxc/lxc-templates lxc-templates
+	cd lxc-templates && git pull
+	rm -rf config
+	cp -R lxc-templates/config config
+	rm -f config/*.am config/*.m4
+	git add config
 
 .PHONY: upload
 upload: ${DEBS}
-	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/${PACKAGE}-dev_*.deb
-	rm -f /pve/${RELEASE}/extra/${PACKAGE}-dbg_*.deb
-	rm -f /pve/${RELEASE}/extra/Packages*
-	cp ${DEBS} /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
+	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 *.changes *.dsc *.buildinfo
 
 .PHONY: dinstall
 dinstall: ${DEBS}