Rough-Patch for F18 kernel.spec: apply modsign patches even for vanilla builds

[Thorsten Leemhuis]

Hi!

Find below a rough, illustrative patch that fixes the following error when you try to
build a vanilla kernel with kernel.spec from F18 git:

>  + echo BUILDING A KERNEL FOR PAE i686...
>  BUILDING A KERNEL FOR PAE i686...
>  + perl -p -i -e 's/^SUBLEVEL.*/SUBLEVEL = 6/' Makefile
>  + perl -p -i -e 's/^EXTRAVERSION.*/EXTRAVERSION =
> -3.vanilla.stable.knurd.1.fc18.i686.PAE/' Makefile
>  + make -s mrproper
>  + cp configs/kernel-3.6.6-i686-PAE.config .config
>  + cp /builddir/build/SOURCES/x509.genkey .
>  + chmod +x scripts/sign-file
>  chmod: cannot access 'scripts/sign-file': No such file or directory
>  RPM build errors:
>  error: Bad exit status from /var/tmp/rpm-tmp.06kdJq (%build)
>      Bad exit status from /var/tmp/rpm-tmp.06kdJq (%build) 
I didn't check, but I assume the change "Update modsign to what is currently in
3.7-rc2" was the point where the problem was introduced.

HTH & CU
knurd


diff --git a/kernel.spec b/kernel.spec
index d374cf4..e0c3484 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -648,6 +648,9 @@ Patch05: linux-2.6-makefile-after_link.patch
 
 Patch06: power-x86-destdir.patch
 
+Patch900: modsign-upstream-3.7.patch
+Patch901: modsign-post-KS-jwb.patch
+
 %if !%{nopatches}
 
 
@@ -685,8 +688,8 @@ Patch700: linux-2.6-e1000-ich9-montevina.patch
 Patch800: linux-2.6-crash-driver.patch
 
 # crypto/
-Patch900: modsign-upstream-3.7.patch
-Patch901: modsign-post-KS-jwb.patch
+#Patch900: modsign-upstream-3.7.patch
+#Patch901: modsign-post-KS-jwb.patch
 
 # secure boot
 Patch1000: secure-boot-20121105.patch
@@ -1347,6 +1350,9 @@ ApplyOptionalPatch linux-2.6-compile-fixes.patch
 
 ApplyPatch power-x86-destdir.patch
 
+ApplyPatch modsign-upstream-3.7.patch
+ApplyPatch modsign-post-KS-jwb.patch
+
 %if !%{nopatches}
 
 # revert patches from upstream that conflict or that we get via other means
@@ -1443,8 +1449,8 @@ ApplyPatch linux-2.6-crash-driver.patch
 ApplyPatch linux-2.6-e1000-ich9-montevina.patch
 
 # crypto/
-ApplyPatch modsign-upstream-3.7.patch
-ApplyPatch modsign-post-KS-jwb.patch
+#ApplyPatch modsign-upstream-3.7.patch
+#ApplyPatch modsign-post-KS-jwb.patch
 
 # secure boot
 ApplyPatch efivarfs-3.6.patch
@@ -2382,6 +2388,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Nov 06 2012 Thorsten Leemhuis <fedora(a)leemhuis.info&gt; 
+- apply modsign patches even for vanilla builds
+
 * Mon Nov 05 2012 Josh Boyer <jwboyer(a)redhat.com&gt; - 3.6.6-3
 - Backport efivarfs from efi/next for moktools
 - Fix build break without CONFIG_EFI set (reported by Peter W. Bowey)

[Josh Boyer]

