From 2c7b72dc38a9acbc63e4448c945a7b3eab00f0d9 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Fri, 27 Dec 2013 05:49:35 -0200
Subject: linux-libre-knock-3.12.6-1: updating version

* remove CONFIG_FIRMWARE_IN_KERNEL
---
 kernels/linux-libre-knock/PKGBUILD      | 19 ++++++++++---------
 kernels/linux-libre-knock/config.i686   |  2 +-
 kernels/linux-libre-knock/config.x86_64 |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'kernels/linux-libre-knock')

diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD
index 9c302d9b2..a59d29bdc 100644
--- a/kernels/linux-libre-knock/PKGBUILD
+++ b/kernels/linux-libre-knock/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 201455 2013-12-12 13:11:53Z tpowa $
+# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,10 +10,11 @@
 pkgbase=linux-libre-knock   # Build stock -LIBRE-KNOCK kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.12
-_sublevel=4
+_sublevel=6
+_knockpatchver=${_basekernel}.4
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -21,7 +22,7 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
-        "http://gnunet.org/sites/default/files/tcp_stealth_${pkgver}.diff"
+        "http://gnunet.org/sites/default/files/tcp_stealth_${_knockpatchver}.diff"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -33,17 +34,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'criu-no-expert.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('254f59707b6676b59ce5ca5c3c698319'
-         'ba123db2fbc72133d6292ca9aba51dd4'
+         '4b18ce60daff87504e6740670edf6b50'
          '387673a6510de1e1bce8188fc7a72bd1'
-         '56311acba5f433b818525a549684fe9c'
-         'c6ab89b8d10116df02f4293c67357f34'
+         'a903586ecfeaca65fe2abfa9e74f0816'
+         '58ab468b3f407f1471725f939638c8bd'
          '18d660832d681a27084774222fc74c1d'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '44260d2cb1a8b51c119d2ce1f83e457a'
          '98beb36f9b8cf16e58de2483ea9985e3'
          'd50c1ac47394e9aec637002ef3392bd1'
-         'c1ff9c8fd94d3345c611231a194b2c3f')
+         '71bbddd5f9799aa045660d92baa05845')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -61,7 +62,7 @@ prepare() {
   fi
 
   # add knock patch
-  patch -p1 -i "${srcdir}/tcp_stealth_${pkgver}.diff"
+  patch -p1 -i "${srcdir}/tcp_stealth_${_knockpatchver}.diff"
 
   # add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
diff --git a/kernels/linux-libre-knock/config.i686 b/kernels/linux-libre-knock/config.i686
index a95126d30..f3ec493fa 100644
--- a/kernels/linux-libre-knock/config.i686
+++ b/kernels/linux-libre-knock/config.i686
@@ -1453,7 +1453,7 @@ CONFIG_DEVTMPFS=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_DEBUG_DRIVER is not set
diff --git a/kernels/linux-libre-knock/config.x86_64 b/kernels/linux-libre-knock/config.x86_64
index 88b08bc00..666c9005a 100644
--- a/kernels/linux-libre-knock/config.x86_64
+++ b/kernels/linux-libre-knock/config.x86_64
@@ -1426,7 +1426,7 @@ CONFIG_DEVTMPFS=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_DEBUG_DRIVER is not set
-- 
cgit v1.2.3-54-g00ecf