[pve-devel] [PATCH v2 iproute2 2/2] use git submodule git.kernel.org/pub/scm/network/iproute2/iproute2.git

Alexandre Derumier aderumier at odiso.com
Mon Jun 18 19:58:55 CEST 2018


---
 Makefile                    |  40 ++++++++++++++++++++++------------------
 debian/changelog            |   6 ++++++
 debian/iproute2-doc.docs    |   6 ++----
 iproute2                    |   1 +
 iproute2-4.13.0.orig.tar.xz | Bin 670340 -> 0 bytes
 5 files changed, 31 insertions(+), 22 deletions(-)
 create mode 160000 iproute2
 delete mode 100644 iproute2-4.13.0.orig.tar.xz

diff --git a/Makefile b/Makefile
index e043d81..82e80fa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
-VERSION=4.15.0
-PKGREL=4
+PACKAGE=iproute2
+VER=4.15.0
+PKGREL=5
 
-DIR=iproute2-${VERSION}
-SRC=iproute2-${VERSION}.orig.tar.xz
+SRCDIR=iproute2
+BUILDDIR=${SRCDIR}.tmp
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
@@ -13,27 +14,30 @@ DEBS=							\
 all: ${DEBS}
 	echo ${DEBS}
 
-.PHONY: deb
-${DEBS} deb: ${SRC}
-	rm -rf ${DIR}
-	tar xf ${SRC} 
-	cp -a debian ${DIR}/debian
-	cd ${DIR}; dpkg-buildpackage -rfakeroot -b -us -uc
-
+.PHONY: submodule
+submodule:
+	test -f "${SRCDIR}/README" || git submodule update --init
 
-download:
-	rm -rf iproute2-${VERSION} $(SRC)
-	git clone -b v${VERSION} --depth=1 git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git iproute2-${VERSION}
-	tar cJf $(SRC) iproute2-${VERSION}/
+.PHONY: deb
+${DEBS} deb: | submodule
+	rm -f *.deb
+	rm -rf $(BUILDDIR)
+	mkdir $(BUILDDIR)
+	cp -a $(SRCDIR)/* $(BUILDDIR)/
+	cp -R debian $(BUILDDIR)/
+	cd ${BUILDDIR}; dpkg-buildpackage -rfakeroot -b -uc -us
 
 .PHONY: upload
 upload: ${DEBS}
 	tar cf - ${DEBS} | ssh repoman at repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: clean
 clean:
-	rm -rf *~ debian/*~ *.changes *.dsc ${DIR} *.deb *.buildinfo
+	rm -rf ${BUILDDIR} *.deb *.changes *.dsc *.buildinfo
 
 .PHONY: dinstall
-dinstall: ${DEBS}
-	dpkg -i ${DEBS}
+dinstall: deb
+	dpkg -i ${DEB}
diff --git a/debian/changelog b/debian/changelog
index 3ad30e7..fe815b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+iproute2 (4.15.0-5) unstable; urgency=medium
+
+  * use git submodule
+
+ -- Proxmox Support Team <support at proxmox.com>  Sun, 18 Jun 2018 09:00:00 +0200
+
 iproute2 (4.15.0-4) UNRELEASED; urgency=medium
 
   * Fix ss with the no-header flag, upstream bug: #895719
diff --git a/debian/iproute2-doc.docs b/debian/iproute2-doc.docs
index a3bb353..303671e 100644
--- a/debian/iproute2-doc.docs
+++ b/debian/iproute2-doc.docs
@@ -1,4 +1,2 @@
-README* doc/Plan
-debian/htb/*
-doc/*.tex doc/*.dvi doc/*.ps doc/*.sty
-doc/*.txt doc/*.html
+README*
+doc/*
diff --git a/iproute2 b/iproute2
new file mode 160000
index 0000000..50b8a84
--- /dev/null
+++ b/iproute2
@@ -0,0 +1 @@
+Subproject commit 50b8a842e8c098cddb213f5b3076526df88826e8
diff --git a/iproute2-4.13.0.orig.tar.xz b/iproute2-4.13.0.orig.tar.xz
deleted file mode 100644
index 52781af759392e9d918119d1e52e16130c1e0097..0000000000000000000000000000000000000000
-- 
2.11.0



More information about the pve-devel mailing list