[kernel/f18] Fix version.h include due to UAPI change in 3.7 (rhbz 892372)

Josh Boyer jwboyer at fedoraproject.org
Sun Jan 6 23:47:40 UTC 2013


commit 34e02d724cc87ac7b70eb3695c62e52cc10cc136
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Sun Jan 6 18:47:15 2013 -0500

    Fix version.h include due to UAPI change in 3.7 (rhbz 892372)

 kernel.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 24036e2..9d365a7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 3
+%global baserelease 4
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -1761,7 +1761,7 @@ BuildKernel() {
 
     # 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/linux/version.h
+    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
@@ -2398,6 +2398,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sun Jan 06 2013 Josh Boyer <jwboyer at redhat.com>
+- Fix version.h include due to UAPI change in 3.7 (rhbz 892372)
+
 * Fri Jan 04 2013 Josh Boyer <jwboyer at redhat.com>
 - Fix oops on aoe module removal (rhbz 853064)
 


More information about the scm-commits mailing list