summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetter Mab├Ącker <petter@technux.se>2015-11-18 08:53:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:10 (GMT)
commit99b9d52ce4bb3be88aa8029225ca05dad215ed0b (patch)
tree97898f4afe3d0cea4e7053198cac36961395943a
parente0b6d0c1d6b7c5724a1848d147b0ad261598808e (diff)
downloadpoky-contrib-99b9d52ce4bb3be88aa8029225ca05dad215ed0b.zip
poky-contrib-99b9d52ce4bb3be88aa8029225ca05dad215ed0b.tar.gz
poky-contrib-99b9d52ce4bb3be88aa8029225ca05dad215ed0b.tar.bz2
readline: prepare for readline6.3 upstream patches
Upstream patches are always preferred to be applied first (before integration patches). In order to apply readline-6.3 specific upstream patches in a preferred order we need to apply the integration-patches at the end in the 6.3 specific recipe (this is already the case for readline-5.2). Also take the oppertunity to move 'norpath.patch' to readline-6.3 dir since this patch is not shared between the 5.2 and 6.3 recipe. [YOCTO #8451] (From OE-Core rev: d454d1c06247b658c6b7d12de610eb6ac72cd7d4) Signed-off-by: Petter Mab├Ącker <petter@technux.se> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/readline/readline-6.3/norpath.patch (renamed from meta/recipes-core/readline/files/norpath.patch)0
-rw-r--r--meta/recipes-core/readline/readline.inc5
-rw-r--r--meta/recipes-core/readline/readline_6.3.bb5
3 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-core/readline/files/norpath.patch b/meta/recipes-core/readline/readline-6.3/norpath.patch
index 5d71582..5d71582 100644
--- a/meta/recipes-core/readline/files/norpath.patch
+++ b/meta/recipes-core/readline/readline-6.3/norpath.patch
diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc
index 3f662c3..30892e1 100644
--- a/meta/recipes-core/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
@@ -11,10 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS += "ncurses"
-SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive \
- file://configure-fix.patch \
- file://config-dirent-symbols.patch \
- file://norpath.patch"
+SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive"
inherit autotools texinfo
diff --git a/meta/recipes-core/readline/readline_6.3.bb b/meta/recipes-core/readline/readline_6.3.bb
index fc362ae..dbb9f0a 100644
--- a/meta/recipes-core/readline/readline_6.3.bb
+++ b/meta/recipes-core/readline/readline_6.3.bb
@@ -1,6 +1,9 @@
require readline.inc
-SRC_URI += "file://readline-cve-2014-2524.patch;striplevel=0 \
+SRC_URI += "file://configure-fix.patch \
+ file://config-dirent-symbols.patch \
+ file://norpath.patch \
+ file://readline-cve-2014-2524.patch;striplevel=0 \
file://readline-dispatch-multikey.patch"
SRC_URI[archive.md5sum] = "33c8fb279e981274f485fd91da77e94a"