summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2020-02-22 22:04:22 +0200
committerAqua-sama <aqua@iserlohn-fortress.net>2020-02-22 22:04:22 +0200
commitc292290249e381e3c9589016680fa752910d34cf (patch)
treeddc7c0b2c58aaeaae686fc1994ca2727ee57c0d9
parentMerge branch 'upstream' (diff)
parentUpdated to 5.5.5 (diff)
downloadlinux-ck-c292290249e381e3c9589016680fa752910d34cf.tar.xz
Merge branch 'upstream'
-rw-r--r--PKGBUILD8
-rw-r--r--config5
2 files changed, 6 insertions, 7 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 5b71eb4..5e2c803 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@
pkgbase=linux-ck
_supver=5
_majver=5
-_minver=4
+_minver=5
_gccpatchver='20191217'
_gccpatchger='9.1'
_gccpatchker='5.5'
@@ -69,7 +69,7 @@ validpgpkeys=(
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-b2sums=('508995a96406fd40b4f85873dff56c9a992937424f148cbbf7b85298955f0207f6ce2ad93b7c1f79ac563d0195145801d403a571521bb0be7eeed8a857295d89'
+b2sums=('7b0486c66f70dc58d84244810a8d7790a29c7a282b8e22585607bc87a98970dafba61c0894bcb523647b93b32e5511137cd350583b83715a15527dc02995d4a6'
'SKIP'
'4b982e16e3fee2c2c40db08d67a6cc794c27308c4b513a9baf909c5ea40e3be239288ba4c422e8eb58a669646d331e7fd945d7451d1a388f1c68fe3a445aa814'
'ab1fb19c67d4c107f75767581c33d9c1458b4d9fdb88f4adb41d30a36f5a2f95f1c48ef079eb87e1e6e8ce2f98b293195cb2c0f2a8ec975aa817453289158c6e'
@@ -90,7 +90,7 @@ b2sums=('508995a96406fd40b4f85873dff56c9a992937424f148cbbf7b85298955f0207f6ce2ad
'd76bd0bf237ea2bb7999fd3715cb664d89148cb0ade8057d57cdb40bc0a7954336e50ee077312e5e192398b0f35f055786deb98af9130d57e60f2ea040fbb66f'
'2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd'
'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a'
- '36c1fbfaffa23a5283523caf656689455d221778fff609816d9bbcc8cd63002c474ff42bc2d8114fbf2d73b859c6e952c9456b3fef46674eb51a24da92a21d52')
+ '8313450831401b9fff8eb7a403bf3c2a652da6f48afebdaa040127c4292f346e930318848c8d20e70d0907f328db37a7321cb8d2b5c06b31b5cad01422e80039')
#export KBUILD_BUILD_HOST=arc4linux
export KBUILD_BUILD_USER=$pkgbase
@@ -199,7 +199,7 @@ prepare() {
build() {
cd $_srcname
- make bzImage modules
+ make all
}
_package() {
diff --git a/config b/config
index aaad6a6..f60ab4c 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.5.0 Kernel Configuration
+# Linux/x86 5.5.5 Kernel Configuration
#
#
@@ -9984,8 +9984,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_TER16x32 is not set
-CONFIG_FONT_AUTOSELECT=y
+CONFIG_FONT_TER16x32=y
CONFIG_SG_POOL=y
CONFIG_ARCH_HAS_PMEM_API=y
CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y