From: Coiby Xu <coxu(a)redhat.com&gt; 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&gt; 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