bump version to 6.0.0-1

[lxc.git] / Makefile

diff --git a/Makefile b/Makefile
index 71e6acbea59d4a128c634f3b0fc402aca16f9390..f0174b23b9f5b22d5321f2f53e7dec22e78781d5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,58 +1,67 @@
-RELEASE=4.1
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
 
 PACKAGE=lxc-pve
-LXCVER=2.0.3
-DEBREL=2
 
 SRCDIR=lxc
-SRCTAR=${SRCDIR}.tgz
+BUILDSRC := $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
+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
+ORIG_SRC_TAR=$(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
 
-DEBS=                                  \
-${PACKAGE}_${LXCVER}-${DEBREL}_amd64.deb                       \
-${PACKAGE}-dev_${LXCVER}-${DEBREL}_amd64.deb                   \
-${PACKAGE}-dbg_${LXCVER}-${DEBREL}_amd64.deb
+all: $(DEBS)
+       echo $(DEBS)
 
-all: ${DEBS}
-       echo ${DEBS}
+.PHONY: submodule
+submodule:
+       test -f "$(SRCDIR)/debian/changelog" || git submodule update --init
 
-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}
+$(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)
+$(DEB2): $(DEB1)
+$(DEB1): $(BUILDSRC)
+       rm -f *.deb
+       cd $(BUILDSRC); dpkg-buildpackage -b -us -uc
+       lintian $(DEBS)
 
-.PHONY: download
-download ${SRCTAR}:
-       rm -rf ${SRCDIR} ${SRCTAR}
-       git clone -b stable-2.0 git://github.com/lxc/lxc
-       tar czf ${SRCTAR}.tmp ${SRCDIR}
-       mv ${SRCTAR}.tmp ${SRCTAR}
+$(ORIG_SRC_TAR): $(BUILDSRC)
+       tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDSRC)/debian" $(BUILDSRC)
+
+.PHONY: dsc
+dsc: $(DSC)
+$(DSC): $(ORIG_SRC_TAR)
+       rm -f *.dsc
+       cd $(BUILDSRC); dpkg-buildpackage -S -us -uc -d
+       lintian $(DSC)
+
+sbuild: $(DSC)
+       sbuild $(DSC)
 
 .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
+upload: $(DEBS)
+       tar cf - $(DEBS) | ssh repoman@repo.proxmox.com upload --product pve --dist bookworm
 
 distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf ${SRCDIR} ${SRCDIR}.tmp *_${ARCH}.deb *.changes *.dsc 
-       find . -name '*~' -exec rm {} ';'
+       rm -rf $(BUILDSRC) $(PACKAGE)-[0-9]*/ $(ORIG_SRC_TAR) *.deb *.dsc $(PACKAGE)*.debian.tar.[gx]z *.changes *.dsc *.buildinfo *.build
 
 .PHONY: dinstall
-dinstall: ${DEBS}
-       dpkg -i ${DEBS}
+dinstall: $(DEBS)
+       dpkg -i $(DEBS)