X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=cd91f8106d4ad4aa517579f601f050ae82bb2aa5;hb=4749441451ce1cc90f473741297e8db8d7f0be66;hp=928ce5029a79d0b851991b0b0685a1fe8fa4711f;hpb=ae0a8617cd30ff3021de57a8d67307b3859d8521;p=lxcfs.git

diff --git a/Makefile b/Makefile
index 928ce50..cd91f81 100644
--- a/Makefile
+++ b/Makefile
@@ -1,55 +1,45 @@
-RELEASE=4.3
-
 PACKAGE=lxcfs
-PKGVER=2.0.4
-DEBREL=pve2
+PKGVER != dpkg-parsechangelog -Sversion | cut -d- -f1
+PKGREL != dpkg-parsechangelog -Sversion | cut -d- -f2
 
 SRCDIR=${PACKAGE}
-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)
 
-DEB=${PACKAGE}_${PKGVER}-${DEBREL}_${ARCH}.deb \
-    ${PACKAGE}-dbg_${PKGVER}-${DEBREL}_${ARCH}.deb
+DEB1=${PACKAGE}_${PKGVER}-${PKGREL}_${ARCH}.deb
+DEB2=${PACKAGE}-dbgsym_${PKGVER}-${PKGREL}_${ARCH}.deb
+DEBS=$(DEB1) $(DEB2)
 
 all: ${DEB}
 
-deb ${DEB}: ${SRCTAR}
-	rm -rf ${SRCDIR}
-	tar xf ${SRCTAR}
-	cp -a debian ${SRCDIR}/debian
-	echo "git clone git://git.proxmox.com/git/lxcfs.git\\ngit checkout ${GITVERSION}" >  ${SRCDIR}/debian/SOURCE
-	echo "debian/SOURCE" >> ${SRCDIR}/debian/docs
-	cd ${SRCDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
-	#lintian ${DEB}
-
-
-.PHONY: download
-download ${SRCTAR}:
-	rm -rf ${SRCDIR} ${SRCTAR}
-	git clone --depth=1 -b lxcfs-${PKGVER} git://github.com/lxc/lxcfs
-	tar czf ${SRCTAR}.tmp ${SRCDIR}
-	mv ${SRCTAR}.tmp ${SRCTAR}
+.PHONY: submodule
+submodule:
+	test -f "${SRCDIR}/README" || git submodule update --init
+
+.PHONY: deb
+deb: $(DEBS)
+$(DEB2): $(DEB1)
+$(DEB1): | submodule
+	rm -f *.deb
+	rm -rf $(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
+	#lintian $(DEBS)
 
 .PHONY: upload
-upload: ${DEB}
-	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}-dbg_*.deb
-	rm -f /pve/${RELEASE}/extra/Packages*
-	cp ${DEB} /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 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: ${DEB}
-	dpkg -i ${DEB}
+dinstall: $(DEBS)
+	dpkg -i $(DEBS)