buildsys: remove fakeroot from dpkg-buildpackage

[openvswitch.git] / Makefile

diff --git a/Makefile b/Makefile
index 97cdb2ab88b39a2327570f3cb1ceda967f9ec3b2..717b0b3578107bc7c2d54024aa245af91335488f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=4.0
+RELEASE=4.3
 
 # also add entry in changelog.Debian
-OVSVER=2.3.2
-PKGRELEASE=3
+OVSVER=2.6.0
+PKGRELEASE=2
 
 OVSDIR=openvswitch-${OVSVER}
 OVSSRC=openvswitch-${OVSVER}.tar.gz
@@ -17,7 +17,8 @@ DEBS=                                                         \
 all: ${DEBS}
        echo ${DEBS}
 
-
+.PHONY: deb
+deb: ${DEBS}
 ${DEBS}: ${OVSSRC}
        rm -rf ${OVSDIR}
        tar xf ${OVSSRC}
@@ -28,33 +29,25 @@ ${DEBS}: ${OVSSRC}
        echo "git clone git://git.proxmox.com/git/openvswitch.git\\ngit checkout ${GITVERSION}" > ${OVSDIR}/debian/SOURCE
        echo "debian/SOURCE" >> ${OVSDIR}/debian/openvswitch-common.docs
        echo "debian/SOURCE" >> ${OVSDIR}/debian/openvswitch-switch.docs
-       cd ${OVSDIR}; dpkg-buildpackage -b -rfakeroot -us -uc   
+       cd ${OVSDIR}; dpkg-buildpackage -b -jauto -us -uc
 
 .PHONY: download
 ${OVSSRC} download:
-       wget http://openvswitch.org/releases/${OVSSRC}
-       #rm -rf ${OVSDIR} ${OVSSRC}
-       #git clone git://git.openvswitch.org/openvswitch ${OVSDIR}
-       #rm -rf ${OVSDIR}/.git
-       #tar czf ${OVSSRC}.tmp ${OVSDIR}
-       #mv ${OVSSRC}.tmp ${OVSSRC}
+       rm -rf ${OVSDIR} ${OVSSRC}
+       git clone https://github.com/openvswitch/ovs.git -b v${OVSVER} ${OVSDIR}.git
+       cd ${OVSDIR}.git; git archive --format=tar.gz -o ../${OVSSRC}.tmp v${OVSVER} --prefix=${OVSDIR}/
+       mv ${OVSSRC}.tmp ${OVSSRC}
 
 .PHONY: upload
 upload: ${DEBS}
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw
-       mkdir -p /pve/${RELEASE}/extra
-       rm -f /pve/${RELEASE}/extra/openvswitch-*.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
+       tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload
 
 .PHONY: distclean
 distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf *~ ${OVSSRC}.tmp ${OVSDIR} *.deb *.changes
+       rm -rf *~ ${OVSSRC}.tmp ${OVSDIR} *.deb *.changes ${OVSDIR}.git
 
 .PHONY: dinstall
 dinstall: ${DEBS}