Building a kernel with a patch

[Biggus Gazus]

Hi list,

Hopefully this is the place to ask, I've tried to follow this, so far 
so good ...

https://fedoraproject.org/wiki/Building_a_custom_kernel

I added these lines to my spec file, following the guide ...

Patch74912: scarlett.patch

ApplyPatch scarlett.patch

At the end of their respective sections. I try to build the RPM, and I 
get ...

ERROR: Patch scarlett.patch not listed as a source patch in specfile

Somebody in the chat room suggested I might need a SOURCE line or 
something as well? But the guide doesn't say that.

Any clues?

Cheers!

Gaz

[Josh Boyer]

On Wed, Sep 10, 2014 at 4:57 PM, Biggus Gazus  wrote:
> Hi list,
>
> Hopefully this is the place to ask, I've tried to follow this, so far so
> good ...
>
> https://fedoraproject.org/wiki/Building_a_custom_kernel
>
> I added these lines to my spec file, following the guide ...
>
> Patch74912: scarlett.patch
>
> ApplyPatch scarlett.patch
>
> At the end of their respective sections. I try to build the RPM, and I get
> ...
>
> ERROR: Patch scarlett.patch not listed as a source patch in specfile
>
> Somebody in the chat room suggested I might need a SOURCE line or something
> as well? But the guide doesn't say that.
>
> Any clues?

It's easier if you post a diff of the changes you made and the full
rpmbuild output you're seeing.

josh

[Biggus Gazus]

Hi,

Here's the output ...

http://fpaste.org/132598/38399914/

Here's the spec ...

http://fpaste.org/132600/41038420/

If you search it for "focusrite" you'll find the three changes I made.

Thanks again for any help!

Cheers,

Gaz

On Wed, 10 Sep, 2014 at 10:18 PM, Josh Boyer 
 wrote:
> On Wed, Sep 10, 2014 at 4:57 PM, Biggus Gazus 
>  wrote:
> > Hi list,
> >
> > Hopefully this is the place to ask, I've tried to follow this, so 
> > far so
> >  good ...
> >
> > https://fedoraproject.org/wiki/Building_a_custom_kernel
> >
> > I added these lines to my spec file, following the guide ...
> >
> > Patch74912: scarlett.patch
> >
> > ApplyPatch scarlett.patch
> >
> > At the end of their respective sections. I try to build the RPM, 
> > and I get
> >  ...
> >
> > ERROR: Patch scarlett.patch not listed as a source patch in specfile
> >
> > Somebody in the chat room suggested I might need a SOURCE line or 
> > something
> >  as well? But the guide doesn't say that.
> >
> > Any clues?
>
> It's easier if you post a diff of the changes you made and the full
> rpmbuild output you're seeing.
>
> josh

[Biggus Gazus]

For reference, the patch is discussed at the end of here.

http://focusritedevelopmentteam.wordpress.com/2012/04/23/linux-and-focusrite...

On Wed, 10 Sep, 2014 at 10:22 PM, Biggus Gazus  
wrote:
> Hi,
>
> Here's the output ...
>
> http://fpaste.org/132598/38399914/
>
> Here's the spec ...
>
> http://fpaste.org/132600/41038420/
>
> If you search it for "focusrite" you'll find the three changes I made.
>
> Thanks again for any help!
>
> Cheers,
>
> Gaz
>
> On Wed, 10 Sep, 2014 at 10:18 PM, Josh Boyer 
>  wrote:
> > On Wed, Sep 10, 2014 at 4:57 PM, Biggus Gazus 
> >  wrote:
> > > Hi list,
> > >
> > > Hopefully this is the place to ask, I've tried to follow this, so 
> > > far so
> > >  good ...
> > >
> > > https://fedoraproject.org/wiki/Building_a_custom_kernel
> > >
> > > I added these lines to my spec file, following the guide ...
> > >
> > > Patch74912: scarlett.patch
> > >
> > > ApplyPatch scarlett.patch
> > >
> > > At the end of their respective sections. I try to build the RPM, 
> > > and I get
> > >  ...
> > >
> > > ERROR: Patch scarlett.patch not listed as a source patch in 
> > > specfile
> > >
> > > Somebody in the chat room suggested I might need a SOURCE line or 
> > > something
> > >  as well? But the guide doesn't say that.
> > >
> > > Any clues?
> >
> > It's easier if you post a diff of the changes you made and the full
> > rpmbuild output you're seeing.
> >
> > josh

