[OS-BUILD PATCHv4] Enable iSER on s390x
by Stefan Schulze Frielinghaus (via Email Bridge)
From: Stefan Schulze Frielinghaus <sfrielin(a)redhat.com>
Enable iSER on s390x
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=42303445
Tested: by IBM
Upstream Status: RHEL only
Signed-off-by: Stefan Schulze Frielinghaus <sfrielin(a)redhat.com>
diff --git a/redhat/configs/ark/generic/s390x/CONFIG_INFINIBAND_ISER b/redhat/configs/ark/generic/s390x/CONFIG_INFINIBAND_ISER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/s390x/CONFIG_INFINIBAND_ISER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INFINIBAND_ISER is not set
diff --git a/redhat/configs/ark/generic/s390x/CONFIG_INFINIBAND_ISERT b/redhat/configs/ark/generic/s390x/CONFIG_INFINIBAND_ISERT
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/s390x/CONFIG_INFINIBAND_ISERT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INFINIBAND_ISERT is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1536
2 years, 2 months
[OS-BUILD PATCHv3] Enable iSER on s390x
by Stefan Schulze Frielinghaus (via Email Bridge)
From: Stefan Schulze Frielinghaus <sfrielin(a)redhat.com>
Enable iSER on s390x
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=42303445
Tested: by IBM
Upstream Status: RHEL only
Signed-off-by: Stefan Schulze Frielinghaus <sfrielin(a)redhat.com>
diff --git a/redhat/configs/ark/generic/s390x/CONFIG_INFINIBAND_ISER b/redhat/configs/ark/generic/s390x/CONFIG_INFINIBAND_ISER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/s390x/CONFIG_INFINIBAND_ISER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INFINIBAND_ISER is not set
diff --git a/redhat/configs/ark/generic/s390x/CONFIG_INFINIBAND_ISERT b/redhat/configs/ark/generic/s390x/CONFIG_INFINIBAND_ISERT
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/s390x/CONFIG_INFINIBAND_ISERT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INFINIBAND_ISERT is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1536
2 years, 2 months
[OS-BUILD PATCH] Add dev_addr_lists_test to mod-internal.list
by Justin M. Forbes (via Email Bridge)
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Add dev_addr_lists_test to mod-internal.list
With the 5.17 merge window, we are now building the dev_addr_lists_test
kunit test module. This needs to be added to the mod-internal.list or we
end up with depmod failures.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/mod-internal.list b/redhat/mod-internal.list
index blahblah..blahblah 100644
--- a/redhat/mod-internal.list
+++ b/redhat/mod-internal.list
@@ -43,3 +43,4 @@ test_klp_state3
torture
refscale
memcpy_kunit
+dev_addr_lists_test
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1559
2 years, 2 months
[OS-BUILD PATCH] lib/crypto: add prompts back to crypto libraries
by Justin M. Forbes (via Email Bridge)
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
lib/crypto: add prompts back to crypto libraries
Commit 6048fdcc5f269 ("lib/crypto: blake2s: include as built-in") took
away a number of prompt texts from other crypto libraries. This makes
values flip from built-in to module when oldconfig runs, and causes
problems when these crypto libs need to be built in for thingslike
BIG_KEYS.
Fixes: 6048fdcc5f269 ("lib/crypto: blake2s: include as built-in")
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig
index blahblah..blahblah 100644
--- a/lib/crypto/Kconfig
+++ b/lib/crypto/Kconfig
@@ -40,7 +40,7 @@ config CRYPTO_LIB_CHACHA_GENERIC
of CRYPTO_LIB_CHACHA.
config CRYPTO_LIB_CHACHA
- tristate
+ tristate "ChaCha library interface"
depends on CRYPTO_ARCH_HAVE_LIB_CHACHA || !CRYPTO_ARCH_HAVE_LIB_CHACHA
select CRYPTO_LIB_CHACHA_GENERIC if CRYPTO_ARCH_HAVE_LIB_CHACHA=n
help
@@ -65,7 +65,7 @@ config CRYPTO_LIB_CURVE25519_GENERIC
of CRYPTO_LIB_CURVE25519.
config CRYPTO_LIB_CURVE25519
- tristate
+ tristate "Curve25519 scalar multiplication library"
depends on CRYPTO_ARCH_HAVE_LIB_CURVE25519 || !CRYPTO_ARCH_HAVE_LIB_CURVE25519
select CRYPTO_LIB_CURVE25519_GENERIC if CRYPTO_ARCH_HAVE_LIB_CURVE25519=n
help
@@ -100,7 +100,7 @@ config CRYPTO_LIB_POLY1305_GENERIC
of CRYPTO_LIB_POLY1305.
config CRYPTO_LIB_POLY1305
- tristate
+ tristate "Poly1305 library interface"
depends on CRYPTO_ARCH_HAVE_LIB_POLY1305 || !CRYPTO_ARCH_HAVE_LIB_POLY1305
select CRYPTO_LIB_POLY1305_GENERIC if CRYPTO_ARCH_HAVE_LIB_POLY1305=n
help
@@ -109,7 +109,7 @@ config CRYPTO_LIB_POLY1305
is available and enabled.
config CRYPTO_LIB_CHACHA20POLY1305
- tristate
+ tristate "ChaCha20-Poly1305 AEAD support (8-byte nonce library version)"
depends on CRYPTO_ARCH_HAVE_LIB_CHACHA || !CRYPTO_ARCH_HAVE_LIB_CHACHA
depends on CRYPTO_ARCH_HAVE_LIB_POLY1305 || !CRYPTO_ARCH_HAVE_LIB_POLY1305
select CRYPTO_LIB_CHACHA
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1552
2 years, 2 months
❌ FAIL: Test report for kernel 5.15.14-100.fc34 (fedora-34)
by CKI Project
Hello,
We ran automated tests on the following kernel build:
Kernel package: kernel-5.15.14-100.fc34
Task URL: https://koji.fedoraproject.org/koji/taskinfo?taskID=81104676
The results of these automated tests are provided below.
Overall result: FAILED (see details below)
Tests: FAILED
One or more kernel tests failed:
s390x:
❌ Boot test
❌ Reboot test
❌ Boot test
❌ Reboot test
❌ Boot test
❌ Reboot test
❌ Boot test
❌ Reboot test
aarch64:
❌ Boot test
❌ Reboot test
❌ xfstests - ext4
❌ xfstests - xfs
❌ Boot test
❌ Reboot test
❌ Boot test
❌ Reboot test
❌ Boot test
❌ Reboot test
❌ Boot test
❌ Reboot test
ppc64le:
❌ Boot test
❌ Reboot test
❌ Boot test
❌ Reboot test
❌ xfstests - ext4
❌ xfstests - xfs
❌ Boot test
❌ Reboot test
❌ Boot test
❌ Reboot test
x86_64:
❌ Boot test
❌ Reboot test
❌ Boot test
❌ Reboot test
❌ Boot test
❌ Reboot test
❌ xfstests - ext4
All kernel binaries, config files, and logs are available for download here:
https://arr-cki-prod-datawarehouse-public.s3.amazonaws.com/index.html?pre...
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
For the full detail on our testing procedures, please scroll to the bottom of
this message.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Hardware testing
----------------
We booted each kernel and ran the following tests:
aarch64:
Host 1:
❌ Boot test
❌ Reboot test
❌ xfstests - ext4
❌ xfstests - xfs
✅ Storage: swraid mdadm raid_module test
🚧 ❌ xfstests - btrfs
🚧 ✅ Storage blktests - blk
🚧 ✅ Storage blktests - nvme-tcp
🚧 ✅ Storage block - filesystem fio test
🚧 ✅ Storage block - queue scheduler test
🚧 ✅ Storage block - storage fio numa
🚧 ✅ storage: software RAID testing
🚧 ✅ stress: stress-ng - interrupt
🚧 ✅ stress: stress-ng - cpu
🚧 ✅ stress: stress-ng - cpu-cache
🚧 ✅ stress: stress-ng - memory
🚧 ✅ stress: stress-ng - os
Host 2:
❌ Boot test
❌ Reboot test
🚧 ✅ Storage blktests - srp
Host 3:
❌ Boot test
❌ Reboot test
✅ Ethernet drivers sanity - mlx5
Host 4:
❌ Boot test
❌ Reboot test
✅ ACPI table test
✅ LTP - cve
✅ LTP - sched
✅ LTP - syscalls
✅ LTP - can
✅ LTP - commands
✅ LTP - containers
✅ LTP - dio
✅ LTP - fs
✅ LTP - fsx
✅ LTP - math
✅ LTP - hugetlb
✅ LTP - mm
✅ LTP - nptl
✅ LTP - pty
✅ LTP - ipc
✅ LTP - tracing
✅ LTP: openposix test suite
✅ CIFS Connectathon
✅ Loopdev Sanity
✅ Memory: fork_mem
✅ Memory function: memfd_create
✅ AMTU (Abstract Machine Test Utility)
✅ Ethernet drivers sanity
🚧 ✅ NFS Connectathon
Host 5:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test
⚡⚡⚡ Reboot test
🚧 ⚡⚡⚡ Storage blktests - nvmeof-mp
Host 6:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test
⚡⚡⚡ Reboot test
🚧 ⚡⚡⚡ Storage blktests - nvmeof-mp
Host 7:
❌ Boot test
❌ Reboot test
🚧 ❌ Storage blktests - nvmeof-mp
ppc64le:
Host 1:
❌ Boot test
❌ Reboot test
🚧 ✅ Storage blktests - nvmeof-mp
Host 2:
❌ Boot test
❌ Reboot test
❌ xfstests - ext4
❌ xfstests - xfs
✅ Storage: swraid mdadm raid_module test
🚧 ❌ xfstests - btrfs
🚧 ✅ Storage blktests - blk
🚧 ✅ Storage blktests - nvme-tcp
🚧 ✅ Storage block - filesystem fio test
🚧 ✅ Storage block - queue scheduler test
🚧 ✅ Storage block - storage fio numa
🚧 ✅ Storage: lvm device-mapper test - upstream
🚧 ✅ storage: software RAID testing
Host 3:
❌ Boot test
❌ Reboot test
✅ LTP - cve
✅ LTP - sched
✅ LTP - syscalls
✅ LTP - can
✅ LTP - commands
✅ LTP - containers
✅ LTP - dio
✅ LTP - fs
✅ LTP - fsx
✅ LTP - math
✅ LTP - hugetlb
✅ LTP - mm
✅ LTP - nptl
✅ LTP - pty
✅ LTP - ipc
✅ LTP - tracing
✅ LTP: openposix test suite
✅ CIFS Connectathon
✅ Loopdev Sanity
✅ Memory: fork_mem
✅ Memory function: memfd_create
✅ AMTU (Abstract Machine Test Utility)
✅ Ethernet drivers sanity
🚧 ✅ xarray-idr-radixtree-test
🚧 ✅ NFS Connectathon
Host 4:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test
⚡⚡⚡ Reboot test
🚧 ⚡⚡⚡ Storage blktests - srp
Host 5:
❌ Boot test
❌ Reboot test
🚧 ✅ Storage blktests - srp
s390x:
Host 1:
❌ Boot test
❌ Reboot test
🚧 ✅ Storage blktests - srp
Host 2:
❌ Boot test
❌ Reboot test
✅ LTP - cve
✅ LTP - sched
✅ LTP - syscalls
✅ LTP - can
✅ LTP - commands
✅ LTP - containers
✅ LTP - dio
✅ LTP - fs
✅ LTP - fsx
✅ LTP - math
✅ LTP - hugetlb
✅ LTP - mm
✅ LTP - nptl
✅ LTP - pty
✅ LTP - ipc
✅ LTP - tracing
✅ LTP: openposix test suite
✅ CIFS Connectathon
✅ Loopdev Sanity
✅ Memory: fork_mem
✅ Memory function: memfd_create
✅ AMTU (Abstract Machine Test Utility)
✅ Ethernet drivers sanity
🚧 ✅ NFS Connectathon
Host 3:
❌ Boot test
❌ Reboot test
✅ Storage: swraid mdadm raid_module test
🚧 ✅ Storage blktests - blk
🚧 ✅ Storage blktests - nvme-tcp
🚧 ✅ stress: stress-ng - interrupt
🚧 ✅ stress: stress-ng - cpu
🚧 ✅ stress: stress-ng - cpu-cache
🚧 ✅ stress: stress-ng - memory
🚧 ✅ stress: stress-ng - os
Host 4:
❌ Boot test
❌ Reboot test
🚧 ✅ Storage blktests - nvmeof-mp
x86_64:
Host 1:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test
⚡⚡⚡ Reboot test
🚧 ⚡⚡⚡ Storage blktests - srp
Host 2:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
❌ Boot test
❌ Reboot test
✅ ACPI table test
✅ LTP - cve
✅ LTP - sched
✅ LTP - syscalls
✅ LTP - can
✅ LTP - commands
✅ LTP - containers
✅ LTP - dio
✅ LTP - fs
✅ LTP - fsx
✅ LTP - math
✅ LTP - hugetlb
✅ LTP - mm
✅ LTP - nptl
✅ LTP - pty
✅ LTP - ipc
✅ LTP - tracing
⚡⚡⚡ LTP: openposix test suite
⚡⚡⚡ CIFS Connectathon
⚡⚡⚡ Loopdev Sanity
⚡⚡⚡ Memory: fork_mem
⚡⚡⚡ Memory function: memfd_create
⚡⚡⚡ AMTU (Abstract Machine Test Utility)
⚡⚡⚡ Ethernet drivers sanity
🚧 ⚡⚡⚡ xarray-idr-radixtree-test
🚧 ⚡⚡⚡ NFS Connectathon
Host 3:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test
⚡⚡⚡ Reboot test
🚧 ⚡⚡⚡ Storage blktests - nvmeof-mp
Host 4:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test
⚡⚡⚡ Reboot test
⚡⚡⚡ xfstests - ext4
⚡⚡⚡ xfstests - xfs
⚡⚡⚡ xfstests - nfsv4.2
⚡⚡⚡ Storage: swraid mdadm raid_module test
🚧 ⚡⚡⚡ xfstests - btrfs
🚧 ⚡⚡⚡ xfstests - cifsv3.11
🚧 ⚡⚡⚡ Storage blktests - blk
🚧 ⚡⚡⚡ Storage blktests - nvme-tcp
🚧 ⚡⚡⚡ Storage block - filesystem fio test
🚧 ⚡⚡⚡ Storage block - queue scheduler test
🚧 ⚡⚡⚡ Storage block - storage fio numa
🚧 ⚡⚡⚡ Storage: lvm device-mapper test - upstream
🚧 ⚡⚡⚡ storage: software RAID testing
🚧 ⚡⚡⚡ stress: stress-ng - interrupt
🚧 ⚡⚡⚡ stress: stress-ng - cpu
🚧 ⚡⚡⚡ stress: stress-ng - cpu-cache
🚧 ⚡⚡⚡ stress: stress-ng - memory
🚧 ⚡⚡⚡ stress: stress-ng - os
Host 5:
❌ Boot test
❌ Reboot test
🚧 ✅ Storage blktests - nvmeof-mp
Host 6:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
❌ Boot test
❌ Reboot test
❌ xfstests - ext4
⚡⚡⚡ xfstests - xfs
⚡⚡⚡ xfstests - nfsv4.2
⚡⚡⚡ Storage: swraid mdadm raid_module test
🚧 ⚡⚡⚡ xfstests - btrfs
🚧 ⚡⚡⚡ xfstests - cifsv3.11
🚧 ⚡⚡⚡ Storage blktests - blk
🚧 ⚡⚡⚡ Storage blktests - nvme-tcp
🚧 ⚡⚡⚡ Storage block - filesystem fio test
🚧 ⚡⚡⚡ Storage block - queue scheduler test
🚧 ⚡⚡⚡ Storage block - storage fio numa
🚧 ⚡⚡⚡ Storage: lvm device-mapper test - upstream
🚧 ⚡⚡⚡ storage: software RAID testing
🚧 ⚡⚡⚡ stress: stress-ng - interrupt
🚧 ⚡⚡⚡ stress: stress-ng - cpu
🚧 ⚡⚡⚡ stress: stress-ng - cpu-cache
🚧 ⚡⚡⚡ stress: stress-ng - memory
🚧 ⚡⚡⚡ stress: stress-ng - os
Test sources: https://gitlab.com/cki-project/kernel-tests
💚 Pull requests are welcome for new tests or improvements to existing tests!
Aborted tests
-------------
Tests that didn't complete running successfully are marked with ⚡⚡⚡.
If this was caused by an infrastructure issue, we try to mark that
explicitly in the report.
Waived tests
------------
If the test run included waived tests, they are marked with 🚧. Such tests are
executed but their results are not taken into account. Tests are waived when
their results are not reliable enough, e.g. when they're just introduced or are
being fixed.
Testing timeout
---------------
We aim to provide a report within reasonable timeframe. Tests that haven't
finished running yet are marked with ⏱.
2 years, 2 months
[OS-BUILD PATCH] kernel.spec: Add glibc-static build requirement
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava <prarit(a)redhat.com>
kernel.spec: Add glibc-static build requirement
CKI and brew builds resulted in two different values for
CONFIG_CC_CAN_LINK_STATIC. In CKI CONFIG_CC_CAN_LINK_STATIC=y while in
brew CONFIG_CC_CAN_LINK_STATIC was not defined. This occurs because
glibc-static is installed on the CKI build containers and was not
installed in brew.
In order to guarantee consistency across build systems add a build
requirement for the glibc-static package.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -585,6 +585,8 @@ BuildRequires: net-tools, hostname, bc, elfutils-devel
BuildRequires: dwarves
BuildRequires: python3-devel
BuildRequires: gcc-plugin-devel
+# required for CONFIG_CC_CAN_LINK_STATIC=y
+BuildRequires: glibc-static
%ifnarch %{nobuildarches} noarch
BuildRequires: bpftool
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1538
2 years, 2 months
[OS-BUILD PATCH] redhat/configs: enable CONFIG_INPUT_KEYBOARD for
AARCH64
by Vitaly Kuznetsov (via Email Bridge)
From: Vitaly Kuznetsov <vkuznets(a)redhat.com>
redhat/configs: enable CONFIG_INPUT_KEYBOARD for AARCH64
Hyper-V keyboard module (CONFIG_HYPERV_KEYBOARD) requires
CONFIG_INPUT_KEYBOARD/CONFIG_KEYBOARD_ATKBD to work properly.
Signed-off-by: Vitaly Kuznetsov <vkuznets(a)redhat.com>
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_INPUT_KEYBOARD b/redhat/configs/ark/generic/arm/aarch64/CONFIG_INPUT_KEYBOARD
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_INPUT_KEYBOARD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_KEYBOARD is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_KEYBOARD_ATKBD b/redhat/configs/common/generic/arm/aarch64/CONFIG_KEYBOARD_ATKBD
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_KEYBOARD_ATKBD
@@ -0,0 +1 @@
+CONFIG_KEYBOARD_ATKBD=y
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_KEYBOARD_TEGRA b/redhat/configs/common/generic/arm/aarch64/CONFIG_KEYBOARD_TEGRA
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_KEYBOARD_TEGRA
@@ -0,0 +1 @@
+# CONFIG_KEYBOARD_TEGRA is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_SERIO_LIBPS2 b/redhat/configs/common/generic/arm/aarch64/CONFIG_SERIO_LIBPS2
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_SERIO_LIBPS2
@@ -0,0 +1 @@
+CONFIG_SERIO_LIBPS2=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1529
2 years, 2 months
[OS-BUILD PATCH] Revert "[redhat] Generate a crashkernel.default for
each
kernel build"
by Coiby Xu (via Email Bridge)
From: Coiby Xu <coxu(a)redhat.com>
Revert "[redhat] Generate a crashkernel.default for each kernel build"
This reverts commit 7154db6a1a2c0e63513d262cbdc9bc702ab6bdb5.
To simplify the solution for setting up default crashkernel, kexec-tools
has dropped the support of crashkernel.default and has provided
"kdumpctl get-default-crashkernel" instead to retrieve the default
crashkernel value. There is no need for every kernel package to ship the
crashkernel.default file.
Signed-off-by: Coiby Xu <coxu(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -277,7 +277,6 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check
configs/merge.pl \
configs/process_configs.sh \
parallel_xz.sh \
- generate_crashkernel_default.sh \
../Makefile.rhelver \
README.rst \
kernel-local \
diff --git a/redhat/generate_crashkernel_default.sh b/redhat/generate_crashkernel_default.sh
deleted file mode 100755
index blahblah..blahblah 0
--- a/redhat/generate_crashkernel_default.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-kernelver=$1 && shift
-arch=$1 && shift
-rootfs=$1 && shift
-
-output="${rootfs}/lib/modules/${kernelver}/crashkernel.default"
-
-case $arch in
-x86_64|s390*)
- ck_cmdline="crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M"
- ;;
-arm64|aarch64)
- ck_cmdline="crashkernel=2G-:448M"
- ;;
-powerpc|ppc64*)
- ck_cmdline="crashkernel=2G-4G:384M,4G-16G:512M,16G-64G:1G,64G-128G:2G,128G-:4G"
- ;;
-*)
- ck_cmdline=""
- ;;
-esac
-
-cat > "$output" <<EOF
-$ck_cmdline
-EOF
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -809,7 +809,6 @@ Source80: generate_all_configs.sh
Source81: process_configs.sh
Source82: update_scripts.sh
-Source83: generate_crashkernel_default.sh
Source84: mod-internal.list
@@ -2116,9 +2115,6 @@ BuildKernel() {
# prune junk from kernel-devel
find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -delete
- # Generate crashkernel default config
- %{SOURCE83} "$KernelVer" "$Arch" "$RPM_BUILD_ROOT"
-
# Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel
mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer
%ifarch x86_64 aarch64
@@ -2925,7 +2921,6 @@ fi
/lib/modules/%{KVERREL}%{?3:+%{3}}/source\
/lib/modules/%{KVERREL}%{?3:+%{3}}/updates\
/lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\
-/lib/modules/%{KVERREL}%{?3:+%{3}}/crashkernel.default\
%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\
%if %{1}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1534
2 years, 2 months