bump version to 3.0.0-2

[lxc.git] / Makefile

diff --git a/Makefile b/Makefile
index f052520bd3cd3ac8736687afafad4893f5825ed7..20c2e4004c2ac2dc483d369c9da65af117ccc4b8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 PACKAGE=lxc-pve
-LXCVER=2.1.1
+LXCVER=3.0.0
 DEBREL=2
 
 SRCDIR=lxc
 BUILDSRC := $(SRCDIR).tmp
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
 
 DEB1=${PACKAGE}_${LXCVER}-${DEBREL}_${ARCH}.deb
 DEB2=${PACKAGE}-dev_${LXCVER}-${DEBREL}_${ARCH}.deb \
@@ -29,10 +29,23 @@ $(DEB1): | submodule
        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}
        tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product pve --dist stretch