[Josh Boyer]

On Wed, Sep 10, 2014 at 5:22 PM, Biggus Gazus  wrote:
> Hi,
>
> Here's the output ...
>
> http://fpaste.org/132598/38399914/
>
> Here's the spec ...
>
> http://fpaste.org/132600/41038420/
>
> If you search it for "focusrite" you'll find the three changes I made.
>
> Thanks again for any help!

Your changes appear to be correct to me.  Are you sure you invoked
rpmbuild with the kernel.spec file you fpasted?  Typically you get
that error message when you don't have the PatchXXXXX: field added.
You can alternatively hit this if you've renamed the package, but that
doesn't appear to be the case here.

josh

[Prarit Bhargava]

On 09/10/2014 06:06 PM, Josh Boyer wrote:
> On Wed, Sep 10, 2014 at 5:22 PM, Biggus Gazus  wrote:
> > Hi,
> >
> > Here's the output ...
> >
> > http://fpaste.org/132598/38399914/
> >
> > Here's the spec ...
> >
> > http://fpaste.org/132600/41038420/
> >
> > If you search it for "focusrite" you'll find the three changes I made.
> >
> > Thanks again for any help!
>
> Your changes appear to be correct to me.  Are you sure you invoked
> rpmbuild with the kernel.spec file you fpasted?  Typically you get
> that error message when you don't have the PatchXXXXX: field added.
> You can alternatively hit this if you've renamed the package, but that
> doesn't appear to be the case here.

Hmm ... seems to work for me.

Applied your 3 kernel.spec changes and then did:

rpmbuild -bp kernel.spec

to build the patched kernel ... I see the following in the log:

+ case "$patch" in
+ patch -p1 -F1 -s
+ ApplyPatch scarlett.patch
+ local patch=scarlett.patch
+ shift
+ '[' '!' -f /root/rpmbuild/SOURCES/scarlett.patch ']'
Patch74912: scarlett.patch

so it did apply AFAICT.  I'm assuming you did put the patch in

~/rpmbuild/SOURCES/scarlett.patch

P.

[Biggus Gazus]

I ran this command ...

[rpmbuilder@biggusgazzus SPECS]$ rpmbuild -bb --with baseonly --without 
debuginfo --target=`uname -m` kernel.spec

That's from the SPECS folder.

On Wed, 10 Sep, 2014 at 11:38 PM, Prarit Bhargava  
wrote:
> On 09/10/2014 06:06 PM, Josh Boyer wrote:
> > On Wed, Sep 10, 2014 at 5:22 PM, Biggus Gazus 
> >  wrote:
> > > Hi,
> > >
> > > Here's the output ...
> > >
> > > http://fpaste.org/132598/38399914/
> > >
> > > Here's the spec ...
> > >
> > > http://fpaste.org/132600/41038420/
> > >
> > > If you search it for "focusrite" you'll find the three changes I 
> > > made.
> > >
> > > Thanks again for any help!
> >
> > Your changes appear to be correct to me.  Are you sure you invoked
> >  rpmbuild with the kernel.spec file you fpasted?  Typically you get
> >  that error message when you don't have the PatchXXXXX: field added.
> >  You can alternatively hit this if you've renamed the package, but 
> > that
> >  doesn't appear to be the case here.
>
> Hmm ... seems to work for me.
>
> Applied your 3 kernel.spec changes and then did:
>
> rpmbuild -bp kernel.spec
>
> to build the patched kernel ... I see the following in the log:
> case "$patch" in
> patch -p1 -F1 -s
> ApplyPatch scarlett.patch
> local patch=scarlett.patch
> shift
> '[' '!' -f /root/rpmbuild/SOURCES/scarlett.patch ']'
>
> Patch74912: scarlett.patch
>
> so it did apply AFAICT.  I'm assuming you did put the patch in
>
> ~/rpmbuild/SOURCES/scarlett.patch
>
> P.

[Biggus Gazus]

Okay, I tried running the same command as you, and the same thing 
happened.

I also made sure the patch is in the right place ...

[rpmbuilder@biggusgazzus SPECS]$ ls ../SOURCES/ | grep scar
scarlett.patch

It seems like we're doing the same thing, but mind doesn't work.

Any other ideas? Anyone?

On Thu, 11 Sep, 2014 at 6:27 PM, Biggus Gazus  
wrote:
> I ran this command ...
>
> [rpmbuilder@biggusgazzus SPECS]$ rpmbuild -bb --with baseonly 
> --without debuginfo --target=`uname -m` kernel.spec
>
> That's from the SPECS folder.
>
> On Wed, 10 Sep, 2014 at 11:38 PM, Prarit Bhargava  
> wrote:
> > On 09/10/2014 06:06 PM, Josh Boyer wrote:
> > > On Wed, Sep 10, 2014 at 5:22 PM, Biggus Gazus 
> > >  wrote:
> > > > Hi,
> > > >
> > > > Here's the output ...
> > > >
> > > > http://fpaste.org/132598/38399914/
> > > >
> > > > Here's the spec ...
> > > >
> > > > http://fpaste.org/132600/41038420/
> > > >
> > > > If you search it for "focusrite" you'll find the three changes I 
> > > > made.
> > > >
> > > > Thanks again for any help!
> > >
> > > Your changes appear to be correct to me.  Are you sure you invoked
> > >  rpmbuild with the kernel.spec file you fpasted?  Typically you get
> > >  that error message when you don't have the PatchXXXXX: field added.
> > >  You can alternatively hit this if you've renamed the package, but 
> > > that
> > >  doesn't appear to be the case here.
> >
> > Hmm ... seems to work for me.
> >
> > Applied your 3 kernel.spec changes and then did:
> >
> > rpmbuild -bp kernel.spec
> >
> > to build the patched kernel ... I see the following in the log:
> > case "$patch" in
> > patch -p1 -F1 -s
> > ApplyPatch scarlett.patch
> > local patch=scarlett.patch
> > shift
> > '[' '!' -f /root/rpmbuild/SOURCES/scarlett.patch ']'
> >
> > Patch74912: scarlett.patch
> >
> > so it did apply AFAICT.  I'm assuming you did put the patch in
> >
> > ~/rpmbuild/SOURCES/scarlett.patch
> >
> > P.

[Prarit Bhargava]

On 09/17/2014 06:27 PM, Biggus Gazus wrote:
> Okay, I tried running the same command as you, and the same thing happened.
>
> I also made sure the patch is in the right place ...
>
> [rpmbuilder@biggusgazzus SPECS]$ ls ../SOURCES/ | grep scar
> scarlett.patch
>
> It seems like we're doing the same thing, but mind doesn't work.
>
> Any other ideas? Anyone?

Shot in the dark ..

ls -l ?  Right permissions on the patch?

P.

[Biggus Gazus]

