diff options
| author | Petter Mabäcker <petter@technux.se> | 2015-11-18 09:53:06 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:31:00 +0000 |
| commit | d454d1c06247b658c6b7d12de610eb6ac72cd7d4 (patch) | |
| tree | 04c6ca8ddb1112489f5b95dc7c55570cfffaf8ac | |
| parent | aea82066eb3ba67c1d3a170112ff3bb324b43dfb (diff) | |
| download | openembedded-core-d454d1c06247b658c6b7d12de610eb6ac72cd7d4.tar.gz openembedded-core-d454d1c06247b658c6b7d12de610eb6ac72cd7d4.tar.bz2 openembedded-core-d454d1c06247b658c6b7d12de610eb6ac72cd7d4.zip | |
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]
Signed-off-by: Petter Mabäcker <petter@technux.se>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -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.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-core/readline/readline_6.3.bb | 5 |
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 5d71582b70..5d71582b70 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 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" |