diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-30 18:46:38 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-30 18:46:38 +0200 |
commit | 8ae3d60a53d943960674c71d185272c42c27c026 (patch) | |
tree | 16ce2bb485a46aa9c2afb7d4ad8288b56fe2138f | |
parent | aef4762a6251b17b054686e725cebfa644dd3458 (diff) | |
parent | c5c99fe786194587aab725804c9aead4e7b0c62e (diff) | |
download | kernel-8ae3d60a53d943960674c71d185272c42c27c026.tar.gz kernel-8ae3d60a53d943960674c71d185272c42c27c026.tar.xz kernel-8ae3d60a53d943960674c71d185272c42c27c026.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
34 files changed, 228 insertions, 147 deletions
diff --git a/.gitignore b/.gitignore index 93aa862ec..0139918a6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ clog *.sign kernel-[234].*/ perf-man-*.tar.gz +kernel-headers/ +kernel-tools/ diff --git a/configs/fedora/generic/CONFIG_AFS_DEBUG b/configs/fedora/generic/CONFIG_AFS_DEBUG new file mode 100644 index 000000000..1f0b35b94 --- /dev/null +++ b/configs/fedora/generic/CONFIG_AFS_DEBUG @@ -0,0 +1 @@ +CONFIG_AFS_DEBUG=y diff --git a/configs/fedora/generic/CONFIG_AFS_FS b/configs/fedora/generic/CONFIG_AFS_FS index b622cdb8e..c6a8dc5f1 100644 --- a/configs/fedora/generic/CONFIG_AFS_FS +++ b/configs/fedora/generic/CONFIG_AFS_FS @@ -1 +1 @@ -# CONFIG_AFS_FS is not set +CONFIG_AFS_FS=m diff --git a/configs/fedora/generic/CONFIG_AFS_FSCACHE b/configs/fedora/generic/CONFIG_AFS_FSCACHE new file mode 100644 index 000000000..9183d0b00 --- /dev/null +++ b/configs/fedora/generic/CONFIG_AFS_FSCACHE @@ -0,0 +1 @@ +CONFIG_AFS_FSCACHE=y diff --git a/configs/fedora/generic/CONFIG_AF_RXRPC b/configs/fedora/generic/CONFIG_AF_RXRPC index b703c0366..38801771c 100644 --- a/configs/fedora/generic/CONFIG_AF_RXRPC +++ b/configs/fedora/generic/CONFIG_AF_RXRPC @@ -1 +1 @@ -# CONFIG_AF_RXRPC is not set +CONFIG_AF_RXRPC=m diff --git a/configs/fedora/generic/CONFIG_AF_RXRPC_DEBUG b/configs/fedora/generic/CONFIG_AF_RXRPC_DEBUG new file mode 100644 index 000000000..bd42ab421 --- /dev/null +++ b/configs/fedora/generic/CONFIG_AF_RXRPC_DEBUG @@ -0,0 +1 @@ +CONFIG_AF_RXRPC_DEBUG=y diff --git a/configs/fedora/generic/CONFIG_AF_RXRPC_INJECT_LOSS b/configs/fedora/generic/CONFIG_AF_RXRPC_INJECT_LOSS new file mode 100644 index 000000000..5fd291dc1 --- /dev/null +++ b/configs/fedora/generic/CONFIG_AF_RXRPC_INJECT_LOSS @@ -0,0 +1 @@ +# CONFIG_AF_RXRPC_INJECT_LOSS is not set diff --git a/configs/fedora/generic/CONFIG_AF_RXRPC_IPV6 b/configs/fedora/generic/CONFIG_AF_RXRPC_IPV6 new file mode 100644 index 000000000..2400ed49c --- /dev/null +++ b/configs/fedora/generic/CONFIG_AF_RXRPC_IPV6 @@ -0,0 +1 @@ +CONFIG_AF_RXRPC_IPV6=y diff --git a/configs/fedora/generic/CONFIG_RXKAD b/configs/fedora/generic/CONFIG_RXKAD new file mode 100644 index 000000000..806e0eb65 --- /dev/null +++ b/configs/fedora/generic/CONFIG_RXKAD @@ -0,0 +1 @@ +CONFIG_RXKAD=y diff --git a/configs/fedora/generic/arm/CONFIG_QRTR b/configs/fedora/generic/arm/CONFIG_QRTR index 19f911ca5..88325af84 100644 --- a/configs/fedora/generic/arm/CONFIG_QRTR +++ b/configs/fedora/generic/arm/CONFIG_QRTR @@ -1 +1 @@ -# CONFIG_QRTR is not set +CONFIG_QRTR=m diff --git a/configs/fedora/generic/arm/CONFIG_QRTR_SMD b/configs/fedora/generic/arm/CONFIG_QRTR_SMD new file mode 100644 index 000000000..3cc59077c --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_QRTR_SMD @@ -0,0 +1 @@ +CONFIG_QRTR_SMD=m diff --git a/configs/fedora/generic/arm/CONFIG_QRTR_TUN b/configs/fedora/generic/arm/CONFIG_QRTR_TUN new file mode 100644 index 000000000..4fb219494 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_QRTR_TUN @@ -0,0 +1 @@ +CONFIG_QRTR_TUN=m diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_CRC32_ARM64 b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_CRC32_ARM64 index 845ef5159..183b573cf 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_CRC32_ARM64 +++ b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_CRC32_ARM64 @@ -1 +1 @@ -CONFIG_CRYPTO_CRC32_ARM64=m +CONFIG_CRYPTO_CRC32_ARM64=y diff --git a/efi-lockdown.patch b/efi-lockdown.patch index 4e6ed15c2..4f84f4715 100644 --- a/efi-lockdown.patch +++ b/efi-lockdown.patch @@ -1525,45 +1525,6 @@ index 102160ff5c66..4f5757732553 100644 -- 2.14.3 -From 6b5a9eaaa9d57de43e5d2fddb0087cc2d9450abc Mon Sep 17 00:00:00 2001 -From: David Howells <dhowells@redhat.com> -Date: Wed, 4 Apr 2018 14:45:38 +0100 -Subject: [PATCH 22/24] bpf: Restrict kernel image access functions when the - kernel is locked down - -There are some bpf functions can be used to read kernel memory: -bpf_probe_read, bpf_probe_write_user and bpf_trace_printk. These allow -private keys in kernel memory (e.g. the hibernation image signing key) to -be read by an eBPF program. - -Completely prohibit the use of BPF when the kernel is locked down. - -Suggested-by: Alexei Starovoitov <alexei.starovoitov@gmail.com> -Signed-off-by: David Howells <dhowells@redhat.com> -cc: netdev@vger.kernel.org -cc: Chun-Yi Lee <jlee@suse.com> -cc: Alexei Starovoitov <alexei.starovoitov@gmail.com> ---- - kernel/bpf/syscall.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 0244973ee544..7457f2676c6d 100644 ---- a/kernel/bpf/syscall.c -+++ b/kernel/bpf/syscall.c -@@ -2333,6 +2333,9 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz - if (sysctl_unprivileged_bpf_disabled && !capable(CAP_SYS_ADMIN)) - return -EPERM; - -+ if (kernel_is_locked_down("BPF")) -+ return -EPERM; -+ - err = bpf_check_uarg_tail_zero(uattr, sizeof(attr), size); - if (err) - return err; --- -2.14.3 - From d44a6ae3a7cad5cd9b01f7b0a48b3c788af968e8 Mon Sep 17 00:00:00 2001 From: David Howells <dhowells@redhat.com> Date: Wed, 4 Apr 2018 14:45:38 +0100 @@ -1 +1 @@ -0519359784328bfa92bf0931bf0cff3b58c16932 +58c3f14f86c98e4030b03e6ab929fa3190565d4f diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 1763aa631..1fe71a731 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -152,8 +152,13 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m CONFIG_AHCI_CEVA=m CONFIG_AHCI_MVEBU=m # CONFIG_AHCI_QORIQ is not set @@ -1102,7 +1107,7 @@ CONFIG_CRYPTO_CHACHA20_NEON=m CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=m CONFIG_CRYPTO_CRC32_ARM64_CE=m -CONFIG_CRYPTO_CRC32_ARM64=m +CONFIG_CRYPTO_CRC32_ARM64=y CONFIG_CRYPTO_CRC32_ARM_CE=m CONFIG_CRYPTO_CRC32C_VPMSUM=m CONFIG_CRYPTO_CRC32C=y @@ -4686,7 +4691,9 @@ CONFIG_QLGE=m # CONFIG_QNX6FS_FS is not set # CONFIG_QORIQ_CPUFREQ is not set # CONFIG_QORIQ_THERMAL is not set -# CONFIG_QRTR is not set +CONFIG_QRTR=m +CONFIG_QRTR_SMD=m +CONFIG_QRTR_TUN=m CONFIG_QSEMI_PHY=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y @@ -5057,6 +5064,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m # CONFIG_SAMPLES is not set # CONFIG_SAMSUNG_USBPHY is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 5a1bf0d66..6fa6fe8e0 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -152,8 +152,13 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m CONFIG_AHCI_CEVA=m CONFIG_AHCI_MVEBU=m # CONFIG_AHCI_QORIQ is not set @@ -1101,7 +1106,7 @@ CONFIG_CRYPTO_CHACHA20_NEON=m CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=m CONFIG_CRYPTO_CRC32_ARM64_CE=m -CONFIG_CRYPTO_CRC32_ARM64=m +CONFIG_CRYPTO_CRC32_ARM64=y CONFIG_CRYPTO_CRC32_ARM_CE=m CONFIG_CRYPTO_CRC32C_VPMSUM=m CONFIG_CRYPTO_CRC32C=y @@ -4663,7 +4668,9 @@ CONFIG_QLGE=m # CONFIG_QNX6FS_FS is not set # CONFIG_QORIQ_CPUFREQ is not set # CONFIG_QORIQ_THERMAL is not set -# CONFIG_QRTR is not set +CONFIG_QRTR=m +CONFIG_QRTR_SMD=m +CONFIG_QRTR_TUN=m CONFIG_QSEMI_PHY=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y @@ -5034,6 +5041,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m # CONFIG_SAMPLES is not set # CONFIG_SAMSUNG_USBPHY is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 816c1243c..09b607aad 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -126,8 +126,13 @@ CONFIG_AEABI=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AHCI_CEVA is not set CONFIG_AHCI_DM816=m CONFIG_AHCI_IMX=m @@ -4962,7 +4967,9 @@ CONFIG_QLGE=m # CONFIG_QNX6FS_FS is not set # CONFIG_QORIQ_CPUFREQ is not set # CONFIG_QORIQ_THERMAL is not set -# CONFIG_QRTR is not set +CONFIG_QRTR=m +CONFIG_QRTR_SMD=m +CONFIG_QRTR_TUN=m CONFIG_QSEMI_PHY=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y @@ -5373,6 +5380,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m CONFIG_S3C2410_WATCHDOG=m # CONFIG_SAMPLES is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index a2848a025..3e9d515a8 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -126,8 +126,13 @@ CONFIG_AEABI=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AHCI_CEVA is not set CONFIG_AHCI_DM816=m CONFIG_AHCI_MVEBU=m @@ -4687,7 +4692,9 @@ CONFIG_QLGE=m # CONFIG_QNX6FS_FS is not set # CONFIG_QORIQ_CPUFREQ is not set # CONFIG_QORIQ_THERMAL is not set -# CONFIG_QRTR is not set +CONFIG_QRTR=m +CONFIG_QRTR_SMD=m +CONFIG_QRTR_TUN=m CONFIG_QSEMI_PHY=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y @@ -5066,6 +5073,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m CONFIG_S3C2410_WATCHDOG=m # CONFIG_SAMPLES is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index b015d2d9c..78538b8f1 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -126,8 +126,13 @@ CONFIG_AEABI=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AHCI_CEVA is not set CONFIG_AHCI_DM816=m CONFIG_AHCI_MVEBU=m @@ -4664,7 +4669,9 @@ CONFIG_QLGE=m # CONFIG_QNX6FS_FS is not set # CONFIG_QORIQ_CPUFREQ is not set # CONFIG_QORIQ_THERMAL is not set -# CONFIG_QRTR is not set +CONFIG_QRTR=m +CONFIG_QRTR_SMD=m +CONFIG_QRTR_TUN=m CONFIG_QSEMI_PHY=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y @@ -5043,6 +5050,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m CONFIG_S3C2410_WATCHDOG=m # CONFIG_SAMPLES is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 1eb3463ef..e412fde9c 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -126,8 +126,13 @@ CONFIG_AEABI=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AHCI_CEVA is not set CONFIG_AHCI_DM816=m CONFIG_AHCI_IMX=m @@ -4939,7 +4944,9 @@ CONFIG_QLGE=m # CONFIG_QNX6FS_FS is not set # CONFIG_QORIQ_CPUFREQ is not set # CONFIG_QORIQ_THERMAL is not set -# CONFIG_QRTR is not set +CONFIG_QRTR=m +CONFIG_QRTR_SMD=m +CONFIG_QRTR_TUN=m CONFIG_QSEMI_PHY=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y @@ -5350,6 +5357,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m CONFIG_S3C2410_WATCHDOG=m # CONFIG_SAMPLES is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index fa5df9793..f8cdff312 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -163,8 +163,13 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m CONFIG_AGP_ALI=y CONFIG_AGP_AMD64=y CONFIG_AGP_AMD=y @@ -4746,6 +4751,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m # CONFIG_SAMPLES is not set CONFIG_SAMSUNG_LAPTOP=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 4ee01eca5..caea5f79c 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -163,8 +163,13 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m CONFIG_AGP_ALI=y CONFIG_AGP_AMD64=y CONFIG_AGP_AMD=y @@ -4770,6 +4775,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m # CONFIG_SAMPLES is not set CONFIG_SAMSUNG_LAPTOP=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index ee915442a..1771f0c47 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -163,8 +163,13 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m CONFIG_AGP_ALI=y CONFIG_AGP_AMD64=y CONFIG_AGP_AMD=y @@ -4770,6 +4775,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m # CONFIG_SAMPLES is not set CONFIG_SAMSUNG_LAPTOP=m diff --git a/kernel-i686.config b/kernel-i686.config index 7a011e725..65c071fed 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -163,8 +163,13 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m CONFIG_AGP_ALI=y CONFIG_AGP_AMD64=y CONFIG_AGP_AMD=y @@ -4746,6 +4751,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m # CONFIG_SAMPLES is not set CONFIG_SAMSUNG_LAPTOP=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 16b2d744f..bfb58aeb7 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -125,8 +125,13 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set # CONFIG_AHCI_CEVA is not set # CONFIG_AHCI_QORIQ is not set @@ -4510,6 +4515,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m # CONFIG_SAMPLES is not set # CONFIG_SAMSUNG_USBPHY is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 78fab8d12..b3cf0a903 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -125,8 +125,13 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set # CONFIG_AHCI_CEVA is not set # CONFIG_AHCI_QORIQ is not set @@ -4484,6 +4489,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m # CONFIG_SAMPLES is not set # CONFIG_SAMSUNG_USBPHY is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 0de5d16a5..a50f9e8a9 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -126,8 +126,13 @@ CONFIG_ADAPTEC_STARFIRE=m CONFIG_AFFS_FS=m CONFIG_AFIUCV=m CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AHCI_CEVA is not set # CONFIG_AHCI_QORIQ is not set # CONFIG_AIC79XX_BUILD_FIRMWARE is not set @@ -4398,6 +4403,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m CONFIG_S390_CCW_IOMMU=y CONFIG_S390_GUEST_OLD_TRANSPORT=y diff --git a/kernel-s390x.config b/kernel-s390x.config index d73c9b2b1..ac7b431f2 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -126,8 +126,13 @@ CONFIG_ADAPTEC_STARFIRE=m CONFIG_AFFS_FS=m CONFIG_AFIUCV=m CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AHCI_CEVA is not set # CONFIG_AHCI_QORIQ is not set # CONFIG_AIC79XX_BUILD_FIRMWARE is not set @@ -4372,6 +4377,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m CONFIG_S390_CCW_IOMMU=y CONFIG_S390_GUEST_OLD_TRANSPORT=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 806433db2..5d00ce9a5 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -166,8 +166,13 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m CONFIG_AGP_ALI=y CONFIG_AGP_AMD64=y CONFIG_AGP_AMD=y @@ -4812,6 +4817,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m # CONFIG_SAMPLES is not set CONFIG_SAMSUNG_LAPTOP=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 52696aea2..496e098fb 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -166,8 +166,13 @@ CONFIG_ADAPTEC_STARFIRE=m # CONFIG_AFE4404 is not set CONFIG_AFFS_FS=m CONFIG_AF_KCM=m -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m CONFIG_AGP_ALI=y CONFIG_AGP_AMD64=y CONFIG_AGP_AMD=y @@ -4788,6 +4793,7 @@ CONFIG_RTLLIB=m CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S2IO=m # CONFIG_SAMPLES is not set CONFIG_SAMSUNG_LAPTOP=m diff --git a/kernel.spec b/kernel.spec index fed818444..9223c4fb8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 1 # The git snapshot level -%define gitrev 0 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -130,7 +130,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Kernel headers are being split out into a separate package %define with_headers 0 @@ -1883,6 +1883,19 @@ fi # # %changelog +* Thu Aug 30 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc1.git3.1 +- Linux v4.19-rc1-124-g58c3f14f86c9 + +* Wed Aug 29 2018 Jeremy Cline <jeremy@jcline.org> +- Enable the AFS module (rhbz 1616016) + +* Wed Aug 29 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc1.git2.1 +- Linux v4.19-rc1-95-g3f16503b7d22 + +* Tue Aug 28 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc1.git1.1 +- Linux v4.19-rc1-88-g050cdc6c9501 +- Re-enable debugging options + * Mon Aug 27 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc1.git0.1 - Linux v4.19-rc1 diff --git a/scripts/create_headers_tarball.sh b/scripts/create_headers_tarball.sh index e96fe57f4..575b2bb8e 100755 --- a/scripts/create_headers_tarball.sh +++ b/scripts/create_headers_tarball.sh @@ -1,74 +1,44 @@ #!/bin/bash # # This script is aimed at generating the headers from the kernel sources. -# Please do a git checkout of the kernel sources, or run until %prep step of -# kernel rpm build. Then go into the directory with the sources, and run this -# script +# You should have a checkout of kernel-headers inside the kernel directory 'fedpkg clone kernel-headers' +# You will need to prep the kernel sources with 'make prep' or 'fedpkg prep' before running this script # # Author: Herton R. Krzesinski <herton@redhat.com> +# Author: Justin M. Forbes <jforbes@redhat.com> + +# Location of kernel-headers checkout +CURRENTDIR=`pwd` +PKGLOC='kernel-headers' + +if [ ! -f $PKGLOC/kernel-headers.spec ]; then + echo "Missing checkout of kernel-headers in $PKGLOC" + exit 1 +fi + +# Kernel version information taken from kernel.spec and change to prepared sources directory +MAJORVER='4' +RELEASED=`grep "%global released_kernel" kernel.spec| cut -d ' ' -f 3` +BASERELEASE=`cat kernel.spec | grep "%global baserelease" | cut -d ' ' -f 3` +BASE=`grep "%define base_sublevel" kernel.spec| cut -d ' ' -f 3` +STABLE=`grep "%define stable_update" kernel.spec| cut -d ' ' -f 3` +RC=`grep "%global rcrev" kernel.spec| cut -d ' ' -f 3` +GITREV=`grep "%define gitrev" kernel.spec| cut -d ' ' -f 3` +if [ $RELEASED -eq 0 ]; then + cd kernel-$MAJORVER.$BASE.fc?? + NEWBASE=$(($BASE+1)) + KVER=$MAJORVER.$NEWBASE.0-0.rc$RC.git$GITREV.$BASERELEASE + cd linux-$MAJORVER.$NEWBASE.0-0.rc$RC.git$GITREV.$BASERELEASE.fc*/ +else + cd kernel-$MAJORVER.$BASE.fc??/linux-$MAJORVER.$BASE.$STABLE-$BASERELEASE.fc*/ + KVER=$MAJORVER.$BASE.$STABLE-$BASERELEASE +fi # ARCH_LIST below has the default list of supported architectures # (the architectures names may be different from rpm, you list here the # names of arch/<arch> directories in the kernel sources) ARCH_LIST="arm arm64 powerpc s390 x86" -# If the kernel Makefile doesn't contain enough information for the tarball -# release, you can specify the release of the package so it'll be included -# in the name of the created tarball -TB_RELEASE="" - -# If kernel Makefile has the package release number, you can specify the name of -# Makefile variable here. -MAKE_RELEASE="" - -# Extra string (usually dist tag) that goes into the tarball name -EXTRA="" - -while [ ! -z "$1" ]; do - opt="$1" - case $opt in - --arch-list|-a) - ARCH_LIST="$2" - shift - ;; - --extra|-e) - EXTRA="$2" - shift - ;; - --make-release|-m) - MAKE_RELEASE=$2 - shift - ;; - --release|-r) - TB_RELEASE=$2 - shift - ;; - *) - echo "Unknown option ($1) to $0" - exit - ;; - esac - shift -done - -KVERSION=$(cat Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}') -KPATCHLEVEL=$(cat Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}') -KSUBLEVEL=$(cat Makefile | sed -ne '/^SUBLEVEL\ =\ /{s///;p;q}') -TB_VERSION=$KVERSION.$KPATCHLEVEL.$KSUBLEVEL -if [ -z "$TB_RELEASE" ]; then - KEXTRAVERSION=$(cat Makefile | sed -ne '/^EXTRAVERSION\ =\ /{s///;p;q}') - DISTRO_RELEASE="" - if [ -n "$MAKE_RELEASE" ]; then - DISTRO_RELEASE=.$(cat Makefile | sed -ne "/^$MAKE_RELEASE\ =\ /{s///;p;q}") - fi - if [ -n "$KEXTRAVERSION" ]; then - KEXTRAVERSION=$(echo $KEXTRAVERSION | sed -e s/-/./) - TB_RELEASE=0$KEXTRAVERSION$DISTRO_RELEASE$EXTRA - else - TB_RELEASE=$DISTRO_RELEASE$EXTRA - fi -fi - headers_dir=$(mktemp -d) trap 'rm -rf "$headers_dir"' SIGHUP SIGINT SIGTERM EXIT @@ -77,9 +47,27 @@ find $headers_dir \ \( -name .install -o -name .check -o \ -name ..install.cmd -o -name ..check.cmd \) | xargs rm -f -TARBALL=$PWD/kernel-headers-$TB_VERSION-$TB_RELEASE.tar.xz +TARBALL=$CURRENTDIR/$PKGLOC/kernel-headers-$KVER.tar.xz pushd $headers_dir tar -Jcf $TARBALL * popd echo wrote $TARBALL + +# Update kernel-headers.spec +cd $CURRENTDIR/$PKGLOC/ + +BASE=$BASE perl -p -i -e 's|%define base_sublevel.*|%define base_sublevel $ENV{'BASE'}|' kernel-headers.spec +BASERELEASE=$(($BASERELEASE-1)) +BASERELEASE=$BASERELEASE perl -p -i -e 's|%global baserelease.*|%global baserelease $ENV{'BASERELEASE'}|' kernel-headers.spec + +if [ $RELEASED -eq 0 ]; then + RC=$RC perl -p -i -e 's|%global rcrev.*|%global rcrev $ENV{'RC'}|' kernel-headers.spec + GITREV=$GITREV perl -p -i -e 's|%define gitrev.*|%define gitrev $ENV{'GITREV'}|' kernel-headers.spec + rpmdev-bumpspec -c "Linux v$MAJORVER.$NEWBASE-rc$RC.git$GITREV" kernel-headers.spec +else + STABLE=$STABLE perl -p -i -e 's|%define stable_update.*|%define stable_update $ENV{'STABLE'}|' kernel-headers.spec + rpmdev-bumpspec -c "Linux v$MAJORVER.$BASE.$STABLE" kernel-headers.spec +fi +echo "Modified $CURRENTDIR/$PKGLOC/kernel-headers.spec" +echo "Don't forget to upload the sources" @@ -1,2 +1,3 @@ SHA512 (linux-4.18.tar.xz) = 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038 SHA512 (patch-4.19-rc1.xz) = 25c2bc180894f2e48a50876f858f75a060c91766ee494ce5467ce6f3a865dfca8774698d2da53eebd60a69f9bd8bfafa0c65115bf5e88c0eb0fe86c5e929b2f5 +SHA512 (patch-4.19-rc1-git3.xz) = 63d88f5f3529b5bd03d8b9f9491b3242c31acbfd3d82d5619510863ae102ffec9fc37de45050c98f3148f6c3dac82bc377fee5279adff778e64bdc73ca2c497d |