fixup

[lxc.git] / Makefile

diff --git a/Makefile b/Makefile
index 859d27a1a7e01c4f6f9dcdc7de96e5c46ec278be..5f44c7b3b686c6253aa4e922da32f4c14e059c90 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,57 +1,61 @@
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
+
 PACKAGE=lxc-pve
-LXCVER=3.0.0
-DEBREL=1
 
 SRCDIR=lxc
-BUILDSRC := $(SRCDIR).tmp
-
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell git rev-parse HEAD)
+BUILDSRC := $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
-DEB1=${PACKAGE}_${LXCVER}-${DEBREL}_${ARCH}.deb
-DEB2=${PACKAGE}-dev_${LXCVER}-${DEBREL}_${ARCH}.deb \
-     ${PACKAGE}-dbgsym_${LXCVER}-${DEBREL}_${ARCH}.deb
+DEB_BASE=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)
+DEB1=$(DEB_BASE)_$(DEB_BUILD_ARCH).deb
+DEB2=$(PACKAGE)-dev_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb \
+     $(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
 DEBS=$(DEB1) $(DEB2)
+DSC=$(DEB_BASE).dsc
+TARGZ=$(DEB_BASE).tar.gz
 
-all: ${DEBS}
-       echo ${DEBS}
+all: $(DEBS)
+       echo $(DEBS)
 
 .PHONY: submodule
 submodule:
-       test -f "${SRCDIR}/debian/changelog" || git submodule update --init
+       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): | submodule
+$(DEB1): $(BUILDSRC)
        rm -f *.deb
-       rm -rf $(BUILDSRC)
-       mkdir $(BUILDSRC)
-       cp -a $(SRCDIR)/* $(BUILDSRC)/
-       cp -a debian $(BUILDSRC)/debian
-       echo "git clone git://git.proxmox.com/git/lxc.git\\ngit checkout $(GITVERSION)" > $(BUILDSRC)/debian/SOURCE
-       cd $(BUILDSRC); dpkg-buildpackage -rfakeroot -b -us -uc
+       cd $(BUILDSRC); dpkg-buildpackage -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: 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 --product pve --dist stretch
+upload: $(DEBS)
+       tar cf - $(DEBS) | ssh repoman@repo.proxmox.com upload --product pve --dist buster
 
 distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf $(BUILDSRC) *_${ARCH}.deb *.changes *.dsc *.buildinfo
+       rm -rf $(BUILDSRC) *.deb  *.dsc *.tar.gz *.changes *.dsc *.buildinfo
 
 .PHONY: dinstall
-dinstall: ${DEBS}
-       dpkg -i ${DEBS}
+dinstall: $(DEBS)
+       dpkg -i $(DEBS)