On Tue, Nov 06, 2012 at 02:29:08PM +0100, Thorsten Leemhuis wrote:
>  Hi!
>  
>  Find below a rough, illustrative patch that fixes the following error when you try to
> build a vanilla kernel with kernel.spec from F18 git:
>  
>  > + echo BUILDING A KERNEL FOR PAE i686...
>  > BUILDING A KERNEL FOR PAE i686...
>  > + perl -p -i -e 's/^SUBLEVEL.*/SUBLEVEL = 6/' Makefile
>  > + perl -p -i -e 's/^EXTRAVERSION.*/EXTRAVERSION =
> -3.vanilla.stable.knurd.1.fc18.i686.PAE/' Makefile
>  > + make -s mrproper
>  > + cp configs/kernel-3.6.6-i686-PAE.config .config
>  > + cp /builddir/build/SOURCES/x509.genkey .
>  > + chmod +x scripts/sign-file
>  > chmod: cannot access 'scripts/sign-file': No such file or directory
>  > RPM build errors:
>  > error: Bad exit status from /var/tmp/rpm-tmp.06kdJq (%build)
>  >     Bad exit status from /var/tmp/rpm-tmp.06kdJq (%build)
>  
>  I didn't check, but I assume the change "Update modsign to what is currently in
> 3.7-rc2" was the point where the problem was introduced. 
Yes, probably.  But I don't think applying those patches for vanilla
builds is the right fix here.  If you apply them, you wouldn't be
building a vanilla 3.6.x kernel.  That seems to defeat the purpose of
having a vanilla kernel to test with.

We could make the chmod conditional on the file existing, but I think
even with that we might run into issues later on during the build in the
debuginfo generation section where it's calling the modules_sign target,
and the signing script for mod-extras.  That might need to get wrapped in
a %{nopatches} check too.

For now, try just doing:

	chmod +x scripts/sign-file || true

and see if the build fails later (I expect it would).  I'm chasing a
different issue with F18 today, so I won't have time to fix this
properly, but I'll try and get to it later this week.

josh

[Thorsten Leemhuis]

Hi!

On 06.11.2012 14:43, Josh Boyer wrote:
>  On Tue, Nov 06, 2012 at 02:29:08PM +0100, Thorsten Leemhuis wrote:
> > Find below a rough, illustrative patch that fixes the following error when you try to
> build a vanilla kernel with kernel.spec from F18 git:
>  […]
> > I didn't check, but I assume the change "Update modsign to what is currently
> in 3.7-rc2" was the point where the problem was introduced.
>
>  Yes, probably.  But I don't think applying those patches for vanilla
>  builds is the right fix here. 
>   If you apply them, you wouldn't be
>  building a vanilla 3.6.x kernel.  That seems to defeat the purpose of
>  having a vanilla kernel to test with. 
Sure. But well, as I wrote on the wiki page that explains the repos, 
sometimes I might have to apply patches. But yeah, in this case a proper 
fix is definitely better.

>  We could make the chmod conditional on the file existing, but I
> think
>  even with that we might run into issues later on during the build in the
>  debuginfo generation section where it's calling the modules_sign target,
>  and the signing script for mod-extras.  That might need to get wrapped in
>  a %{nopatches} check too.
>
>  For now, try just doing:
>
>  	chmod +x scripts/sign-file || true
>
>  and see if the build fails later (I expect it would).  I'm chasing a
>  different issue with F18 today, so I won't have time to fix this
>  properly, but I'll try and get to it later this week. 
Np; I'll take a closer look on the weekend when I'm home again.

CU
knurd

[Josh Boyer]

On Wed, Nov 07, 2012 at 01:35:20PM +0100, Thorsten Leemhuis wrote:
>  >We could make the chmod conditional on the file existing, but I
> think
>  >even with that we might run into issues later on during the build in the
>  >debuginfo generation section where it's calling the modules_sign target,
>  >and the signing script for mod-extras.  That might need to get wrapped in
>  >a %{nopatches} check too.
>  >
>  >For now, try just doing:
>  >
>  >	chmod +x scripts/sign-file || true
>  >
>  >and see if the build fails later (I expect it would).  I'm chasing a
>  >different issue with F18 today, so I won't have time to fix this
>  >properly, but I'll try and get to it later this week. 
I've fixed this on the f18 branch.  Thanks for bringing it to our
attention!

josh