[OE-core] [PATCH 4/7] screen: upgrade to 4.6.2

Thu Nov 16 16:09:20 UTC 2017

Breaks under MIPS, see
https://bugzilla.yoctoproject.org/show_bug.cgi?id=12353.

Ross

On 10 November 2017 at 12:00, Maxin B. John <maxin.john at intel.com> wrote:

> 4.6.1 -> 4.6.2
>
> Removed backported patches:
>         1. 0001-fix-for-multijob-build.patch
>         2. 0002-comm.h-now-depends-on-term.h.patch
>
> Signed-off-by: Maxin B. John <maxin.john at intel.com>
> ---
>  .../screen/0001-fix-for-multijob-build.patch       | 58
> ----------------------
>  .../screen/0002-comm.h-now-depends-on-term.h.patch | 33 ------------
>  .../screen/{screen_4.6.1.bb => screen_4.6.2.bb}    |  6 +--
>  3 files changed, 2 insertions(+), 95 deletions(-)
>  delete mode 100644 meta/recipes-extended/screen/
> screen/0001-fix-for-multijob-build.patch
>  delete mode 100644 meta/recipes-extended/screen/screen/0002-comm.h-now-
> depends-on-term.h.patch
>  rename meta/recipes-extended/screen/{screen_4.6.1.bb => screen_4.6.2.bb}
> (88%)
>
> diff --git a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
> b/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
> deleted file mode 100644
> index fbdb0eb..0000000
> --- a/meta/recipes-extended/screen/screen/0001-fix-for-
> multijob-build.patch
> +++ /dev/null
> @@ -1,58 +0,0 @@
> -From 79ad2885e26631077dd6b8aebe17ae95b38133a6 Mon Sep 17 00:00:00 2001
> -From: Jackie Huang <jackie.huang at windriver.com>
> -Date: Tue, 26 Jul 2016 14:23:59 +0800
> -Subject: [PATCH] fix for multijob build
> -
> -make sure that comm.sh script generates comm.h header before doing
> -anything else
> -
> -Signed-off-by: Amadeusz Sawiski <amade at asmblr.net>
> -
> -Upstream-Status: Backport
> -
> -Backport patch to fix parallel build failure and update context to make
> patch
> -coulde be applied.
> -
> -http://git.savannah.gnu.org/cgit/screen.git/commit?id=c0de6dd
> -
> -Signed-off-by: Kai Kang <kai.kang at windriver.com>
> -Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
> ----
> - Makefile.in | 8 ++++----
> - 1 file changed, 4 insertions(+), 4 deletions(-)
> -
> -diff --git a/Makefile.in b/Makefile.in
> -index aca7da3..3607711 100644
> ---- a/Makefile.in
> -+++ b/Makefile.in
> -@@ -298,7 +298,7 @@ search.o: layout.h viewport.h canvas.h search.c
> config.h screen.h os.h osdef.h a
> -  comm.h layer.h term.h image.h display.h window.h mark.h extern.h
> - tty.o: layout.h viewport.h canvas.h tty.c config.h screen.h os.h osdef.h
> ansi.h acls.h comm.h \
> -  layer.h term.h image.h display.h window.h extern.h
> --term.o: layout.h viewport.h canvas.h term.c term.h
> -+term.o: layout.h viewport.h canvas.h term.c term.h comm.h
> - window.o: layout.h viewport.h canvas.h window.c config.h screen.h os.h
> osdef.h ansi.h acls.h \
> -  comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
> - utmp.o: layout.h viewport.h canvas.h utmp.c config.h screen.h os.h
> osdef.h ansi.h acls.h \
> -@@ -324,7 +324,7 @@ canvas.o: layout.h viewport.h canvas.h canvas.c
> config.h screen.h os.h osdef.h a
> -  comm.h layer.h term.h image.h display.h window.h extern.h \
> -  braille.h
> - comm.o: layout.h viewport.h canvas.h comm.c config.h acls.h comm.h
> --kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h
> -+kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h comm.h
> - acls.o: layout.h viewport.h canvas.h acls.c config.h screen.h os.h
> osdef.h ansi.h acls.h comm.h \
> -  layer.h term.h image.h display.h window.h extern.h
> - braille.o: layout.h viewport.h canvas.h braille.c config.h screen.h os.h
> osdef.h ansi.h acls.h \
> -@@ -350,7 +350,7 @@ layout.o: layout.h viewport.h canvas.h layout.c
> config.h screen.h os.h osdef.h a
> - viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h
> os.h osdef.h ansi.h acls.h \
> -  comm.h layer.h term.h image.h display.h window.h extern.h \
> -  braille.h
> --list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h
> --list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h
> -+list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h
> comm.h
> -+list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h
> comm.h
> - list_window.o: list_generic.h list_window.c window.h layer.h screen.h
> osdef.h comm.h
> -
> ---
> -1.9.1
> -
> diff --git a/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
> b/meta/recipes-extended/screen/screen/0002-comm.h-now-
> depends-on-term.h.patch
> deleted file mode 100644
> index b5d71cc..0000000
> --- a/meta/recipes-extended/screen/screen/0002-comm.h-now-
> depends-on-term.h.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -Upstream-Status: Backport
> -
> -Backport from:
> -
> -http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c
> -
> -Signed-off-by: Kai Kang <kai.kang at windriver.com>
> ----
> -From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001
> -From: Mike Gerwitz <mike at mikegerwitz.com>
> -Date: Tue, 24 Dec 2013 22:16:31 -0500
> -Subject: [PATCH] comm.h now depends on term.h
> -
> ----
> - src/Makefile.in | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/src/Makefile.in b/src/Makefile.in
> -index e791e79..d4f7c0b 100644
> ---- a/Makefile.in
> -+++ b/Makefile.in
> -@@ -113,7 +113,7 @@ term.h: term.c term.sh
> -
> - kmapdef.c: term.h
> -
> --comm.h: comm.c comm.sh config.h
> -+comm.h: comm.c comm.sh config.h term.h
> -       AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh
> $(srcdir)/comm.sh
> -
> - docs:
> ---
> -2.4.1
> -
> diff --git a/meta/recipes-extended/screen/screen_4.6.1.bb
> b/meta/recipes-extended/screen/screen_4.6.2.bb
> similarity index 88%
> rename from meta/recipes-extended/screen/screen_4.6.1.bb
> rename to meta/recipes-extended/screen/screen_4.6.2.bb
> index bcd83a2..f54113f 100644
> --- a/meta/recipes-extended/screen/screen_4.6.1.bb
> +++ b/meta/recipes-extended/screen/screen_4.6.2.bb
> @@ -21,13 +21,11 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
>             file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
> \
>             file://Skip-host-file-system-checks-when-cross-compiling.patch
> \
>             file://Avoid-mis-identifying-systems-as-SVR4.patch \
> -           file://0002-comm.h-now-depends-on-term.h.patch \
> -           file://0001-fix-for-multijob-build.patch \
>             file://0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch
> \
>            "
>
> -SRC_URI[md5sum] = "132c893aabfaf2020074790215c8cacd"
> -SRC_URI[sha256sum] = "aba9af66cb626155d6abce4703f45c
> ce0e30a5114a368bd6387c966cbbbb7c64"
> +SRC_URI[md5sum] = "a0f529d3333b128dfaa324d978ba73a8"
> +SRC_URI[sha256sum] = "1b6922520e6a0ce5e28768d620b0f6
> 40a6631397f95ccb043b70b91bb503fa3a"
>
>  inherit autotools texinfo
>
> --
> 2.4.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20171116/372b1822/attachment-0002.html>