diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-26 13:24:44 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-26 13:24:44 +0000 |
commit | e5412705b673d7a1650741b4c45d87ef915674f1 (patch) | |
tree | d77e5c2ee0bc127e581037c24ef918f87b96f1ea | |
parent | 6434bb6a29a04d2a043b94acca7d038a313d44a0 (diff) | |
download | alpine_aports-e5412705b673d7a1650741b4c45d87ef915674f1.tar.bz2 alpine_aports-e5412705b673d7a1650741b4c45d87ef915674f1.tar.xz alpine_aports-e5412705b673d7a1650741b4c45d87ef915674f1.zip |
main/linux-grsec: fix localversion
it picked up the aports git repo by mistake
-rw-r--r-- | main/linux-grsec/APKBUILD | 4 | ||||
-rw-r--r-- | main/linux-grsec/setlocalversion.patch | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 37da9f8952..84665e374a 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD | |||
@@ -4,7 +4,7 @@ _flavor=grsec | |||
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=2.6.35.7 | 5 | pkgver=2.6.35.7 |
6 | _kernver=2.6.35 | 6 | _kernver=2.6.35 |
7 | pkgrel=1 | 7 | pkgrel=2 |
8 | pkgdesc="Linux kernel with grsecurity" | 8 | pkgdesc="Linux kernel with grsecurity" |
9 | url=http://grsecurity.net | 9 | url=http://grsecurity.net |
10 | depends="mkinitfs linux-firmware" | 10 | depends="mkinitfs linux-firmware" |
@@ -18,6 +18,7 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 | |||
18 | 0004-arp-flush-arp-cache-on-device-change.patch | 18 | 0004-arp-flush-arp-cache-on-device-change.patch |
19 | r8169-fix-rx-checksum-offload.patch | 19 | r8169-fix-rx-checksum-offload.patch |
20 | r8169-add-gro-support.patch | 20 | r8169-add-gro-support.patch |
21 | setlocalversion.patch | ||
21 | kernelconfig.x86 | 22 | kernelconfig.x86 |
22 | " | 23 | " |
23 | subpackages="$pkgname-dev linux-firmware:firmware" | 24 | subpackages="$pkgname-dev linux-firmware:firmware" |
@@ -143,4 +144,5 @@ md5sums="091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 | |||
143 | 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch | 144 | 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch |
144 | 0ccecafd4123dcad0b0cd7787553d734 r8169-fix-rx-checksum-offload.patch | 145 | 0ccecafd4123dcad0b0cd7787553d734 r8169-fix-rx-checksum-offload.patch |
145 | 139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch | 146 | 139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch |
147 | 8c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch | ||
146 | f6b46f11945c77d01679c87e95d512ee kernelconfig.x86" | 148 | f6b46f11945c77d01679c87e95d512ee kernelconfig.x86" |
diff --git a/main/linux-grsec/setlocalversion.patch b/main/linux-grsec/setlocalversion.patch new file mode 100644 index 0000000000..d82eb170ab --- /dev/null +++ b/main/linux-grsec/setlocalversion.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- ./scripts/setlocalversion.orig | ||
2 | +++ ./scripts/setlocalversion | ||
3 | @@ -43,7 +43,7 @@ | ||
4 | fi | ||
5 | |||
6 | # Check for git and a git repo. | ||
7 | - if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then | ||
8 | + if [ -d "$srctree"/.git ] && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then | ||
9 | |||
10 | # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore | ||
11 | # it, because this version is defined in the top level Makefile. | ||