build: use repoman for upload target

[openvswitch.git] / Makefile

diff --git a/Makefile b/Makefile
index 1aeffef060af185f5159f16971025085569d565e..3122a5865bf025ff14a653ee30d989a8063f29b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=3.1
+RELEASE=4.3
 
 # also add entry in changelog.Debian
-OVSVER=2.0.90
-PKGRELEASE=3
+OVSVER=2.6.0
+PKGRELEASE=1
 
 OVSDIR=openvswitch-${OVSVER}
 OVSSRC=openvswitch-${OVSVER}.tar.gz
@@ -17,8 +17,7 @@ DEBS=                                                         \
 all: ${DEBS}
        echo ${DEBS}
 
-
-${DEBS}: ${OVSSRC}
+deb ${DEBS}: ${OVSSRC}
        rm -rf ${OVSDIR}
        tar xf ${OVSSRC}
        cd  ${OVSDIR}; ln -s ../pvepatches patches
@@ -28,32 +27,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 -rfakeroot -us -uc
 
 .PHONY: download
 ${OVSSRC} download:
        rm -rf ${OVSDIR} ${OVSSRC}
-       git clone git://git.openvswitch.org/openvswitch ${OVSDIR}
-       rm -rf ${OVSDIR}/.git
-       tar czf ${OVSSRC}.tmp ${OVSDIR}
+       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}