summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2015-08-09 03:22:24 -0400
committergraysky2015-08-09 03:22:24 -0400
commit0a8aaca1adbbf27c1b2fcd869b5f6eb923d9dde0 (patch)
treebbed80221a19d06cc0c4a656b9442acf04b4b9e3
parentedf93787bdfef6d42c8bd84fcf27bba26a750ba9 (diff)
downloadaur-0a8aaca1adbbf27c1b2fcd869b5f6eb923d9dde0.tar.gz
Update to 4.1.4-1
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD14
-rw-r--r--config5
-rw-r--r--config.x86_645
4 files changed, 16 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ce3f247bcde..a8a0010ffba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,7 +17,7 @@ pkgbase = linux-ck
source = config
source = linux-ck.preset
source = change-default-console-loglevel.patch
- source = http://ck.kolivas.org/patches/4.0/4.1/4.1-ck1/patch-4.1-ck1.bz2
+ source = http://ck.kolivas.org/patches/4.0/4.1/4.1-ck2/patch-4.1-ck2.bz2
source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.1.0-v7r8/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r8-4.1.patch
source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.1.0-v7r8/0002-block-introduce-the-BFQ-v7r8-I-O-sched-for-4.1.patch
@@ -26,18 +26,18 @@ pkgbase = linux-ck
sha256sums = SKIP
sha256sums = 0976127a60a950acf2796f642ac647e5231573b9a0f25703a37a50b988bf3b88
sha256sums = SKIP
- sha256sums = 988297a8bee2b4e42b90f2601f28d655dd19331b8e5e573c8e5227dcd6ff46dd
- sha256sums = 2bd0424b65d522d6605d979e41142aeaa406e881567ebb725f05d9ede33552af
+ sha256sums = b04ce2128ddb94be5ffafb4383d5c8b016760500696b1426a6e552c9a61ab27c
+ sha256sums = cc181fe0cfcedcd3bf606d7cce53e07dfb206d6c3549238dc7f4d0d27973d1a4
sha256sums = 2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
- sha256sums = d383e24325333b0045ddbfee4cfc2491ab25d9a6446094dbe0e5ad7ed3de133a
+ sha256sums = 87726411f583862e456156fe82ef51b188e5d92e7a4bd944e01a091cd7c46428
sha256sums = 819961379909c028e321f37e27a8b1b08f1f1e3dd58680e07b541921282da532
sha256sums = ec0ca3c8051ea6d9a27a450998af8162464c224299deefc29044172940e96975
sha256sums = c5c2c48638c2a8180948bd118ffcc33c8b7ff5f9f1e4b04c8e2cafeca2bde87b
sha256sums = 4f30f76adbdf49aec8d41ac27ad212734500c272f3cba594f134a7bc263820d9
pkgname = linux-ck
- pkgdesc = Linux Kernel with the ck1 patchset featuring the Brain Fuck Scheduler v0.463.
+ pkgdesc = Linux Kernel with the ck2 patchset featuring the Brain Fuck Scheduler v0.463.
install = linux-ck.install
depends = coreutils
depends = linux-firmware
diff --git a/PKGBUILD b/PKGBUILD
index cb55e1ffcb3..d7fbd6f47ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -59,7 +59,7 @@ url="https://wiki.archlinux.org/index.php/Linux-ck"
license=('GPL2')
makedepends=('kmod' 'inetutils' 'bc')
options=('!strip')
-_ckpatchversion=1
+_ckpatchversion=2
_ckpatchname="patch-4.1-ck${_ckpatchversion}"
_gcc_patch="enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch"
_bfqpath="http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.1.0-v7r8"
@@ -82,11 +82,11 @@ sha256sums=('caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f'
'SKIP'
'0976127a60a950acf2796f642ac647e5231573b9a0f25703a37a50b988bf3b88'
'SKIP'
- '988297a8bee2b4e42b90f2601f28d655dd19331b8e5e573c8e5227dcd6ff46dd'
- '2bd0424b65d522d6605d979e41142aeaa406e881567ebb725f05d9ede33552af'
+ 'b04ce2128ddb94be5ffafb4383d5c8b016760500696b1426a6e552c9a61ab27c'
+ 'cc181fe0cfcedcd3bf606d7cce53e07dfb206d6c3549238dc7f4d0d27973d1a4'
'2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- 'd383e24325333b0045ddbfee4cfc2491ab25d9a6446094dbe0e5ad7ed3de133a'
+ '87726411f583862e456156fe82ef51b188e5d92e7a4bd944e01a091cd7c46428'
'819961379909c028e321f37e27a8b1b08f1f1e3dd58680e07b541921282da532'
'ec0ca3c8051ea6d9a27a450998af8162464c224299deefc29044172940e96975'
'c5c2c48638c2a8180948bd118ffcc33c8b7ff5f9f1e4b04c8e2cafeca2bde87b'
@@ -110,7 +110,7 @@ prepare() {
# patch source with ck patchset with BFS
# fix double name in EXTRAVERSION
sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "${srcdir}/${_ckpatchname}"
- msg "Patching source with ck1 including BFS v0.463"
+ msg "Patching source with ck2 including BFS v0.463"
patch -Np1 -i "${srcdir}/${_ckpatchname}"
# Patch source to enable more gcc CPU optimizatons via the make nconfig
@@ -234,8 +234,8 @@ build() {
}
package_linux-ck() {
- pkgdesc='Linux Kernel with the ck1 patchset featuring the Brain Fuck Scheduler v0.463.'
- #_Kpkgdesc='Linux Kernel and modules with the ck1 patchset featuring the Brain Fuck Scheduler v0.463.'
+ pkgdesc='Linux Kernel with the ck2 patchset featuring the Brain Fuck Scheduler v0.463.'
+ #_Kpkgdesc='Linux Kernel and modules with the ck2 patchset featuring the Brain Fuck Scheduler v0.463.'
#pkgdesc="${_Kpkgdesc}"
depends=('coreutils' 'linux-firmware' 'mkinitcpio>=0.7')
optdepends=('crda: to set the correct wireless channels of your country' 'nvidia-ck: nVidia drivers for linux-ck' 'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig')
diff --git a/config b/config
index 307dc3c69b5..6470b5b17e5 100644
--- a/config
+++ b/config
@@ -6344,8 +6344,8 @@ CONFIG_PVPANIC=m
CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_LAPTOP=m
CONFIG_CHROMEOS_PSTORE=m
-# CONFIG_CROS_EC_CHARDEV is not set
-# CONFIG_CROS_EC_LPC is not set
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LPC=m
CONFIG_CLKDEV_LOOKUP=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_COMMON_CLK=y
@@ -6465,7 +6465,6 @@ CONFIG_KXCJK1013=m
# CONFIG_AD7887 is not set
# CONFIG_AD7923 is not set
# CONFIG_AD799X is not set
-# CONFIG_CC10001_ADC is not set
# CONFIG_MAX1027 is not set
# CONFIG_MAX1363 is not set
# CONFIG_MCP320X is not set
diff --git a/config.x86_64 b/config.x86_64
index d8f51efceca..f7ab01fefb9 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -6075,8 +6075,8 @@ CONFIG_PVPANIC=m
CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_LAPTOP=m
CONFIG_CHROMEOS_PSTORE=m
-# CONFIG_CROS_EC_CHARDEV is not set
-# CONFIG_CROS_EC_LPC is not set
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LPC=m
CONFIG_CLKDEV_LOOKUP=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_COMMON_CLK=y
@@ -6195,7 +6195,6 @@ CONFIG_KXCJK1013=m
# CONFIG_AD7887 is not set
# CONFIG_AD7923 is not set
# CONFIG_AD799X is not set
-# CONFIG_CC10001_ADC is not set
# CONFIG_MAX1027 is not set
# CONFIG_MAX1363 is not set
# CONFIG_MCP320X is not set