cleanups

diff --git a/Makefile b/Makefile
index d9986a78c9ae5c95ded4a5aeef5dcf1004f7983c..9ff15fddd58826dceb91a5458ac44fb4e811bfc6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-RELEASE=1.9
+RELEASE=2.0
 
 SVER=3.0.29
 PACKAGERELEASE=2pve1
@@ -11,15 +11,16 @@ VZCTL_BRANCH=vzctl-3.0.29.2
 
 all: ${DEB}
 
-vzctl-${SVER}.org/COPYING:
-       git clone git://git.openvz.org/pub/vzctl vzctl-${SVER}.org
-       # git branch -D local
-       cd vzctl-${SVER}.org; git checkout -b local ${VZCTL_BRANCH}     
+vzctl-${SVER}.org/COPYING: vzctl-${SVER}.org.tgz
+       tar xzf $<
        touch $@
 
-vzctl-${SVER}.tgz: vzctl-${SVER}.org/COPYING
-       tar czf $@.tmp vzctl-${SVER}.org
-       mv $@.tmp $@
+.PHONY: download
+vzctl-${SVER}.org.tgz download:
+       rm -rf vzctl-${SVER}.org vzctl-${SVER}.org.tgz
+       git clone git://git.openvz.org/pub/vzctl vzctl-${SVER}.org
+       cd vzctl-${SVER}.org; git branch ${VZCTL_BRANCH}
+       tar czf vzctl-${SVER}.org.tgz vzctl-${SVER}.org
 
 
 vzctl-${SVER}/debian/control: vzctl-${SVER}.org/COPYING
@@ -29,7 +30,9 @@ vzctl-${SVER}/debian/control: vzctl-${SVER}.org/COPYING
        cd vzctl-${SVER}; ./autogen.sh
        touch $@
 
-${DEB}: vzctl-${SVER}/debian/control
+
+.PHONY: deb
+${DEB} deb: vzctl-${SVER}/debian/control
        chmod +x vzctl-${SVER}/debian/rules
        cd vzctl-${SVER}; dpkg-buildpackage -b -rfakeroot -us -uc
        lintian ${DEB}
@@ -53,3 +56,8 @@ distclean: clean
 .PHONY: clean
 clean:
        rm -rf vzctl-${SVER} vzctl_${SVER}* *~ debian/*~ debian/patches/*~ *.tmp a.out
+
+.PHONY: dinstall
+dinstall: deb
+       dpkg -i ${DEB}
+

diff --git a/debian/patches/fix-udev-path.diff b/debian/patches/fix-udev-path.diff
new file mode 100644 (file)
index 0000000..7e664e6
--- /dev/null
+++ b/debian/patches/fix-udev-path.diff
@@ -0,0 +1,13 @@
+Index: new/paths.am
+===================================================================
+--- new.orig/paths.am  2011-09-23 13:54:56.000000000 +0200
++++ new/paths.am       2011-09-23 13:55:10.000000000 +0200
+@@ -24,7 +24,7 @@
+ endif
+ 
+ if ENABLE_UDEV
+-udevdir     = $(sysconfdir)/udev/rules.d
++udevdir     = /lib/udev/rules.d
+ endif
+ 
+ initddir    = $(sysconfdir)/init.d

diff --git a/debian/patches/series b/debian/patches/series
index e47349477ec211c553a92d4c1d2bf44fb4cdd3f8..a7b746bb0b2292fd56d538cc37f9e458498a691b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 fix-init-script.patch
 fix-vzevent-init.patch
 fix-default-template.diff
+fix-udev-path.diff