From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Tue, 15 Sep 2015 18:47:27 +0200 Subject: [Buildroot] [PATCH 1/2] openssl: use git formatted patches In-Reply-To: <1442289591-30376-2-git-send-email-ryanbarnett3@gmail.com> References: <1442289591-30376-1-git-send-email-ryanbarnett3@gmail.com> <1442289591-30376-2-git-send-email-ryanbarnett3@gmail.com> Message-ID: <55F84B9F.8060908@mind.be> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On 15-09-15 05:59, Ryan Barnett wrote: > From: Thomas Petazzoni > > 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 > Signed-off-by: Ryan Barnett > --- > ...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 > +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. 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. > + use em. > + > +Signed-off-by: Thomas Petazzoni > +--- > + 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? Regards, Arnout > deleted file mode 100644 > index 135a9d3..0000000 > --- a/package/openssl/001-do-not-build-docs.patch > +++ /dev/null > @@ -1,13 +0,0 @@ > -Dont waste time building manpages if we're not going to use em. > - > ---- openssl/Makefile.org > -+++ openssl/Makefile.org > -@@ -792,7 +792,7 @@ > - dist_pem_h: > - (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean) > - > --install: all install_docs install_sw > -+install: all install_sw > - > - install_sw: > - @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF