All of lore.kernel.org
 help / color / mirror / Atom feed
* Problem with verify-ing patch (error: arch/m68k/Kconfig.cpu: patch does not apply)
@ 2012-09-24 11:14 Rafał Miłecki
  2012-09-24 15:04 ` Artem Bityutskiy
  0 siblings, 1 reply; 6+ messages in thread
From: Rafał Miłecki @ 2012-09-24 11:14 UTC (permalink / raw)
  To: linux-mtd, Artem Bityutskiy

I wanted to verify my patch before sending it.

TRY[0]:
> ./verify ../wireless-testing/ mips-bcm47xx_defconfig < ../nand4/0001-mtd-prepare-place-for-BCMA-NAND-flash-driver-s.patch
error: patch failed: arch/m68k/Kconfig.cpu:28
error: arch/m68k/Kconfig.cpu: patch does not apply

Weird. My patch doesn't touch m68k and applies cleanly to the
../wireless-testing tree:

> cd ../wireless-testing/
> git am ../nand4/0001-mtd-prepare-place-for-BCMA-NAND-flash-driver-s.patch
Applying: mtd: prepare place for BCMA NAND flash driver(s)

Help? :|

-- 
Rafał

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Problem with verify-ing patch (error: arch/m68k/Kconfig.cpu: patch does not apply)
  2012-09-24 11:14 Problem with verify-ing patch (error: arch/m68k/Kconfig.cpu: patch does not apply) Rafał Miłecki
@ 2012-09-24 15:04 ` Artem Bityutskiy
  2012-09-25  9:33   ` Rafał Miłecki
  0 siblings, 1 reply; 6+ messages in thread
From: Artem Bityutskiy @ 2012-09-24 15:04 UTC (permalink / raw)
  To: Rafał Miłecki; +Cc: linux-mtd

[-- Attachment #1: Type: text/plain, Size: 1142 bytes --]

On Mon, 2012-09-24 at 13:14 +0200, Rafał Miłecki wrote:
> I wanted to verify my patch before sending it.
> 
> TRY[0]:
> > ./verify ../wireless-testing/ mips-bcm47xx_defconfig < ../nand4/0001-mtd-prepare-place-for-BCMA-NAND-flash-driver-s.patch
> error: patch failed: arch/m68k/Kconfig.cpu:28
> error: arch/m68k/Kconfig.cpu: patch does not apply
> 
> Weird. My patch doesn't touch m68k and applies cleanly to the
> ../wireless-testing tree:
> 
> > cd ../wireless-testing/
> > git am ../nand4/0001-mtd-prepare-place-for-BCMA-NAND-flash-driver-s.patch
> Applying: mtd: prepare place for BCMA NAND flash driver(s)
> 
> Help? :|

It tries to apply quick fixes - I carry them because the kernel gets
broken in various places all the time. So you need to fix the quick
fixes patch - probably a fix was applied in upstream already.

Obviously, quick fixes are in maintaining.git, not in the generic aiaiai
tools. They are in 'quick_fixes.mbox'.

In this case it easy - the m68k patch get merged upstream and just can
be dropped from quick_fixes.mbox. Just done that and pushed out.

-- 
Best Regards,
Artem Bityutskiy

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Problem with verify-ing patch (error: arch/m68k/Kconfig.cpu: patch does not apply)
  2012-09-24 15:04 ` Artem Bityutskiy
@ 2012-09-25  9:33   ` Rafał Miłecki
  2012-09-25 12:06     ` Artem Bityutskiy
  0 siblings, 1 reply; 6+ messages in thread
From: Rafał Miłecki @ 2012-09-25  9:33 UTC (permalink / raw)
  To: dedekind1; +Cc: linux-mtd

2012/9/24 Artem Bityutskiy <dedekind1@gmail.com>:
> On Mon, 2012-09-24 at 13:14 +0200, Rafał Miłecki wrote:
>> I wanted to verify my patch before sending it.
>>
>> TRY[0]:
>> > ./verify ../wireless-testing/ mips-bcm47xx_defconfig < ../nand4/0001-mtd-prepare-place-for-BCMA-NAND-flash-driver-s.patch
>> error: patch failed: arch/m68k/Kconfig.cpu:28
>> error: arch/m68k/Kconfig.cpu: patch does not apply
>>
>> Weird. My patch doesn't touch m68k and applies cleanly to the
>> ../wireless-testing tree:
>>
>> > cd ../wireless-testing/
>> > git am ../nand4/0001-mtd-prepare-place-for-BCMA-NAND-flash-driver-s.patch
>> Applying: mtd: prepare place for BCMA NAND flash driver(s)
>>
>> Help? :|
>
> It tries to apply quick fixes - I carry them because the kernel gets
> broken in various places all the time. So you need to fix the quick
> fixes patch - probably a fix was applied in upstream already.
>
> Obviously, quick fixes are in maintaining.git, not in the generic aiaiai
> tools. They are in 'quick_fixes.mbox'.
>
> In this case it easy - the m68k patch get merged upstream and just can
> be dropped from quick_fixes.mbox. Just done that and pushed out.

Thanks. Unfortunately I'm still having problems with verify/aiaiai :|

