Hi, I think you have the order of redirection wrong in the Makefile. I have a diff of what I think you want. Anyway, I'm not sure that is necessary as it is doing that replacement already in the strip-src script. I didn't know what it was using it for, so I had commented it out earlier and was just copying all the headers over.
With this change it now patches cleanly. Although I will have to wait for the MPC5121 to be added to the trunk before I can do anything further. Thanks. Index: Makefile =================================================================== --- Makefile (revision 1101) +++ Makefile (working copy) @@ -11,7 +11,7 @@ KERNELRELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) patch26: - ./mkpatch $(KERNELRELEASE) | sed -e 's/socketcan\/can/linux\/can/' > patch-$(KERNELRELEASE)-socketcan < FILES-2.6 + ./mkpatch $(KERNELRELEASE) < FILES-2.6 | sed -e 's/socketcan\/can/linux\/can/' > patch-$(KERNELRELEASE)-socketcan patch26all: - ./mkpatch $(KERNELRELEASE) | sed -e 's/socketcan\/can/linux\/can/' > patch-$(KERNELRELEASE)-socketcan-all < FILES-2.6-ALL + ./mkpatch $(KERNELRELEASE) < FILES-2.6-ALL | sed -e 's/socketcan\/can/linux\/can/' > patch-$(KERNELRELEASE)-socketcan-all -----Original Message----- From: Oliver Hartkopp [mailto:[email protected]] Sent: Wednesday, January 06, 2010 12:53 PM To: Steve Deiters Cc: Wolfram Sang; Wolfgang Grandegger; [email protected]; [email protected] Subject: Re: Patching kernel core with SocketCan Oliver Hartkopp wrote: > Wolfram Sang wrote: >>> I haven't tested if anything works yet. I'm curious if this is >>> expected to get a workable patch or if I missed something. >> Wolfgang just posted an MPC5121-CAN-driver for a recent kernel. >> > > Yes - and it's currently not available in the SocketCAN SVN. > > I assume Wolfgang will add the MPC5121 support for the mpc5xxx driver > to the SocketCAN SVN as soon as it is accepted on netdev-ML for mainline. > > Btw. the FILES-2.6-* are really out of date for generating patches. Hi Steve, i updated the FILES-2.6-ALL file list and added a sed command in the Makefile to rename all include/socketcan occurrences with include/linux. Please check out the latest SVN and try it again. If you want to create the patch without the Makefile, it should look like this now: ./mkpatch 2.6.24 < FILES-2.6-ALL | sed -e 's/socketcan\/can/linux\/can/' > patch-2.6.24-socketcan-all I also fixed the CC770 Kconfig as i've seen in your mail ;-) Please remember that there's still no MPC5121 support in the SVN sources. Thanks & best regards, Oliver _______________________________________________ Socketcan-users mailing list [email protected] https://lists.berlios.de/mailman/listinfo/socketcan-users
