[Buildroot] [PATCH 1/2] openssl: use git formatted patches

Ryan Barnett ryanbarnett3 at gmail.com
Tue Sep 15 19:44:22 UTC 2015


Arnout,

On Tue, Sep 15, 2015 at 11:47 AM, Arnout Vandecappelle <arnout at mind.be> wrote:
> On 15-09-15 05:59, Ryan Barnett wrote:
>> From: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
>>
>> Using Git formatted patches makes it easier to adjust the patches when
>> needed.
>>
>> [Ryan: removed unnecessary patch and updated offsets]
>>
>> Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
>> Signed-off-by: Ryan Barnett <ryanbarnett3 at gmail.com>
>> ---
>>  ...time-building-manpages-if-we-re-not-going.patch | 27 +++++++++
>>  ...odev-Fix-issue-with-signature-generation.patch} | 70 +++++++++++++---------
>>  package/openssl/001-do-not-build-docs.patch        | 13 ----
>>  3 files changed, 68 insertions(+), 42 deletions(-)
>>  create mode 100644 package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
>>  rename package/openssl/{003-cryptodev-Fix-issue-with-signature-generation.patch => 0002-cryptodev-Fix-issue-with-signature-generation.patch} (82%)
>>  delete mode 100644 package/openssl/001-do-not-build-docs.patch
>>
>> diff --git a/package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch b/package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
>> new file mode 100644
>> index 0000000..93e2118
>> --- /dev/null
>> +++ b/package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
>> @@ -0,0 +1,27 @@
>> +From 53980448064b362a58e4ab2aca6f38fec93c07c3 Mon Sep 17 00:00:00 2001
>> +From: Mike Frysinger <vapier at gentoo.org>
>> +Date: Sat, 16 May 2015 18:53:51 +0200
>> +Subject: [PATCH 1/3] Dont waste time building manpages if we're not going to
>             ^^^^^^^^^^
>  Please generate patches with -N to avoid the 1/3: it's incorrect (there are
> only 2 patches) and it causes additional churn when patches are regenerated.

When I was adopting these patches, I was lazy and didn't make any
changes from Thomas's last patch other than just dropping the
unnecessary third patch.

>  I also like to add --subject-prefix= to remove the [PATCH] part, which is not
> at all useful in this context. But others may disagree.

I agree with this.

Do we want to update our buildroot documentation to reflect this?

Secondly, do you think it would be useful to add a new subsection that
documents how to properly use git to generate patches for use within
buildroot?

http://nightly.buildroot.org/manual.html#patch-policy

>> + use em.
>> +
>> +Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
>> +---
>> + Makefile.org | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
> [snip]
>> diff --git a/package/openssl/001-do-not-build-docs.patch b/package/openssl/001-do-not-build-docs.patch
>
>  If you resend, perhaps you can add -M20% so the rename is detected?

Sure. Might just stick with '-M'.

Is 20% similarity more acceptable amount than just -M (by default it
is 50%)? In our buildroot documentation we list just using -M when
sending patches upstream.

Thanks,
-Ryan



More information about the buildroot mailing list