After your change I started verify again and it took 3 minutes to let
me know it needs mips-linux-gcc. I had to install it (OpenWRT is using
it's own toolchain).

Then I started again and after 3 minutes: lacking sparse

3 minutes later: lacking smatch

3 minutes later: lacking cppcheck

3 minutes later: lacking spatch

I'm not sure what's going to be next. I'm sure that things are obvious
for you, but beginner can really get irritated before he manages to
setup everything... ;/

-- 
Rafał

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Problem with verify-ing patch (error: arch/m68k/Kconfig.cpu: patch does not apply)
  2012-09-25  9:33   ` Rafał Miłecki
@ 2012-09-25 12:06     ` Artem Bityutskiy
  2012-10-05  8:48       ` Artem Bityutskiy
  0 siblings, 1 reply; 6+ messages in thread
From: Artem Bityutskiy @ 2012-09-25 12:06 UTC (permalink / raw)
  To: Rafał Miłecki; +Cc: linux-mtd

[-- Attachment #1: Type: text/plain, Size: 2544 bytes --]

On Tue, 2012-09-25 at 11:33 +0200, Rafał Miłecki wrote:
> 2012/9/24 Artem Bityutskiy <dedekind1@gmail.com>:
> > On Mon, 2012-09-24 at 13:14 +0200, Rafał Miłecki wrote:
> >> I wanted to verify my patch before sending it.
> >>
> >> TRY[0]:
> >> > ./verify ../wireless-testing/ mips-bcm47xx_defconfig < ../nand4/0001-mtd-prepare-place-for-BCMA-NAND-flash-driver-s.patch
> >> error: patch failed: arch/m68k/Kconfig.cpu:28
> >> error: arch/m68k/Kconfig.cpu: patch does not apply
> >>
> >> Weird. My patch doesn't touch m68k and applies cleanly to the
> >> ../wireless-testing tree:
> >>
> >> > cd ../wireless-testing/
> >> > git am ../nand4/0001-mtd-prepare-place-for-BCMA-NAND-flash-driver-s.patch
> >> Applying: mtd: prepare place for BCMA NAND flash driver(s)
> >>
> >> Help? :|
> >
> > It tries to apply quick fixes - I carry them because the kernel gets
> > broken in various places all the time. So you need to fix the quick
> > fixes patch - probably a fix was applied in upstream already.
> >
> > Obviously, quick fixes are in maintaining.git, not in the generic aiaiai
> > tools. They are in 'quick_fixes.mbox'.
> >
> > In this case it easy - the m68k patch get merged upstream and just can
> > be dropped from quick_fixes.mbox. Just done that and pushed out.
> 
> Thanks. Unfortunately I'm still having problems with verify/aiaiai :|
> 
> After your change I started verify again and it took 3 minutes to let
> me know it needs mips-linux-gcc. I had to install it (OpenWRT is using
> it's own toolchain).
> 
> Then I started again and after 3 minutes: lacking sparse
> 
> 3 minutes later: lacking smatch
> 
> 3 minutes later: lacking cppcheck
> 
> 3 minutes later: lacking spatch
> 
> I'm not sure what's going to be next. I'm sure that things are obvious
> for you, but beginner can really get irritated before he manages to
> setup everything... ;/

Rafal, your complaints are fair, thanks. This needs some more work. I'll
add checks for all the required tools in the scripts so that they will
fail right away with a user-friendly messages.

But one thing is obvious for me - you did not read the docs in aiaiai
projects. Well, fair enough, typical users do not read docs :-) The docs
tell where to get tools, how to compile, etc. I think they also tell
where to download pre-build compilers even, but I should check this
part :-)

I'll do the fixes as soon as I have some time, please, keep bugging me
and thanks for your feed-back!

-- 
Best Regards,
Artem Bityutskiy

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Problem with verify-ing patch (error: arch/m68k/Kconfig.cpu: patch does not apply)
  2012-09-25 12:06     ` Artem Bityutskiy
@ 2012-10-05  8:48       ` Artem Bityutskiy
  2012-10-06 10:57         ` Rafał Miłecki
  0 siblings, 1 reply; 6+ messages in thread
From: Artem Bityutskiy @ 2012-10-05  8:48 UTC (permalink / raw)
  To: Rafał Miłecki; +Cc: linux-mtd

[-- Attachment #1: Type: text/plain, Size: 522 bytes --]

On Tue, 2012-09-25 at 15:06 +0300, Artem Bityutskiy wrote:
> I'll do the fixes as soon as I have some time, please, keep bugging me
> and thanks for your feed-back!

I've just pushed a change which should improve user-friendliness. Now I
check for dependencies in many places and try to inform the user if a
program is missing, plus give some suggestions where to take it from.
E.g., for cross-tools I print the URL where one can download pre-built
cross-tools.

Thanks!

-- 
Best Regards,
Artem Bityutskiy

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Problem with verify-ing patch (error: arch/m68k/Kconfig.cpu: patch does not apply)
  2012-10-05  8:48       ` Artem Bityutskiy
@ 2012-10-06 10:57         ` Rafał Miłecki
  0 siblings, 0 replies; 6+ messages in thread
From: Rafał Miłecki @ 2012-10-06 10:57 UTC (permalink / raw)
  To: dedekind1; +Cc: linux-mtd

2012/10/5 Artem Bityutskiy <dedekind1@gmail.com>:
> On Tue, 2012-09-25 at 15:06 +0300, Artem Bityutskiy wrote:
>> I'll do the fixes as soon as I have some time, please, keep bugging me
>> and thanks for your feed-back!
>
> I've just pushed a change which should improve user-friendliness. Now I
> check for dependencies in many places and try to inform the user if a
> program is missing, plus give some suggestions where to take it from.
> E.g., for cross-tools I print the URL where one can download pre-built
> cross-tools.

Great, thanks for you work! :)

-- 
Rafał

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2012-10-06 10:57 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-24 11:14 Problem with verify-ing patch (error: arch/m68k/Kconfig.cpu: patch does not apply) Rafał Miłecki
2012-09-24 15:04 ` Artem Bityutskiy
2012-09-25  9:33   ` Rafał Miłecki
2012-09-25 12:06     ` Artem Bityutskiy
2012-10-05  8:48       ` Artem Bityutskiy
2012-10-06 10:57         ` Rafał Miłecki

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.