summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-10-27 09:03:51 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-10-27 09:03:51 +0000
commit51e88757d944832beadb24398ca7f50a8cac5ee3 (patch)
tree21fce2bc8aebffde1c4547c062aca2aa9e86c4ea
parentcc1923bda32a938d7c8704f9410ac3cf543c00ef (diff)
downloadaports-51e88757d944832beadb24398ca7f50a8cac5ee3.tar.bz2
aports-51e88757d944832beadb24398ca7f50a8cac5ee3.tar.xz
main/linux-grsec: disable all staging drivers except hyper-v
-rw-r--r--main/linux-grsec/APKBUILD4
-rw-r--r--main/linux-grsec/kernelconfig.x866
2 files changed, 4 insertions, 6 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 84665e374..a144f1f35 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
pkgname=linux-${_flavor}
pkgver=2.6.35.7
_kernver=2.6.35
-pkgrel=2
+pkgrel=3
pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net
depends="mkinitfs linux-firmware"
@@ -145,4 +145,4 @@ md5sums="091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2
0ccecafd4123dcad0b0cd7787553d734 r8169-fix-rx-checksum-offload.patch
139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch
8c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch
-f6b46f11945c77d01679c87e95d512ee kernelconfig.x86"
+16d6b950b8c8d9c9e6b43eb76cd090f4 kernelconfig.x86"
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index a8abd7f62..750db81bb 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.7
-# Tue Oct 26 10:47:49 2010
+# Wed Oct 27 08:38:30 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -4265,9 +4265,7 @@ CONFIG_STAGING=y
# CONFIG_IDE_PHISON is not set
# CONFIG_LINE6_USB is not set
# CONFIG_DRM_VMWGFX is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
+# CONFIG_DRM_NOUVEAU is not set
#
# I2C encoder or helper chips