Hello,
I have a 2.6.22.12 kernel (ubuntu gutsy gibbon) and when I want to apply the
mh3 kernel patch (dry run for now) it seems there are some modifications
which have already been applied (partially ?) in hci_core.h, rfcomm.h, sco.h
Could you please tell me what I have to do :( ?
Or where I can get an up-to-date drivers/bluetooth/* , /net/bluetooth/* ,
/include/net/bluetooth/* sources ?
Thanks a lot,
Oli
------------------------------------------------------------------
patching file linux-source-2.6.22/include/net/bluetooth/rfcomm.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
linux-source-2.6.22/include/net/bluetooth/rfcomm.h.rej
patching file linux-source-2.6.22/Makefile
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file
linux-source-2.6.22/Makefile.rej
patching file linux-source-2.6.22/net/bluetooth/hci_conn.c
Hunk #6 FAILED at 243.
Hunk #7 succeeded at 348 (offset 28 lines).
Hunk #8 succeeded at 365 (offset 28 lines).
Hunk #9 succeeded at 403 (offset 28 lines).
Hunk #10 succeeded at 424 (offset 28 lines).
Hunk #11 succeeded at 438 (offset 28 lines).
Hunk #12 succeeded at 456 (offset 28 lines).
Hunk #13 succeeded at 478 (offset 28 lines).
Hunk #14 succeeded at 509 (offset 28 lines).
Hunk #15 succeeded at 519 (offset 28 lines).
Hunk #16 succeeded at 545 (offset 28 lines).
1 out of 16 hunks FAILED -- saving rejects to file
linux-source-2.6.22/net/bluetooth/hci_conn.c.rej
patching file linux-source-2.6.22/net/bluetooth/hci_core.c
Hunk #8 succeeded at 831 (offset 1 line).
Hunk #9 succeeded at 856 (offset 1 line).
Hunk #10 succeeded at 871 (offset 1 line).
Hunk #11 succeeded at 898 (offset 1 line).
Hunk #12 succeeded at 910 (offset 1 line).
Hunk #13 succeeded at 937 (offset 1 line).
Hunk #14 succeeded at 1118 (offset 1 line).
Hunk #15 succeeded at 1150 (offset 1 line).
Hunk #16 succeeded at 1159 (offset 1 line).
Hunk #17 FAILED at 1260.
Hunk #18 succeeded at 1405 (offset 44 lines).
Hunk #19 succeeded at 1440 with fuzz 2 (offset 44 lines).
1 out of 19 hunks FAILED -- saving rejects to file
linux-source-2.6.22/net/bluetooth/hci_core.c.rej
patching file linux-source-2.6.22/net/bluetooth/hci_event.c
Hunk #2 FAILED at 326.
Hunk #7 FAILED at 933.
Hunk #8 succeeded at 1125 (offset -3 lines).
Hunk #9 succeeded at 1196 (offset -3 lines).
Hunk #10 succeeded at 1221 (offset -3 lines).
Hunk #11 succeeded at 1342 (offset -3 lines).
Hunk #12 succeeded at 1378 (offset -3 lines).
Hunk #13 succeeded at 1392 (offset -3 lines).
Hunk #14 succeeded at 1464 (offset -3 lines).
Hunk #15 succeeded at 1472 (offset -3 lines).
2 out of 15 hunks FAILED -- saving rejects to file
linux-source-2.6.22/net/bluetooth/hci_event.c.rej
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel
m=E5n 2007-10-01 klockan 16:12 +0200 skrev Olivier Le Pogam:
> Hello,
> =
> I have a 2.6.22.12 kernel (ubuntu gutsy gibbon) and when I want to apply =
the =
> mh3 kernel patch (dry run for now) it seems there are some modifications =
> which have already been applied (partially ?) in hci_core.h, rfcomm.h, sc=
o.h
> =
Do a manual auditing of those patch bits that fail: read the
corresponding source in your kernel-source-2.6.22.12 and cross check
aginst the suggested amending from the patch file. Remove from the
patch file those parts that the Ubuntu maintainer already applied,
and keep the new additions. Then perform a final (or intermediary)
dry-runs with the patch command to check that things apply cleanly.
Of course, you have to use your own wit to go with the Bluez maintainers
suggestion against the decision of the Ubuntu crew, but the time will
be well invested. I used this technique to patch my own kernel
sources for Debian Etch 2.6.18 and I did eliminate some suboptimal
behaviour of Bluez in doing so.
In your case, disect the following contributions:
> patching file linux-source-2.6.22/include/net/bluetooth/rfcomm.h
> patching file linux-source-2.6.22/Makefile
> patching file linux-source-2.6.22/net/bluetooth/hci_conn.c
> patching file linux-source-2.6.22/net/bluetooth/hci_core.c
> patching file linux-source-2.6.22/net/bluetooth/hci_event.c
since they only produced rejects.
Good luck on your venture
Mats Erik Andersson
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel
Hi Olivier,
> I have a 2.6.22.12 kernel (ubuntu gutsy gibbon) and when I want to apply the
> mh3 kernel patch (dry run for now) it seems there are some modifications
> which have already been applied (partially ?) in hci_core.h, rfcomm.h, sco.h
the patch name is patch-2.6.22-mh3. This means it applies to 2.6.22 and
might not apply to 2.6.22.12. Otherwise it would have been named
patch-2.6.22.12-mh3. It is as simple as that.
Regards
Marcel
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel