From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?UTF-8?B?U3RlZmFuIEZyw7ZiZXJn?= <stefan.froberg@petroprogram.com>
Date: Sat, 29 Dec 2012 16:56:51 +0200
Subject: [Buildroot] (no subject)
In-Reply-To: <20121229153251.6bdfecfe@skate>
References: <1356745553-15362-1-git-send-email-stefan.froberg@petroprogram.com>
 <20121229085947.130784d2@skate> <50DEFA7A.7020002@petroprogram.com>
 <20121229153251.6bdfecfe@skate>
Message-ID: <50DF04B3.30801@petroprogram.com>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

29.12.2012 16:32, Thomas Petazzoni kirjoitti:
> Dear Stefan Fr?berg,
>
> On Sat, 29 Dec 2012 16:13:14 +0200, Stefan Fr?berg wrote:
>
>> Thomas, can you tell a git newbie like me how to make single patch but
>> still keeping that Signed-off line in
>> each logical file in that single one patch ?
> I am not sure to understand your question. I think you're confusing the
> SoB line in the Buildroot patch with the SoB line in the patches that
> apply on mesa3d, aren't you?
>
> So basically, your final patch should look like this:
>
> =======================================================================
> mesa3d: bump to version 8.0.5
>
> Here you explain that you're bumping to 8.0.5, and that it requires new
> patches, for this reason and that reason, and blablabla.
>
> Signed-off-by: Stefan Fr?berg <...>
> ---
> Here git will generate the diff-stat of your overall patch
>
> diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk 
> index ...
> --- a/package/x11r7/mesa3d/mesa3d.mk
> +++ b/package/x11r7/mesa3d/mesa3d.mk
> ... here your changes to mesa3d.mk
>
> diff --git a/package/x11r7/mesa3d/mesa3d-01-something.patch b/package/x11r7/mesa3d/mesa3d-01-something.patch
> index ...
> --- /dev/null
> +++ b/package/x11r7/mesa3d/mesa3d-01-something.patch
> + mesa3d: fix something
> +
> + This is the description of the mesa3d-01-something.patch. You explain
> + what you are doing here.
> +
> + Signed-off-by: Stefan Fr?berg <...>
> +
> + ... here your mesa3d-01-something.patch ...
>
> diff --git a/package/x11r7/mesa3d/mesa3d-02-something-else.patch b/package/x11r7/mesa3d/mesa3d-02-something-else.patch
> index ...
> --- /dev/null
> +++ b/package/x11r7/mesa3d/mesa3d-02-something-else.patch
> + mesa3d: fix something else
> +
> + This is the description of the mesa3d-02-something-else.patch. You explain
> + what you are doing here.
> +
> + Signed-off-by: Stefan Fr?berg <...>
> +
> + ... here your mesa3d-02-something-else.patch ...
> =======================================================================
>
> And that's it. See the recently posted "[Buildroot] [PATCH 20/20]
> enlightenment: new package" e-mail. It adds enlightenment.mk and
> contains a patch to it.
>
> Basically you need *one* Signed-off-by in the commit log of the Git
> patch that applies to Buildroot. And then one Signed-off-by per patch
> that you're applying to mesa3d, but those Signed-off-by are *inside*
> the patch applied to mesa3d, not in the commit log of the Git patch
> applied to Buildroot.

That's what I meant. Those *inside* Signed-off tags.
How should I add those inside Signed-off tags to individual patches
(either my own make or 3rd party)
applied to mesa3d ?

Does git diff command do that ? It does not have -s switch like commit does.

Regards
Stefan