That was a good idea actually, I bet it's something like that, but no, 
still got the same problem  :(

[rpmbuilder@biggusgazzus SPECS]$ ls -al ../SOURCES/ | grep scar
-rw-rw-r-- 1 rpmbuilder rpmbuilder 46259 Sep 8 21:47 scarlett.patch

I can't use a £200 sound card because of this  :(

Could you maybe send your spec file so I can see if it's something 
weird about that?

On Wed, 17 Sep, 2014 at 11:40 PM, Prarit Bhargava  
wrote:
> On 09/17/2014 06:27 PM, Biggus Gazus wrote:
> > Okay, I tried running the same command as you, and the same thing 
> > happened.
> >
> > I also made sure the patch is in the right place ...
> >
> > [rpmbuilder@biggusgazzus SPECS]$ ls ../SOURCES/ | grep scar
> >  scarlett.patch
> >
> > It seems like we're doing the same thing, but mind doesn't work.
> >
> > Any other ideas? Anyone?
>
> Shot in the dark ..
>
> ls -l ?  Right permissions on the patch?
>
> P.

[Bastien Nocera]

----- Original Message -----
> That was a good idea actually, I bet it's something like that, but no,
> still got the same problem  :(
>
> [rpmbuilder@biggusgazzus SPECS]$ ls -al ../SOURCES/ | grep scar
> -rw-rw-r-- 1 rpmbuilder rpmbuilder 46259 Sep 8 21:47 scarlett.patch

I'm putting my money on the patch number being too high and ignored.
If that's the case, a bug report is in order.

[Paul Bolle]

On Mon, 2014-09-22 at 00:41 -0400, Bastien Nocera wrote:
> ----- Original Message -----
> > That was a good idea actually, I bet it's something like that, but no,
> > still got the same problem  :(
> >
> > [rpmbuilder@biggusgazzus SPECS]$ ls -al ../SOURCES/ | grep scar
> > -rw-rw-r-- 1 rpmbuilder rpmbuilder 46259 Sep 8 21:47 scarlett.patch
>
> I'm putting my money on the patch number being too high and ignored.
> If that's the case, a bug report is in order.

And my money is on a trailing space! Try searching
http://fpaste.org/132600/41038420/ for "scarlett.patch " in your
browser.

Note the trailing space. Probably caused by
    if ! grep -E "^Patch[0-9]+: $patch$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then

See the escaped dollar character. [Insert often quoted line about
"regular expressions" and "two problems" here.]

Paul Bolle

[Biggus Gazus]

You Sir, and are f**king legend! Yes, it was the trailing bloody space!

Thank you tons! I turned up a couple of similar threads on forums, it's 
good that the answer to this is now public to save anyone else this 
headache!

Now I get this ...

+ '[' '!' -f /home/rpmbuilder/rpmbuild/SOURCES/scarlett.patch ']'
Patch74912: scarlett.patch
+ case "$patch" in
+ patch -p1 -F1 -s
1 out of 3 hunks FAILED -- saving rejects to file sound/usb/mixer.c.rej
Reversed (or previously applied) patch detected! Assume -R? [n] n
Apply anyway? [n] n
1 out of 1 hunk ignored -- saving rejects to file 
sound/usb/quirks-table.h.rej
error: Bad exit status from /var/tmp/rpm-tmp.FKUQlR (%prep)

So I probably need to adjust the patch, but it's progress.

On Mon, 22 Sep, 2014 at 8:56 AM, Paul Bolle  wrote:
> On Mon, 2014-09-22 at 00:41 -0400, Bastien Nocera wrote:
> > ----- Original Message -----
> > > That was a good idea actually, I bet it's something like that,
> >
> > but no,
> > > still got the same problem  :(
> > >
> > > [rpmbuilder@biggusgazzus SPECS]$ ls -al ../SOURCES/ | grep scar
> > > -rw-rw-r-- 1 rpmbuilder rpmbuilder 46259 Sep 8 21:47
> >
> > scarlett.patch
> >
> > I'm putting my money on the patch number being too high and ignored.
> >  If that's the case, a bug report is in order.
>
> And my money is on a trailing space! Try searching
> http://fpaste.org/132600/41038420/ for "scarlett.patch " in your
> browser.
>
> Note the trailing space. Probably caused by
>     if ! grep -E "^Patch[0-9]+: $patch$" 
> %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then
>
> See the escaped dollar character. [Insert often quoted line about
> "regular expressions" and "two problems" here.]
>
> Paul Bolle

[Bastien Nocera]

----- Original Message -----
> You Sir, and are f**king legend! Yes, it was the trailing bloody space!

Looks like I lost my bet ;)

At least my intervention tickled Paul's brain :)

[Paul Bolle]

On Mon, 2014-09-22 at 17:29 +0100, Biggus Gazus wrote:
> I turned up a couple of similar threads on forums, it's good that the
> answer to this is now public to save anyone else this headache!

Even if those threads weren't the same issue: should we adjust the regex
I quoted in my previous message to allow trailing whitespace?
> Now I get this ...
> '[' '!' -f /home/rpmbuilder/rpmbuild/SOURCES/scarlett.patch ']'
>
> Patch74912: scarlett.patch
> case "$patch" in
> patch -p1 -F1 -s
>
> 1 out of 3 hunks FAILED -- saving rejects to file
> sound/usb/mixer.c.rej
> Reversed (or previously applied) patch detected! Assume -R? [n] n
> Apply anyway? [n] n
> 1 out of 1 hunk ignored -- saving rejects to file
> sound/usb/quirks-table.h.rej
> error: Bad exit status from /var/tmp/rpm-tmp.FKUQlR (%prep)
>
> So I probably need to adjust the patch, but it's progress.

Yes, it seems like the patch doesn't apply. You'll probably figure out
what needs adjusting...

Paul Bolle