dropbear, chrpath: reduce local pending patches
cover dropbear, chrpath: reduce local pending patches
The following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628:
yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100)
are available in the git repository at:
https://github.com/DengkeDu/openembedded-core.git dengke/dropbear-chrpath-reduce-local-pending-patch
https://github.com//tree/dengke/dropbear-chrpath-reduce-local-pending-patch
Dengke Du (2):
dropbear: reduce local pending patches
chrpath: reduce local pending patches
.../dropbear/dropbear/0003-configure.patch | 13 +++++------ .../fix-libtomcrypt-libtommath-ordering.patch | 12 ++++++----- .../chrpath/chrpath/standarddoc.patch | 25 ++++++++++++++++------ 3 files changed, 33 insertions(+), 17 deletions(-)
Signature · 1 line
2.8.1
PATCH 1/2 dropbear: reduce local pending patches
Signed-off-by Dengke Du <[email protected]>
--- meta/recipes-core/dropbear/dropbear/0003-configure.patch | 13 +++++++------ .../dropbear/fix-libtomcrypt-libtommath-ordering.patch | 12 +++++++----- 2 files changed, 14 insertions(+), 11 deletions(-)
meta/recipes-core/dropbear/dropbear/0003-configure.patch +7 -6
@@ -1,19 +1,20 @@ -From c5f5c5054c1b15539dccf866e2c3faba7ed68456 Mon Sep 17 00:00:00 2001 +From 58dd24a80ca0f400d0761afd9ce2b7f684fc9125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]> Date: Thu, 25 Apr 2013 00:27:25 +0200 -Subject: [PATCH 3/6] configure: add a variable to allow openpty check to be cached +Subject: [PATCH] configure: add a variable to allow openpty check to be cached -Upstream-Status: Pending +Upstream-Status: Submitted [ https://github.com/mkj/dropbear/pull/48 ] +Signed-off-by: Dengke Du <[email protected]> --- configure.ac | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 05461f3..9c16d90 100644 +index 893b904..245408d 100644 --- a/configure.ac +++ b/configure.ac -@@ -166,15 +166,20 @@ AC_ARG_ENABLE(openpty, +@@ -177,15 +177,20 @@ AC_ARG_ENABLE(openpty, AC_MSG_NOTICE(Not using openpty) else AC_MSG_NOTICE(Using openpty if available)
@@ -38,5 +39,5 @@ index 05461f3..9c16d90 100644 AC_ARG_ENABLE(syslog, [ --disable-syslog Don't include syslog support], -- -1.7.11.7 +2.8.1
meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch +7 -5
@@ -1,4 +1,4 @@ -From 2fd8d2aedad0c50cdf1e43edd2387874b720ad4c Mon Sep 17 00:00:00 2001 +From 0999f907ec73db33309c2e4a771125649aaad466 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <[email protected]> Date: Fri, 16 Sep 2016 12:18:23 -0700 Subject: [PATCH] fix libtomcrypt/libtommath ordering
@@ -11,18 +11,20 @@ prepended to LIBTOM_LIBS as they are found, not appended. Note that LIBTOM_LIBS is not used when linking with the bundled libtom libs. -Upstream-Status: Pending +Upstream-Status: Pending [ The dropbear upstream master branch already +contains this, this patch will be droped when meet next release ] Signed-off-by: Andre McCurdy <[email protected]> +Signed-off-by: Dengke Du <[email protected]> --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index b6abe4c..85bb8bc 100644 +index 245408d..d624853 100644 --- a/configure.ac +++ b/configure.ac -@@ -390,16 +390,16 @@ AC_ARG_ENABLE(bundled-libtom, +@@ -393,16 +393,16 @@ AC_ARG_ENABLE(bundled-libtom, AC_MSG_NOTICE(Forcing bundled libtom*) else BUNDLED_LIBTOM=0
@@ -44,5 +46,5 @@ index b6abe4c..85bb8bc 100644 ) -- -1.9.1 +2.8.1
Signature · 1 line
2.8.1
Re: [PATCH 1/2] dropbear: reduce local pending patches
meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch prepended to LIBTOM_LIBS as they are found, not appended. · line 15
Quoted 4 lines · Dengke Du
meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch +2
-1-Upstream-Status: Pending +Upstream-Status: Pending [ The dropbear upstream master branch already +contains this, this patch will be droped when meet next release ]
If the same fix is upstream, then this can be Backport surely?
Ross
PATCH 2/2 chrpath: reduce local pending patches
In reply to Dengke DuSigned-off-by Dengke Du <[email protected]>
--- .../chrpath/chrpath/standarddoc.patch | 25 ++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
meta/recipes-devtools/chrpath/chrpath/standarddoc.patch +19 -6
@@ -1,14 +1,24 @@ -Upstream-Status: Pending +From 285b5fbf1d6b25ff55d305c17edf4d327bf19dd3 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <[email protected]> +Date: Tue, 5 Jul 2011 23:42:29 +0100 +Subject: [PATCH] chrpath: Ensure the package respects the docdir variable -autoconf/automake set docdir automatically, use their value ensuring +autoconf/automake set docdir automatically, use their value ensuring doc files are placed into $datadir/doc, not $prefix/doc. RP 5/7/2011 -Index: chrpath-0.13/Makefile.am -=================================================================== ---- chrpath-0.13.orig/Makefile.am 2011-07-05 23:40:14.769920254 +0100 -+++ chrpath-0.13/Makefile.am 2011-07-05 23:40:19.819920635 +0100 +Upstream-Status: Submitted [ http://lists.alioth.debian.org/pipermail/chrpath-devel/Week-of-Mon-20170710/000013.html ] + +Signed-off-by: Dengke Du <[email protected]> +--- + Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index b50ad21..5f7e861 100644 +--- a/Makefile.am ++++ b/Makefile.am @@ -1,7 +1,5 @@ SUBDIRS = testsuite deb
@@ -17,3 +27,6 @@ Index: chrpath-0.13/Makefile.am doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README bin_PROGRAMS = chrpath +-- +2.8.1 +
Signature · 1 line
2.8.1