summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorshmilee2019-04-22 22:15:41 +0800
committershmilee2019-04-22 22:15:41 +0800
commit12c82a4c315909639e44e05ce4e4bc69538e5a82 (patch)
treef6f1b67d6a1820a78c9d9c86cbf37e0554d2c534
parenta9050630c7aa7ff337bab52fb34c53ab65dd0ba0 (diff)
downloadaur-12c82a4c315909639e44e05ce4e4bc69538e5a82.tar.gz
update to LTS 4.19.36
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD12
-rw-r--r--ck-patch-for-4.19.33+.patch14
-rw-r--r--ck-patch-for-4.19.34+.patch15
-rw-r--r--config5
5 files changed, 52 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ef013b903d7..dc43207403f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-# Generated by makepkg 5.1.2
-# Sat Feb 23 12:16:41 UTC 2019
+# Generated by makepkg 5.1.3
+# Mon Apr 22 14:15:15 UTC 2019
pkgbase = linux-shmilee
- pkgver = 4.19.25
+ pkgver = 4.19.36
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -16,9 +16,11 @@ pkgbase = linux-shmilee
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.25.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.36.xz
source = http://ck.kolivas.org/patches/4.0/4.19/4.19-ck1/patch-4.19-ck1.xz
source = ck-patch-for-4.19.7+.patch
+ source = ck-patch-for-4.19.33+.patch
+ source = ck-patch-for-4.19.34+.patch
source = https://raw.githubusercontent.com/dolohow/uksm/c4fc85e4e513f97c38806358c472cc45270d936f/uksm-4.19.patch
source = linux-cjktty-4.19.patch::https://github.com/torvalds/linux/compare/v4.19...Gentoo-zh:4.19-utf8.patch
source = config
@@ -29,12 +31,14 @@ pkgbase = linux-shmilee
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
sha256sums = SKIP
- sha256sums = 4f6f3466394966fbff4e32ca3c33ccb07e008157c9288762d44722ae3ccf41ac
+ sha256sums = 0703078d84261d098492abaab813a0bab2b408f923d96e66c980f2cdb8d326a8
sha256sums = 77863d16a08e1b3c726b6c965f1bb7c672bd7317776810121062b73f9ea26780
sha256sums = 58b81803f8f81d18bef9fe3c5101851ca770ca103da114b8d1460ed74d920efa
+ sha256sums = fb338209c3b3d00ae2e3706eb3b874d5d9391f84120ff5197f95824be76f86e1
+ sha256sums = 0aafe8360e9a3b9b801ca1327fbfd15b950840d9ddaccd3e7bfc71749e9e3a0c
sha256sums = ec617b1718e6cadfad02c75aca9c4b0e6b6f944bc1a93b7e4d82c847c04b5653
sha256sums = 72be48252f30bc644071bbce2607b773f789c6f19e281b89ab7e16a3d8161ed3
- sha256sums = 35dd18e779a82731f9dfbbd696a10ac5a6037f9a06e9d22f1ba3d72e79a0665b
+ sha256sums = c804c47ecb6d01f29ed4af5bd9c50fa3bb2545ebe9d1c3b560bc6c61a72966f5
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
diff --git a/PKGBUILD b/PKGBUILD
index 4dbc7b56879..826565e49f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
# https://www.kernel.org/category/releases.html
# 4.19 Greg Kroah-Hartman 2018-10-22 2020-12
_LLL_VER=4.19
-_LLL_SUBVER=25
+_LLL_SUBVER=36
# NUMA is optimized for multi-socket motherboards.
# A single multi-core CPU can actually run slower with NUMA enabled.
@@ -54,6 +54,8 @@ source=(
#"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
${_CK_PATCH}
'ck-patch-for-4.19.7+.patch'
+ 'ck-patch-for-4.19.33+.patch'
+ 'ck-patch-for-4.19.34+.patch'
${_UKSM_PATCH}
${_CJKTTY_PATCH}
'config' # the main kernel config file
@@ -68,12 +70,14 @@ validpgpkeys=(
# https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256sums=('0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1'
'SKIP'
- '4f6f3466394966fbff4e32ca3c33ccb07e008157c9288762d44722ae3ccf41ac'
+ '0703078d84261d098492abaab813a0bab2b408f923d96e66c980f2cdb8d326a8'
'77863d16a08e1b3c726b6c965f1bb7c672bd7317776810121062b73f9ea26780'
'58b81803f8f81d18bef9fe3c5101851ca770ca103da114b8d1460ed74d920efa'
+ 'fb338209c3b3d00ae2e3706eb3b874d5d9391f84120ff5197f95824be76f86e1'
+ '0aafe8360e9a3b9b801ca1327fbfd15b950840d9ddaccd3e7bfc71749e9e3a0c'
'ec617b1718e6cadfad02c75aca9c4b0e6b6f944bc1a93b7e4d82c847c04b5653'
'72be48252f30bc644071bbce2607b773f789c6f19e281b89ab7e16a3d8161ed3'
- '35dd18e779a82731f9dfbbd696a10ac5a6037f9a06e9d22f1ba3d72e79a0665b'
+ 'c804c47ecb6d01f29ed4af5bd9c50fa3bb2545ebe9d1c3b560bc6c61a72966f5'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
@@ -95,6 +99,8 @@ prepare() {
msg "Patching source with ck${_CK_VER} including BFS"
cp "../patch-${_LLL_VER}-ck${_CK_VER}" "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
patch -i ../ck-patch-for-4.19.7+.patch "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
+ patch -i ../ck-patch-for-4.19.33+.patch "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
+ patch -i ../ck-patch-for-4.19.34+.patch "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
patch -Np1 -i "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
msg "Patching source with uksm ${_UKSM_VER} patches"
diff --git a/ck-patch-for-4.19.33+.patch b/ck-patch-for-4.19.33+.patch
new file mode 100644
index 00000000000..5e1cf99653a
--- /dev/null
+++ b/ck-patch-for-4.19.33+.patch
@@ -0,0 +1,14 @@
+--- patch-4.19.25-ck1 2019-04-22 21:25:52.000000000 +0800
++++ patch-4.19.33-ck1 2019-04-22 21:30:45.000000000 +0800
+@@ -16774,8 +16774,8 @@
+ -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \
+ -I$(srctree)/tools/objtool/arch/$(ARCH)/include
+ WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed
+--CFLAGS += -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES)
+-+CFLAGS += $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES)
+- LDFLAGS += -lelf $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
++-CFLAGS += -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
+++CFLAGS += $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
++ LDFLAGS += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
+
+ # Allow old libelf to be used:
diff --git a/ck-patch-for-4.19.34+.patch b/ck-patch-for-4.19.34+.patch
new file mode 100644
index 00000000000..721c9a02c39
--- /dev/null
+++ b/ck-patch-for-4.19.34+.patch
@@ -0,0 +1,15 @@
+--- patch-4.19.25-ck1 2019-04-22 19:37:07.000000000 +0800
++++ patch-4.19.34-ck1 2019-04-22 21:25:52.000000000 +0800
+@@ -16165,10 +16165,10 @@
+ index cc02050fd0c4..7dac6885128e 100644
+ --- a/kernel/sysctl.c
+ +++ b/kernel/sysctl.c
+-@@ -126,9 +126,17 @@ static int __maybe_unused one = 1;
+- static int __maybe_unused two = 2;
++@@ -127,9 +127,17 @@ static int __maybe_unused one = 1;
+ static int __maybe_unused four = 4;
+ static unsigned long one_ul = 1;
++ static unsigned long long_max = LONG_MAX;
+ -static int one_hundred = 100;
+ -static int one_thousand = 1000;
+ -#ifdef CONFIG_PRINTK
diff --git a/config b/config
index 342afc4b222..d043da95ada 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.20-1 Kernel Configuration
+# Linux/x86 4.19.36-1 Kernel Configuration
#
#
@@ -4076,6 +4076,7 @@ CONFIG_N_HDLC=m
CONFIG_N_GSM=m
CONFIG_TRACE_ROUTER=m
CONFIG_TRACE_SINK=m
+CONFIG_LDISC_AUTOLOAD=y
CONFIG_DEVMEM=y
# CONFIG_DEVKMEM is not set
@@ -6243,6 +6244,7 @@ CONFIG_DUMMY_CONSOLE_COLUMNS=80
CONFIG_DUMMY_CONSOLE_ROWS=25
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
# CONFIG_LOGO is not set
CONFIG_SOUND=m
@@ -8028,6 +8030,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_TOUCHSCREEN_DMI=y
CONFIG_INTEL_CHTDC_TI_PWRBTN=m
CONFIG_I2C_MULTI_INSTANTIATE=m
+# CONFIG_INTEL_ATOMISP2_PM is not set
CONFIG_PMC_ATOM=y
CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_LAPTOP=m