buildsys: more make job safety fixes

[lxcfs.git] / Makefile

diff --git a/Makefile b/Makefile
index b5b9a90474a70a8bcb471f2b6a56b73b8d421d01..14eae6aa895a7af94ae1fa9dc5e55ff90378a045 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=4.1
+RELEASE=4.4
 
 PACKAGE=lxcfs
-PKGVER=0.13
-DEBREL=pve2
+PKGVER=2.0.6
+DEBREL=pve1
 
 SRCDIR=${PACKAGE}
 SRCTAR=${SRCDIR}.tgz
@@ -10,34 +10,40 @@ SRCTAR=${SRCDIR}.tgz
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
-DEB=${PACKAGE}_${PKGVER}-${DEBREL}_amd64.deb
+DEB1=${PACKAGE}_${PKGVER}-${DEBREL}_${ARCH}.deb
+DEB2=${PACKAGE}-dbg_${PKGVER}-${DEBREL}_${ARCH}.deb
+DEBS=$(DEB1) $(DEB2)
 
 all: ${DEB}
 
-deb ${DEB}: ${SRCTAR}
+.PHONY: deb
+deb: $(DEBS)
+$(DEB2): $(DEB1)
+$(DEB1): $(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}
+       #lintian $(DEB)
 
 
 .PHONY: download
 download ${SRCTAR}:
        rm -rf ${SRCDIR} ${SRCTAR}
-       git clone git://github.com/lxc/lxcfs
+       git clone --depth=1 -b lxcfs-${PKGVER} git://github.com/lxc/lxcfs
        tar czf ${SRCTAR}.tmp ${SRCDIR}
        mv ${SRCTAR}.tmp ${SRCTAR}
 
 .PHONY: upload
-upload: ${DEB}
+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}-dbg_*.deb
        rm -f /pve/${RELEASE}/extra/Packages*
-       cp ${DEB} /pve/${RELEASE}/extra
+       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
 
@@ -49,5 +55,5 @@ clean:
        find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall
-dinstall: ${DEB}
-       dpkg -i ${DEB}
+dinstall: $(DEBS)
+       dpkg -i $(DEBS)