summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO26
-rw-r--r--PKGBUILD18
-rw-r--r--config12
-rw-r--r--config.x86_6412
4 files changed, 39 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f52f44d9040e..f7ef85763f0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-ice
pkgdesc = The Linux-ice kernel and modules
- pkgver = 4.3
+ pkgver = 4.3.1
pkgrel = 1
url = http://www.kernel.org/
arch = i686
@@ -14,20 +14,24 @@ pkgbase = linux-ice
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.3.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.3.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.3.1.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.3.1.sign
source = config
source = config.x86_64
source = linux.preset
source = linux.install
source = change-default-console-loglevel.patch
- source = http://tuxonice.net/downloads/all/tuxonice-for-linux-head-4.3.0-rc7-2015-11-01.patch.bz2
+ source = http://tuxonice.net/downloads/all/tuxonice-for-linux-head-4.3.0-2015-11-07.patch.bz2
sha256sums = 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae
sha256sums = SKIP
- sha256sums = 0f0adf7f4aebc11278352596906182144bd43ffac5207ab6888e03f68ead65fb
- sha256sums = 7dd79c051e2caecc35c37f1e2d65836156bdf8d879c102d7b6343d13d3f19233
+ sha256sums = 82caff48806796418f445d0a87698abedfaaccfdc7b63059166b788e0cfd144b
+ sha256sums = SKIP
+ sha256sums = 5d9d7aefa33b239279456fa8a8cd4de2d9ee4601f9f432b718c9bfdb7ce2925b
+ sha256sums = 8c1ba876b2291c58269f7232b291e369daa925ba904b45636af4e80c0f73ced5
sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
sha256sums = 8c270194a0ab5deea628880f42443dff0932d445f1aa6aec6a295924a18b7643
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
- sha256sums = 7b82218d17001ab54691552fd87f38482afa4a2923cfdab104381ca0efce8ae0
+ sha256sums = 1d52d29e88235511bfae5f105c5d6d02fc1a1864a1050c4133a452d0fbf8d7c2
pkgname = linux-ice
pkgdesc = The Linux-ice kernel and modules
@@ -37,23 +41,23 @@ pkgname = linux-ice
depends = kmod
depends = mkinitcpio>=0.7
optdepends = crda: to set the correct wireless channels of your country
- provides = kernel26-ice=4.3
- provides = linux=4.3
+ provides = kernel26-ice=4.3.1
+ provides = linux=4.3.1
conflicts = kernel26-ice
replaces = kernel26-ice
backup = etc/mkinitcpio.d/linux-ice.preset
pkgname = linux-ice-headers
pkgdesc = Header files and scripts for building modules for Linux-ice kernel
- provides = kernel26-ice-headers=4.3
- provides = linux-headers=4.3
+ provides = kernel26-ice-headers=4.3.1
+ provides = linux-headers=4.3.1
conflicts = kernel26-ice-headers
replaces = kernel26-ice-headers
pkgname = linux-ice-docs
pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-ice kernel
- provides = kernel26-ice-docs=4.3
- provides = linux-docs=4.3
+ provides = kernel26-ice-docs=4.3.1
+ provides = linux-docs=4.3.1
conflicts = kernel26-ice-docs
replaces = kernel26-ice-docs
diff --git a/PKGBUILD b/PKGBUILD
index 236d880da993..51f7e9ab64c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
#pkgbase=linux # Build stock -ARCH kernel
pkgbase=linux-ice # Build kernel with a different name
_srcname=linux-4.3
-pkgver=4.3
+pkgver=4.3.1
pkgrel=1
-_toipatch=tuxonice-for-linux-head-4.3.0-rc7-2015-11-01.patch
+_toipatch=tuxonice-for-linux-head-4.3.0-2015-11-07.patch
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
license=('GPL2')
@@ -15,8 +15,8 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
options=('!strip')
source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
"https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign"
- #"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
- #"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
+ "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
+ "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
# the main kernel config files
'config' 'config.x86_64'
# standard config files for mkinitcpio ramdisk
@@ -28,12 +28,14 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
sha256sums=('4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae'
'SKIP'
- '0f0adf7f4aebc11278352596906182144bd43ffac5207ab6888e03f68ead65fb'
- '7dd79c051e2caecc35c37f1e2d65836156bdf8d879c102d7b6343d13d3f19233'
+ '82caff48806796418f445d0a87698abedfaaccfdc7b63059166b788e0cfd144b'
+ 'SKIP'
+ '5d9d7aefa33b239279456fa8a8cd4de2d9ee4601f9f432b718c9bfdb7ce2925b'
+ '8c1ba876b2291c58269f7232b291e369daa925ba904b45636af4e80c0f73ced5'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'8c270194a0ab5deea628880f42443dff0932d445f1aa6aec6a295924a18b7643'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- '7b82218d17001ab54691552fd87f38482afa4a2923cfdab104381ca0efce8ae0')
+ '1d52d29e88235511bfae5f105c5d6d02fc1a1864a1050c4133a452d0fbf8d7c2')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@@ -45,7 +47,7 @@ prepare() {
cd "${srcdir}/${_srcname}"
# add upstream patch
- #patch -p1 -i "${srcdir}/patch-${pkgver}"
+ patch -p1 -i "${srcdir}/patch-${pkgver}"
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
diff --git a/config b/config
index 4fabf382cf1c..696ce69ddc0a 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.3.0 Kernel Configuration
+# Linux/x86 4.3.1-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -207,7 +207,7 @@ CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
-# CONFIG_BPF_SYSCALL is not set
+CONFIG_BPF_SYSCALL=y
CONFIG_SHMEM=y
CONFIG_AIO=y
CONFIG_ADVISE_SYSCALLS=y
@@ -1778,7 +1778,8 @@ CONFIG_MTD_SCB2_FLASH=m
# CONFIG_MTD_NETtel is not set
# CONFIG_MTD_L440GX is not set
CONFIG_MTD_PCI=m
-# CONFIG_MTD_PCMCIA is not set
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
# CONFIG_MTD_GPIO_ADDR is not set
# CONFIG_MTD_INTEL_VR_NOR is not set
CONFIG_MTD_PLATRAM=m
@@ -1841,7 +1842,7 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_BLOCK is not set
+CONFIG_MTD_UBI_BLOCK=y
CONFIG_OF=y
# CONFIG_OF_UNITTEST is not set
CONFIG_OF_PROMTREE=y
@@ -3942,7 +3943,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=m
CONFIG_SENSORS_NCT6683=m
CONFIG_SENSORS_NCT6775=m
CONFIG_SENSORS_NCT7802=m
-# CONFIG_SENSORS_NCT7904 is not set
+CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_PCF8591=m
CONFIG_PMBUS=m
CONFIG_SENSORS_PMBUS=m
@@ -7409,6 +7410,7 @@ CONFIG_STACK_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_KPROBE_EVENT=y
CONFIG_UPROBE_EVENT=y
+CONFIG_BPF_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
diff --git a/config.x86_64 b/config.x86_64
index 439325d90ad7..77d5a25bf187 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.3.0 Kernel Configuration
+# Linux/x86 4.3.1-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -216,7 +216,7 @@ CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
-# CONFIG_BPF_SYSCALL is not set
+CONFIG_BPF_SYSCALL=y
CONFIG_SHMEM=y
CONFIG_AIO=y
CONFIG_ADVISE_SYSCALLS=y
@@ -1765,7 +1765,8 @@ CONFIG_MTD_SCB2_FLASH=m
# CONFIG_MTD_NETtel is not set
# CONFIG_MTD_L440GX is not set
CONFIG_MTD_PCI=m
-# CONFIG_MTD_PCMCIA is not set
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
# CONFIG_MTD_GPIO_ADDR is not set
# CONFIG_MTD_INTEL_VR_NOR is not set
CONFIG_MTD_PLATRAM=m
@@ -1827,7 +1828,7 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_BLOCK is not set
+CONFIG_MTD_UBI_BLOCK=y
# CONFIG_OF is not set
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT=m
@@ -3814,7 +3815,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=m
CONFIG_SENSORS_NCT6683=m
CONFIG_SENSORS_NCT6775=m
CONFIG_SENSORS_NCT7802=m
-# CONFIG_SENSORS_NCT7904 is not set
+CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_PCF8591=m
CONFIG_PMBUS=m
CONFIG_SENSORS_PMBUS=m
@@ -7147,6 +7148,7 @@ CONFIG_STACK_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_KPROBE_EVENT=y
CONFIG_UPROBE_EVENT=y
+CONFIG_BPF_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_DYNAMIC_FTRACE_WITH_REGS=y