From d454d1c06247b658c6b7d12de610eb6ac72cd7d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petter=20Mab=C3=A4cker?= Date: Wed, 18 Nov 2015 09:53:06 +0100 Subject: [PATCH] readline: prepare for readline6.3 upstream patches MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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] Signed-off-by: Petter Mabäcker Signed-off-by: Ross Burton --- .../readline/{files => readline-6.3}/norpath.patch | 0 meta/recipes-core/readline/readline.inc | 5 +---- meta/recipes-core/readline/readline_6.3.bb | 5 ++++- 3 files changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-core/readline/{files => readline-6.3}/norpath.patch (100%) diff --git a/meta/recipes-core/readline/files/norpath.patch b/meta/recipes-core/readline/readline-6.3/norpath.patch similarity index 100% rename from meta/recipes-core/readline/files/norpath.patch rename to 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 3f662c3070..30892e12dd 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 fc362ae5a9..dbb9f0a946 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" -- 2.40.1