diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-02 11:45:35 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-02 11:45:35 +0100 |
| commit | 5f59dabb403de1a96e2772e9c1e98eddad586dd4 (patch) | |
| tree | c5a4c6faa779c046cc270ce0fd607a18442e4c10 /kernel.spec | |
| parent | 2a9570e82c95cb8f8c1c8ffe64f9322159e62a3e (diff) | |
| parent | b2e587e3a7fb8acf134befd1eb577f30664f724d (diff) | |
| download | kernel-5f59dabb403de1a96e2772e9c1e98eddad586dd4.tar.gz kernel-5f59dabb403de1a96e2772e9c1e98eddad586dd4.tar.xz kernel-5f59dabb403de1a96e2772e9c1e98eddad586dd4.zip | |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 143cf715a..7d56968ed 100755 --- a/kernel.spec +++ b/kernel.spec @@ -1951,12 +1951,11 @@ BuildKernel() { # Clean up intermediate tools files find $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools \( -iname "*.o" -o -iname "*.cmd" \) -exec rm -f {} + - # Make sure the Makefile and version.h have a matching timestamp so that - # external modules can be built - touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/generated/uapi/linux/version.h - - # Copy .config to include/config/auto.conf so "make prepare" is unnecessary. - cp $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/config/auto.conf + # Make sure the Makefile, version.h, and auto.conf have a matching + # timestamp so that external modules can be built + touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile \ + $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/generated/uapi/linux/version.h \ + $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/config/auto.conf %if %{with_debuginfo} eu-readelf -n vmlinux | grep "Build ID" | awk '{print $NF}' > vmlinux.id @@ -2991,7 +2990,8 @@ fi # # %changelog -* Wed Feb 16 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.10-100] +* Wed Feb 23 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.11-0] +- spec: don't overwrite auto.conf with .config (Ondrej Mosnacek) - New configs for 5.16.10 (Justin M. Forbes) * Wed Feb 16 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.10-0] |