main/linux-vserver: fix localversion

main/linux-vserver/APKBUILD

@@ -5,7 +5,7 @@ pkgname=linux-${_flavor}
 pkgver=2.6.35.7
 
 _kernver=2.6.35
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with vserver"
 url="http://linux-vserver.org/"
 depends="mkinitfs linux-firmware"
@@ -16,6 +16,7 @@ install=
 source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
 	http://vserver.13thfloor.at/Experimental/patch-2.6.35.7-vs2.3.0.36.33.diff
+	setlocalversion.patch
 	kernelconfig.x86
 	"
 subpackages="$pkgname-dev"
@@ -35,7 +36,7 @@ prepare() {
 		case $i in
 		*.patch|*.diff)
 			msg "Applying $i..."
-			patch -s -p1 -N < "$srcdir"/$i || return 1
+			patch -s -p1 -i "$srcdir"/$i || return 1
 			;;
 		esac
 	done
@@ -125,4 +126,5 @@ dev() {
 md5sums="091abeb4684ce03d1d936851618687b6  linux-2.6.35.tar.bz2
 6a00ec267b0100f20a3fa900b97a5b7f  patch-2.6.35.7.bz2
 87f2232a85a8e5542c7933f2614d3622  patch-2.6.35.7-vs2.3.0.36.33.diff
+8c224ba0cdf0aa572c7eb50379435be4  setlocalversion.patch
 10b1e713ce4422e69e1c96ba78feb7a9  kernelconfig.x86"

main/linux-vserver/setlocalversion.patch

+--- ./scripts/setlocalversion.orig
++++ ./scripts/setlocalversion
+@@ -43,7 +43,7 @@
+ 	fi
+ 
+ 	# Check for git and a git repo.
+-	if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
++	if [ -d "$srctree"/.git ] && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
+ 
+ 		# If we are at a tagged commit (like "v2.6.30-rc6"), we ignore
+ 		# it, because this version is defined in the top level Makefile.