From 556d364424c1ea59fb836bd0397db44ae0bdc398 Mon Sep 17 00:00:00 2001 From: Joakim Hernberg Date: Sun, 4 Feb 2018 13:17:41 +0100 Subject: bump to 4.9.76_rt61-1 --- .SRCINFO | 21 ++++++------ PKGBUILD | 18 ++++++++--- change-default-console-loglevel.patch | 11 +++++++ config | 61 +++++++++++++++++------------------ 4 files changed, 66 insertions(+), 45 deletions(-) create mode 100644 change-default-console-loglevel.patch diff --git a/.SRCINFO b/.SRCINFO index 1a6b650..37261c6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ # Generated by makepkg 5.0.2 -# Fri Dec 29 22:25:55 UTC 2017 +# Sun Feb 4 12:16:17 UTC 2018 pkgbase = linux-rt-lts - pkgver = 4.9.68_rt60 + pkgver = 4.9.76_rt61 pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 @@ -14,30 +14,33 @@ pkgbase = linux-rt-lts options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.68.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.68.sign - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.68-rt60.patch.xz - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.68-rt60.patch.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.76.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.76.sign + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.76-rt61.patch.xz + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.76-rt61.patch.sign source = config source = 60-linux-rt-lts.hook source = 90-linux-rt-lts.hook source = linux-rt-lts.preset + source = change-default-console-loglevel.patch source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1 validpgpkeys = 5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73 validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14 + validpgpkeys = 2B82682463E46862339A88A90A120DD923EEDD5F sha256sums = 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a sha256sums = SKIP - sha256sums = d2e3dbe2ec7b10dec3d9819a0fd6ce4374d939ab7d8fb0b115ba6110d0dfb22a + sha256sums = 9bc56c158c42d682fc631c2ed98da54bac26c7f0796d75999e48dd4a09b7ad64 sha256sums = SKIP - sha256sums = 9873613e76950c4728cfb6b108fe3dcf19883836bbed4849fc9bf8afe0eefd7f + sha256sums = 836e2d9f9507957eae69e74f383497370c446386e9c5a31e54fd8d50c2828d3a sha256sums = SKIP - sha256sums = 9e59614db3ccaa9a0638140df50515f31e51ab642f7559b02c9edb4c80c3092d + sha256sums = 1320564cb37cdcbc3e5892b920da331e58eabc363d634b7e95111b6432bec0e3 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 + sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 sha256sums = 85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06 pkgname = linux-rt-lts diff --git a/PKGBUILD b/PKGBUILD index 27a0596..2c05dac 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,8 +8,8 @@ #pkgbase=linux # Build stock -ARCH kernel pkgbase=linux-rt-lts # Build kernel with a different name _srcname=linux-4.9 -_pkgver=4.9.68 -_rtpatchver=rt60 +_pkgver=4.9.76 +_rtpatchver=rt61 pkgver=${_pkgver}_${_rtpatchver} pkgrel=1 arch=('x86_64') @@ -28,6 +28,7 @@ source=( '60-linux-rt-lts.hook' # pacman hook for depmod '90-linux-rt-lts.hook' # pacman hook for initramfs regeneration 'linux-rt-lts.preset' # standard config files for mkinitcpio ramdisk + 'change-default-console-loglevel.patch' 'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch' ) validpgpkeys=( @@ -36,17 +37,19 @@ validpgpkeys=( '64254695FFF0AA4466CC19E67B96E8162A8CF5D1' # Sebastian Andrzej Siewior '5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73' # Steven Rostedt 'E644E2F1D45FA0B2EAA02F33109F098506FF0B14' # Thomas Gleixner + '2B82682463E46862339A88A90A120DD923EEDD5F' # Julia J. Cartwright ) sha256sums=('029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a' 'SKIP' - 'd2e3dbe2ec7b10dec3d9819a0fd6ce4374d939ab7d8fb0b115ba6110d0dfb22a' + '9bc56c158c42d682fc631c2ed98da54bac26c7f0796d75999e48dd4a09b7ad64' 'SKIP' - '9873613e76950c4728cfb6b108fe3dcf19883836bbed4849fc9bf8afe0eefd7f' + '836e2d9f9507957eae69e74f383497370c446386e9c5a31e54fd8d50c2828d3a' 'SKIP' - '9e59614db3ccaa9a0638140df50515f31e51ab642f7559b02c9edb4c80c3092d' + '1320564cb37cdcbc3e5892b920da331e58eabc363d634b7e95111b6432bec0e3' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06') _kernelname=${pkgbase#linux} @@ -62,6 +65,11 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) + # remove this when a Kconfig knob is made available by upstream + # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) + patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" + # add realtime patch msg "applying patch-${_pkgver}-${_rtpatchver}.patch" patch -Np1 -i ../patch-${_pkgver}-${_rtpatchver}.patch diff --git a/change-default-console-loglevel.patch b/change-default-console-loglevel.patch new file mode 100644 index 0000000..11da2a9 --- /dev/null +++ b/change-default-console-loglevel.patch @@ -0,0 +1,11 @@ +--- linux-3.16/include/linux/printk.h.old 2014-08-04 18:48:30.686043266 +0200 ++++ linux-3.16/include/linux/printk.h 2014-08-04 18:48:47.706218528 +0200 +@@ -37,7 +37,7 @@ + #define CONSOLE_LOGLEVEL_SILENT 0 /* Mum's the word */ + #define CONSOLE_LOGLEVEL_MIN 1 /* Minimum loglevel we let people use */ + #define CONSOLE_LOGLEVEL_QUIET 4 /* Shhh ..., when booted with "quiet" */ +-#define CONSOLE_LOGLEVEL_DEFAULT 7 /* anything MORE serious than KERN_DEBUG */ ++#define CONSOLE_LOGLEVEL_DEFAULT 4 /* anything MORE serious than KERN_DEBUG */ + #define CONSOLE_LOGLEVEL_DEBUG 10 /* issue debug messages */ + #define CONSOLE_LOGLEVEL_MOTORMOUTH 15 /* You can't shut this one up */ + diff --git a/config b/config index f8ea868..2ee8df4 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.68 Kernel Configuration +# Linux/x86 4.9.76 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -166,7 +166,7 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y +# CONFIG_CGROUP_PERF is not set # CONFIG_CGROUP_DEBUG is not set # CONFIG_CHECKPOINT_RESTORE is not set CONFIG_NAMESPACES=y @@ -234,7 +234,7 @@ CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB_DEBUG=y # CONFIG_COMPAT_BRK is not set CONFIG_SLUB=y -CONFIG_SLAB_FREELIST_RANDOM=y +# CONFIG_SLAB_FREELIST_RANDOM is not set # CONFIG_SYSTEM_DATA_VERIFICATION is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y @@ -370,10 +370,10 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y CONFIG_CFQ_GROUP_IOSCHED=y -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_DEFAULT_IOSCHED="deadline" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=m @@ -404,8 +404,7 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_HYPERVISOR_GUEST=y CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_DEBUG is not set -CONFIG_PARAVIRT_SPINLOCKS=y -# CONFIG_QUEUED_LOCK_STAT is not set +# CONFIG_PARAVIRT_SPINLOCKS is not set CONFIG_XEN=y CONFIG_XEN_DOM0=y CONFIG_XEN_PVHVM=y @@ -577,8 +576,6 @@ CONFIG_HZ_300=y CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y -CONFIG_KEXEC_FILE=y -# CONFIG_KEXEC_VERIFY_SIG is not set CONFIG_CRASH_DUMP=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 @@ -1460,7 +1457,7 @@ CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y CONFIG_SOCK_CGROUP_DATA=y -# CONFIG_CGROUP_NET_PRIO is not set +CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y @@ -6373,7 +6370,7 @@ CONFIG_VT6656=m # # Light sensors # -# CONFIG_SENSORS_ISL29018 is not set +CONFIG_SENSORS_ISL29018=m # CONFIG_SENSORS_ISL29028 is not set # CONFIG_TSL2583 is not set # CONFIG_TSL2x7x is not set @@ -7431,7 +7428,7 @@ CONFIG_SCHEDSTATS=y # CONFIG_SCHED_STACK_END_CHECK is not set # CONFIG_DEBUG_TIMEKEEPING is not set CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_PREEMPT is not set +CONFIG_DEBUG_PREEMPT=y # # Lock Debugging (spinlocks, mutexes, etc...) @@ -7517,13 +7514,14 @@ CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y -# CONFIG_HIST_TRIGGERS is not set +CONFIG_TRACING_MAP=y +CONFIG_HIST_TRIGGERS=y # CONFIG_MMIOTRACE_TEST is not set # CONFIG_TRACEPOINT_BENCHMARK is not set -CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_TRACE_ENUM_MAP_FILE is not set -# CONFIG_TRACING_EVENTS_GPIO is not set +CONFIG_TRACING_EVENTS_GPIO=y # # Runtime Testing @@ -7603,12 +7601,13 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 CONFIG_KEYS=y CONFIG_KEYS_COMPAT=y CONFIG_PERSISTENT_KEYRINGS=y -CONFIG_BIG_KEYS=y +# CONFIG_BIG_KEYS is not set CONFIG_TRUSTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y +CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set CONFIG_SECURITY_PATH=y @@ -7640,15 +7639,15 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_RNG_DEFAULT=y +CONFIG_CRYPTO_RNG_DEFAULT=m CONFIG_CRYPTO_AKCIPHER2=y CONFIG_CRYPTO_AKCIPHER=m CONFIG_CRYPTO_KPP2=y @@ -7660,8 +7659,8 @@ CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_WORKQUEUE=y @@ -7676,16 +7675,16 @@ CONFIG_CRYPTO_GLUE_HELPER_X86=m # Authenticated Encryption with Associated Data # CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_GCM=m CONFIG_CRYPTO_CHACHA20POLY1305=m -CONFIG_CRYPTO_SEQIV=y +CONFIG_CRYPTO_SEQIV=m CONFIG_CRYPTO_ECHAINIV=m # # Block modes # CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_CTR=m CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_LRW=m @@ -7697,7 +7696,7 @@ CONFIG_CRYPTO_KEYWRAP=m # Hash modes # CONFIG_CRYPTO_CMAC=m -CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_HMAC=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_VMAC=m @@ -7710,7 +7709,7 @@ CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m -CONFIG_CRYPTO_GHASH=y +CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_POLY1305_X86_64=m CONFIG_CRYPTO_MD4=m @@ -7727,7 +7726,7 @@ CONFIG_CRYPTO_SHA512_SSSE3=m CONFIG_CRYPTO_SHA1_MB=m CONFIG_CRYPTO_SHA256_MB=m CONFIG_CRYPTO_SHA512_MB=m -CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_TGR192=m @@ -7787,12 +7786,12 @@ CONFIG_CRYPTO_LZ4HC=m # Random Number Generation # CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_DRBG_MENU=y +CONFIG_CRYPTO_DRBG_MENU=m CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y -CONFIG_CRYPTO_DRBG=y -CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_DRBG=m +CONFIG_CRYPTO_JITTERENTROPY=m CONFIG_CRYPTO_USER_API=m CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m -- cgit v1.2.3