bump version to 3.0.2-1

and switch to using submodules

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..8af49f9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lxcfs"]
+       path = lxcfs
+       url = /home/wbumiller/Sources/mirror_lxcfs/.git

diff --git a/Makefile b/Makefile
index 60ba1a3d944ed6380b181500a1b9d8ad89456622..8f1c64fdb91af9228ff4f87a93fa8523ac4f364e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 PACKAGE=lxcfs
-PKGVER=3.0.0
+PKGVER=3.0.2
 DEBREL=1
 
 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)
 
 DEB1=${PACKAGE}_${PKGVER}-${DEBREL}_${ARCH}.deb
 DEB2=${PACKAGE}-dbgsym_${PKGVER}-${DEBREL}_${ARCH}.deb
@@ -14,25 +14,21 @@ DEBS=$(DEB1) $(DEB2)
 
 all: ${DEB}
 
+.PHONY: submodule
+submodule:
+       test -f "${SRCDIR}/debian/changelog" || git submodule update --init
+
 .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)
-
-
-.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}
+$(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: $(DEBS)
@@ -42,7 +38,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf ${SRCDIR} ${SRCDIR}.tmp *_${ARCH}.deb *.changes *.dsc  *.buildinfo
+       rm -rf $(BUILDSRC) *_${ARCH}.deb *.changes *.dsc  *.buildinfo
 
 .PHONY: dinstall
 dinstall: $(DEBS)

diff --git a/debian/changelog b/debian/changelog
index d2de5948bd54996923f6d506d4ea501fd92c2d53..d1573dde1cc1e9be3ed483a8e8fb878e6386a986 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lxcfs (3.0.2-1) UNRELEASED; urgency=medium
+
+  * update to lxcfs-3.0.2
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 18 Sep 2018 11:09:20 +0200
+
 lxcfs (3.0.0-1) unstable; urgency=medium
 
   * update to lxcfs-3.0.0

diff --git a/lxcfs b/lxcfs
new file mode 160000 (submodule)
index 0000000..d696b20
--- /dev/null
+++ b/lxcfs
@@ -0,0 +1 @@
+Subproject commit d696b20b99c80d2ac773cc76143ad58c45871ddb

diff --git a/lxcfs.tgz b/lxcfs.tgz
deleted file mode 100644 (file)
index b7db8bd..0000000
Binary files a/lxcfs.tgz and /dev/null differ