diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2006-09-06 14:37:17 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2006-09-06 14:37:17 +0000 |
| commit | 4f7a8b8daf85c23b72961ec99901333dfb233dc0 (patch) | |
| tree | 3e08eddf28e0d98b0c5096ea2e683d3f8cb88418 /vzctl | |
| parent | move udev rules file to ebuild (diff) | |
| download | misc-4f7a8b8daf85c23b72961ec99901333dfb233dc0.tar.gz misc-4f7a8b8daf85c23b72961ec99901333dfb233dc0.tar.bz2 misc-4f7a8b8daf85c23b72961ec99901333dfb233dc0.zip | |
fix udev patch again; fix mkrelease hell
svn path=/; revision=461
Diffstat (limited to 'vzctl')
| -rwxr-xr-x | vzctl/mkrelease | 8 | ||||
| -rw-r--r-- | vzctl/patches/3.0.11-r1/055_all_udev_rules.patch | 4 | ||||
| -rwxr-xr-x | vzctl/patches/mkrelease | 26 |
3 files changed, 5 insertions, 33 deletions
diff --git a/vzctl/mkrelease b/vzctl/mkrelease index da116e8..216d30e 100755 --- a/vzctl/mkrelease +++ b/vzctl/mkrelease @@ -8,8 +8,6 @@ fi PN="vzctl" VER="${1}" REV="${2}" -EXREV="-${REV}" -[[ "${REV}" == "r0" ]] && EXREV= shift 2 @@ -21,7 +19,7 @@ pushd ${tmpdir} >/dev/null pushd patches >/dev/null for dir in *; do - [ "${dir}" == "${VER}${EXREV}" ] && mv ${dir}/* . + [ "${dir}" == "${VER}-${REV}" ] && mv ${dir}/* . rm -rf "${dir}" done @@ -31,8 +29,8 @@ rm -f mkrelease popd >/dev/null -tar cjvf ./${PN}-${VER}-patches${EXREV}.tar.bz2 -C ${tmpdir} . | sort +tar cjvf ./${PN}-${VER}-patches-${REV}.tar.bz2 -C ${tmpdir} . | sort rm -rf ${tmpdir} -echo "Tarball is at ./${PN}-${VER}-patches${EXREV}.tar.bz2" +echo "Tarball is at ./${PN}-${VER}-patches-${REV}.tar.bz2" diff --git a/vzctl/patches/3.0.11-r1/055_all_udev_rules.patch b/vzctl/patches/3.0.11-r1/055_all_udev_rules.patch index 0773822..e1d1e02 100644 --- a/vzctl/patches/3.0.11-r1/055_all_udev_rules.patch +++ b/vzctl/patches/3.0.11-r1/055_all_udev_rules.patch @@ -1,7 +1,7 @@ diff --git a/src/Makefile b/src/Makefile index 3008f1c..4f74157 100644 ---- a/src/Makefile -+++ b/src/Makefile +--- vzctl-3.0.11.orig/src/Makefile ++++ vzctl-3.0.11/src/Makefile @@ -27,6 +27,7 @@ LIBSCRIPTSDIR = /usr/lib/vzctl/scripts/ NETSCRIPTDIR = /etc/sysconfig/network-scripts CRONDDIR = /etc/cron.d diff --git a/vzctl/patches/mkrelease b/vzctl/patches/mkrelease deleted file mode 100755 index a20ebb6..0000000 --- a/vzctl/patches/mkrelease +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -if [ -z $2 ]; then - echo "Usage: mkrelease <ver> <rev>" - exit 1 -fi - -VER="${1/-/.}" -REV="${2}" -EXREV="-${REV}" -[[ "${REV}" == "r0" ]] && EXREV= - -shift 2 - -tmpdir=$(mktemp -du) - -svn export ${VER}${EXREV} ${tmpdir} - -mkdir $tmpdir/patches -mv $tmpdir/*.patch $tmpdir/patches/ - -tar cjvf ./vzctl-${VER}-patches-${REV}.tar.bz2 -C ${tmpdir} . | sort - -rm -rf ${tmpdir} - -echo "Tarball is at ./vzctl-${VER}-patches-${REV}.tar.bz2" |