Browse Source

pkg: fedora: don't overwrite auto.conf with .config

Upstream: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1597

Fixes building external modules using DKMS
Dorian Stoll 3 years ago
parent
commit
3b567dc265
1 changed files with 5 additions and 5 deletions
  1. 5 5
      pkg/fedora/kernel-surface/kernel-surface.spec

+ 5 - 5
pkg/fedora/kernel-surface/kernel-surface.spec

@@ -302,12 +302,12 @@ cp -a --parents arch/x86/boot/string.h %{kernel_modpath}/build/
 cp -a --parents arch/x86/boot/string.c %{kernel_modpath}/build/
 cp -a --parents arch/x86/boot/string.c %{kernel_modpath}/build/
 cp -a --parents arch/x86/boot/ctype.h %{kernel_modpath}/build/
 cp -a --parents arch/x86/boot/ctype.h %{kernel_modpath}/build/
 
 
-# Make sure the Makefile and version.h have a matching timestamp so that
-# external modules can be built
-touch -r %{kernel_modpath}/build/Makefile %{kernel_modpath}/build/include/generated/uapi/linux/version.h
+# Make sure the Makefile, version.h, and auto.conf have a matching
+# timestamp so that external modules can be built
 
 
-# Copy .config to include/config/auto.conf so "make prepare" is unnecessary.
-cp %{kernel_modpath}/build/.config %{kernel_modpath}/build/include/config/auto.conf
+touch -r %{kernel_modpath}/build/Makefile \
+	%{kernel_modpath}/build/include/generated/uapi/linux/version.h \
+	%{kernel_modpath}/build/include/config/auto.conf
 
 
 mkdir -p %{buildroot}/usr/src/kernels
 mkdir -p %{buildroot}/usr/src/kernels
 mv %{kernel_modpath}/build %{buildroot}/usr/src/kernels/%{kernel_name}
 mv %{kernel_modpath}/build %{buildroot}/usr/src/kernels/%{kernel_name}