diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-02-20 07:25:19 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-02-20 07:25:19 +0100 |
| commit | bd9f48d0080f2100bc0f998a410864f9848a058e (patch) | |
| tree | 5e4a584c7e79a29ed0f3067a2cf4b465d70d92fa | |
| parent | 8a0689e697e71dda56ad3d1c02c1aa5fb35c489c (diff) | |
| download | kernel-4.16.0-0.rc2.git0.1.vanilla.knurd.1.fc26.tar.gz kernel-4.16.0-0.rc2.git0.1.vanilla.knurd.1.fc26.tar.xz kernel-4.16.0-0.rc2.git0.1.vanilla.knurd.1.fc26.zip | |
Revert "Generate BootLoaderSpec config fragments"kernel-4.16.0-0.rc2.git0.1.vanilla.knurd.1.fc28kernel-4.16.0-0.rc2.git0.1.vanilla.knurd.1.fc27kernel-4.16.0-0.rc2.git0.1.vanilla.knurd.1.fc26
This reverts commit 08732ed8268cbd9fd23dfae32ffa18ea320b910e.
| -rwxr-xr-x | generate_bls_conf.sh | 28 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 0 insertions, 34 deletions
diff --git a/generate_bls_conf.sh b/generate_bls_conf.sh deleted file mode 100755 index 8d9ec0699..000000000 --- a/generate_bls_conf.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -set -e - -. /etc/os-release - -kernelver=$1 && shift -rootfs=$1 && shift -variant=$1 && shift - -output="${rootfs}/lib/modules/${kernelver}/bls.conf" -date=$(date -u +%Y%m%d%H%M%S) - -if [ "${variant:-5}" = "debug" ]; then - debugname=" with debugging" -else - debugname="" -fi - -cat >${output} <<EOF -title ${NAME} (${kernelver}) ${VERSION}${debugname} -linux ${bootprefix}/vmlinuz-${kernelver} -initrd ${bootprefix}/initramfs-${kernelver}.img -options \$kernelopts -id ${ID}-${date}-${kernelver} -grub_users \$grub_users -grub_arg --unrestricted -grub_class kernel${variant} -EOF diff --git a/kernel.spec b/kernel.spec index 0333fc4c9..89788a7bb 100644 --- a/kernel.spec +++ b/kernel.spec @@ -477,7 +477,6 @@ Source40: generate_all_configs.sh Source41: generate_debug_configs.sh Source42: process_configs.sh -Source43: generate_bls_conf.sh # This file is intentionally left empty in the stock kernel. Its a nicety # added for those wanting to do custom rebuilds with altered config opts. @@ -1125,7 +1124,6 @@ cp %{SOURCE1000} . cp %{SOURCE15} . cp %{SOURCE40} . cp %{SOURCE41} . -cp %{SOURCE43} . %if !%{debugbuildsenabled} # The normal build is a really debug build and the user has explicitly requested @@ -1540,9 +1538,6 @@ BuildKernel() { # prune junk from kernel-devel find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \; - - # build a BLS config for this kernel - ./generate_bls_conf.sh "$KernelVer" "$RPM_BUILD_ROOT" "%{?variant}" } ### @@ -1854,7 +1849,6 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/build\ /lib/modules/%{KVERREL}%{?3:+%{3}}/source\ /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\ -/lib/modules/%{KVERREL}%{?2:+%{2}}/bls.conf\ %if %{1}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\ /etc/ld.so.conf.d/kernel-%{KVERREL}%{?3:+%{3}}.conf\ |