Re: CAN j1939 library doubts

[Marc Kleine-Budde <mkl@pengutronix.de>]

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

On 03/14/2013 10:07 PM, Kurt Van Dijck wrote:
> On Thu, Mar 14, 2013 at 04:20:08PM +0000, Giox79 wrote:
>> Kurt Van Dijck <kurt.van.dijck <at> eia.be> writes:
>>
>> In order to integrate your libs to my kernel, I was supposing to make a diff 
>> between source file, looking mainly at can and iproute2, merge the diffs and 
>> build the whole system.
>> Do you think this is the right approach?
> no. I (just) prepared the repositories to allow easy merges.
> 
> follow these steps (@Marc, can you just verify the 'git' calls):

:) Looks good.

> git clone your kernel, or get a stable one
> 	$ git clone http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
> ... this takes time
> 	$ cd linux-stable
> 	$ git tag
> choose a version, like v3.3, or v3.8, ...
> 	$ git checkout <chosen-version>
> 	$ git checkout -b <new-branch-name>
> This last command creates a new branch, so you can play freely.
> Now choose your branch on http://gitorious.org/~kurt-vd/linux-can/linux-can-j1939
> , like j1939-v3.3
> 	$ git pull git://gitorious.org/~kurt-vd/linux-can/linux-can-j1939.git <gitorious-branch-name>

I would add Kurt's tree as a remote, instead of pull do:

    git remote add -f kurt git://gitorious.org/~kurt-vd/linux-can/linux-can-j1939.git
    git merge kurt/<gitorious-branch-name>

If you already have a git tree, you can start with the "git remote add".

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]