sync mkrelease scripts

svn path=/; revision=464

1 files changed, 11 insertions, 5 deletions

diff --git a/vserver-sources/mkrelease b/vserver-sources/mkrelease
index d5d37bc..9fc7650 100755
--- a/vserver-sources/mkrelease
+++ b/vserver-sources/mkrelease
@@ -1,22 +1,28 @@
 #!/bin/bash
 
-# New package name as of 06 Jan 2006
+# Package name convention for vserver-sources patches:
 # vserver-patches-$CKV_$PVR.tar.bz2
 # where
 # 1) CKV is the kernel version (i.e. 2.6.15)
 # 2) PVR is the package version + revision (i.e. 2.0.1-r1)
-P="vserver-patches-${2}_${1}.tar.bz2"
 
 if [ -z $2 ]; then
-	echo "Usage: mkrelease <ver> <kernelver>"
+	echo "Usage: mkrelease <kernelver> <ver> [<rev>]"
 	exit 1
 fi
 
+CKV=${1}
+PVR=${2}
+
+[[ -n ${3} ]] && PVR=${2}-${3}
+
+P="vserver-patches-${CKV}_${PVR}.tar.bz2"
+
 tmpdir=$(mktemp -d)
 
-svn export ${1} ${tmpdir}/${2}
+svn export ${PVR} ${tmpdir}/${CKV}
 
-tar cjvf ./${P} -C ${tmpdir} ${2}
+tar cjvf ./${P} -C ${tmpdir} ${CKV} | sort
 
 rm -rf ${tmpdir}