From d23b508eb8621898f7dac3ff4dfdf45a67542ece Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Wed, 21 Nov 2012 01:36:32 -0200
Subject: linux-libre-grsec: disabling some patches due that generates conflict
 with grsec patch

---
 kernels/linux-libre-grsec/PKGBUILD | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'kernels/linux-libre-grsec/PKGBUILD')

diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD
index c7a0de695..847a4e807 100755
--- a/kernels/linux-libre-grsec/PKGBUILD
+++ b/kernels/linux-libre-grsec/PKGBUILD
@@ -31,9 +31,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        'module-symbol-waiting-3.6.patch'
-        'module-init-wait-3.6.patch'
-        'irq_cfg_pointer-3.6.6.patch'
+        #'module-symbol-waiting-3.6.patch'
+        #'module-init-wait-3.6.patch'
+        #'irq_cfg_pointer-3.6.6.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a2312edd0265b5b07bd4b50afae2b380'
          'a4e642180c7d757a642175fe32e4a264'
@@ -45,9 +45,9 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '86d3c12bdb77173617d2b9e170522ee0'
          '9d3c56a4b999c8bfbd4018089a62f662'
-         '670931649c60fcb3ef2e0119ed532bd4'
-         '8a71abc4224f575008f974a099b5cf6f'
-         '4909a0271af4e5f373136b382826717f'
+         #'670931649c60fcb3ef2e0119ed532bd4'
+         #'8a71abc4224f575008f974a099b5cf6f'
+         #'4909a0271af4e5f373136b382826717f'
          '1dd80f353c705fef988346a8ef05d13f')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
@@ -77,13 +77,13 @@ build() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # fix module initialisation
-  # https://bugs.archlinux.org/task/32122
-  patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch"
-  patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch"
+#  # fix module initialisation
+#  # https://bugs.archlinux.org/task/32122
+#  patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch"
+#  patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch"
 
-  # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt
-  patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch"
+#  # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt
+#  patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch"
 
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile
-- 
cgit v1.2.3