* [PATCH 0/7] Package Upgrade: systemd-bootchart, dbus, dus-test, sysstat, flex, grep, byacc, coreutils
@ 2016-12-26 8:10 Chen Qi
2016-12-26 8:10 ` [PATCH 1/7] systemd-bootchart: upgrade to 231 Chen Qi
` (6 more replies)
0 siblings, 7 replies; 23+ messages in thread
From: Chen Qi @ 2016-12-26 8:10 UTC (permalink / raw)
To: openembedded-core
The following changes since commit dbb247cac5fbf7b037e4955f9793828451723924:
bitbake: cookerdata: Convert multiconfig to use BB_CURRENT_MC (2016-12-22 12:36:40 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/PU-20161226
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/PU-20161226
Chen Qi (7):
systemd-bootchart: upgrade to 231
dbus/dbus-test: upgrade to 1.10.14
sysstat: upgrade to 11.5.3
flex: upgrade to 2.6.2
grep: upgrade to 2.27
byacc: upgrade to 20161202
coreutils: upgrade to 8.26
...need_charset_alias-when-building-for-musl.patch | 0
...0001-local.mk-fix-cross-compiling-problem.patch | 26 +++++++++
...e-report-processor-and-hardware-correctly.patch | 0
.../disable-ls-output-quoting.patch | 0
.../fix-selinux-flask.patch | 0
.../man-decouple-manpages-from-build.patch | 0
.../remove-usr-local-lib-from-m4.patch | 0
.../{coreutils_8.25.bb => coreutils_8.26.bb} | 9 +--
.../{dbus-test_1.10.10.bb => dbus-test_1.10.14.bb} | 4 +-
.../dbus/{dbus_1.10.10.bb => dbus_1.10.14.bb} | 4 +-
...lex-from-flex-native-to-fix-cross-compili.patch | 51 +++++++++++++++++
...oid-c-comments-in-c-code-fails-with-gcc-6.patch | 64 ----------------------
.../recipes-devtools/flex/flex/CVE-2016-6354.patch | 59 --------------------
.../flex/flex/do_not_create_pdf_doc.patch | 17 ------
.../flex/{flex_2.6.0.bb => flex_2.6.2.bb} | 16 +++---
...d-bootchart_230.bb => systemd-bootchart_231.bb} | 4 +-
.../byacc/{byacc_20160606.bb => byacc_20161202.bb} | 4 +-
.../grep/{grep_2.26.bb => grep_2.27.bb} | 4 +-
.../{sysstat_11.4.0.bb => sysstat_11.5.3.bb} | 4 +-
19 files changed, 103 insertions(+), 163 deletions(-)
rename meta/recipes-core/coreutils/{coreutils-8.25 => coreutils-8.26}/0001-Unset-need_charset_alias-when-building-for-musl.patch (100%)
create mode 100644 meta/recipes-core/coreutils/coreutils-8.26/0001-local.mk-fix-cross-compiling-problem.patch
rename meta/recipes-core/coreutils/{coreutils-8.25 => coreutils-8.26}/0001-uname-report-processor-and-hardware-correctly.patch (100%)
rename meta/recipes-core/coreutils/{coreutils-8.25 => coreutils-8.26}/disable-ls-output-quoting.patch (100%)
rename meta/recipes-core/coreutils/{coreutils-8.25 => coreutils-8.26}/fix-selinux-flask.patch (100%)
rename meta/recipes-core/coreutils/{coreutils-8.25 => coreutils-8.26}/man-decouple-manpages-from-build.patch (100%)
rename meta/recipes-core/coreutils/{coreutils-8.25 => coreutils-8.26}/remove-usr-local-lib-from-m4.patch (100%)
rename meta/recipes-core/coreutils/{coreutils_8.25.bb => coreutils_8.26.bb} (93%)
rename meta/recipes-core/dbus/{dbus-test_1.10.10.bb => dbus-test_1.10.14.bb} (93%)
rename meta/recipes-core/dbus/{dbus_1.10.10.bb => dbus_1.10.14.bb} (98%)
create mode 100644 meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch
delete mode 100644 meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch
delete mode 100644 meta/recipes-devtools/flex/flex/CVE-2016-6354.patch
delete mode 100644 meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch
rename meta/recipes-devtools/flex/{flex_2.6.0.bb => flex_2.6.2.bb} (79%)
rename meta/recipes-devtools/systemd-bootchart/{systemd-bootchart_230.bb => systemd-bootchart_231.bb} (92%)
rename meta/recipes-extended/byacc/{byacc_20160606.bb => byacc_20161202.bb} (74%)
rename meta/recipes-extended/grep/{grep_2.26.bb => grep_2.27.bb} (88%)
rename meta/recipes-extended/sysstat/{sysstat_11.4.0.bb => sysstat_11.5.3.bb} (53%)
--
1.9.1
^ permalink raw reply [flat|nested] 23+ messages in thread* [PATCH 1/7] systemd-bootchart: upgrade to 231 2016-12-26 8:10 [PATCH 0/7] Package Upgrade: systemd-bootchart, dbus, dus-test, sysstat, flex, grep, byacc, coreutils Chen Qi @ 2016-12-26 8:10 ` Chen Qi 2016-12-26 8:10 ` [PATCH 2/7] dbus/dbus-test: upgrade to 1.10.14 Chen Qi ` (5 subsequent siblings) 6 siblings, 0 replies; 23+ messages in thread From: Chen Qi @ 2016-12-26 8:10 UTC (permalink / raw) To: openembedded-core Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- .../{systemd-bootchart_230.bb => systemd-bootchart_231.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/systemd-bootchart/{systemd-bootchart_230.bb => systemd-bootchart_231.bb} (92%) diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_230.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_231.bb similarity index 92% rename from meta/recipes-devtools/systemd-bootchart/systemd-bootchart_230.bb rename to meta/recipes-devtools/systemd-bootchart/systemd-bootchart_231.bb index 9ce629a..1d88036 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_230.bb +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_231.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https" # Modify these as desired -PV = "230+git${SRCPV}" -SRCREV = "dcb246b46239259ec99b3c6e6ab7d27e1a5a8a84" +PV = "231+git${SRCPV}" +SRCREV = "9ee2ffc1dc6c8209725e625954bbd89f96cb7139" S = "${WORKDIR}/git" -- 1.9.1 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 2/7] dbus/dbus-test: upgrade to 1.10.14 2016-12-26 8:10 [PATCH 0/7] Package Upgrade: systemd-bootchart, dbus, dus-test, sysstat, flex, grep, byacc, coreutils Chen Qi 2016-12-26 8:10 ` [PATCH 1/7] systemd-bootchart: upgrade to 231 Chen Qi @ 2016-12-26 8:10 ` Chen Qi 2016-12-26 8:10 ` [PATCH 3/7] sysstat: upgrade to 11.5.3 Chen Qi ` (4 subsequent siblings) 6 siblings, 0 replies; 23+ messages in thread From: Chen Qi @ 2016-12-26 8:10 UTC (permalink / raw) To: openembedded-core Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- meta/recipes-core/dbus/{dbus-test_1.10.10.bb => dbus-test_1.10.14.bb} | 4 ++-- meta/recipes-core/dbus/{dbus_1.10.10.bb => dbus_1.10.14.bb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-core/dbus/{dbus-test_1.10.10.bb => dbus-test_1.10.14.bb} (93%) rename meta/recipes-core/dbus/{dbus_1.10.10.bb => dbus_1.10.14.bb} (98%) diff --git a/meta/recipes-core/dbus/dbus-test_1.10.10.bb b/meta/recipes-core/dbus/dbus-test_1.10.14.bb similarity index 93% rename from meta/recipes-core/dbus/dbus-test_1.10.10.bb rename to meta/recipes-core/dbus/dbus-test_1.10.14.bb index 650b7ab..5394814 100644 --- a/meta/recipes-core/dbus/dbus-test_1.10.10.bb +++ b/meta/recipes-core/dbus/dbus-test_1.10.14.bb @@ -17,8 +17,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "495676d240eb982921b3ad1343526849" -SRC_URI[sha256sum] = "9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43" +SRC_URI[md5sum] = "3f7b013ce8f641cd4c897acda0ef3467" +SRC_URI[sha256sum] = "23238f70353e38ce5ca183ebc9525c0d97ac00ef640ad29cf794782af6e6a083" S="${WORKDIR}/dbus-${PV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" diff --git a/meta/recipes-core/dbus/dbus_1.10.10.bb b/meta/recipes-core/dbus/dbus_1.10.14.bb similarity index 98% rename from meta/recipes-core/dbus/dbus_1.10.10.bb rename to meta/recipes-core/dbus/dbus_1.10.14.bb index 4db0b9b..2ffd8b0 100644 --- a/meta/recipes-core/dbus/dbus_1.10.10.bb +++ b/meta/recipes-core/dbus/dbus_1.10.14.bb @@ -20,8 +20,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://0001-configure.ac-explicitely-check-stdint.h.patch \ " -SRC_URI[md5sum] = "495676d240eb982921b3ad1343526849" -SRC_URI[sha256sum] = "9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43" +SRC_URI[md5sum] = "3f7b013ce8f641cd4c897acda0ef3467" +SRC_URI[sha256sum] = "23238f70353e38ce5ca183ebc9525c0d97ac00ef640ad29cf794782af6e6a083" inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even -- 1.9.1 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 3/7] sysstat: upgrade to 11.5.3 2016-12-26 8:10 [PATCH 0/7] Package Upgrade: systemd-bootchart, dbus, dus-test, sysstat, flex, grep, byacc, coreutils Chen Qi 2016-12-26 8:10 ` [PATCH 1/7] systemd-bootchart: upgrade to 231 Chen Qi 2016-12-26 8:10 ` [PATCH 2/7] dbus/dbus-test: upgrade to 1.10.14 Chen Qi @ 2016-12-26 8:10 ` Chen Qi 2016-12-26 8:10 ` [PATCH 4/7] flex: upgrade to 2.6.2 Chen Qi ` (3 subsequent siblings) 6 siblings, 0 replies; 23+ messages in thread From: Chen Qi @ 2016-12-26 8:10 UTC (permalink / raw) To: openembedded-core Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- .../recipes-extended/sysstat/{sysstat_11.4.0.bb => sysstat_11.5.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/sysstat/{sysstat_11.4.0.bb => sysstat_11.5.3.bb} (53%) diff --git a/meta/recipes-extended/sysstat/sysstat_11.4.0.bb b/meta/recipes-extended/sysstat/sysstat_11.5.3.bb similarity index 53% rename from meta/recipes-extended/sysstat/sysstat_11.4.0.bb rename to meta/recipes-extended/sysstat/sysstat_11.5.3.bb index 69f83fc..bb6a671 100644 --- a/meta/recipes-extended/sysstat/sysstat_11.4.0.bb +++ b/meta/recipes-extended/sysstat/sysstat_11.5.3.bb @@ -4,5 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" SRC_URI += "file://0001-Include-needed-headers-explicitly.patch" -SRC_URI[md5sum] = "ee7b8c0b139a11a7a3418dc0658ca1be" -SRC_URI[sha256sum] = "b8518ca88acfcbc474a406022ee9c0c3210ccef4f0ec80e5b3e8c41dda8c16f2" +SRC_URI[md5sum] = "5986da64af934d8cecc7bca7ebe43752" +SRC_URI[sha256sum] = "f8229d14819e2d461ede83894648e03c8a2ad14a1ba200d68cda9816c42f41ea" -- 1.9.1 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 4/7] flex: upgrade to 2.6.2 2016-12-26 8:10 [PATCH 0/7] Package Upgrade: systemd-bootchart, dbus, dus-test, sysstat, flex, grep, byacc, coreutils Chen Qi ` (2 preceding siblings ...) 2016-12-26 8:10 ` [PATCH 3/7] sysstat: upgrade to 11.5.3 Chen Qi @ 2016-12-26 8:10 ` Chen Qi 2017-01-06 14:59 ` Burton, Ross 2017-01-26 22:39 ` Martin Jansa 2016-12-26 8:10 ` [PATCH 5/7] grep: upgrade to 2.27 Chen Qi ` (2 subsequent siblings) 6 siblings, 2 replies; 23+ messages in thread From: Chen Qi @ 2016-12-26 8:10 UTC (permalink / raw) To: openembedded-core Upgrade flex to 2.6.2. The following two patches are removed as they have been merged. 0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch CVE-2016-6354.patch do_not_create_pdf_doc.patch is removed as it's not suitable for the new version. 0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch is added to fix cross compiling problem. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- ...lex-from-flex-native-to-fix-cross-compili.patch | 51 +++++++++++++++++ ...oid-c-comments-in-c-code-fails-with-gcc-6.patch | 64 ---------------------- .../recipes-devtools/flex/flex/CVE-2016-6354.patch | 59 -------------------- .../flex/flex/do_not_create_pdf_doc.patch | 17 ------ .../flex/{flex_2.6.0.bb => flex_2.6.2.bb} | 16 +++--- 5 files changed, 60 insertions(+), 147 deletions(-) create mode 100644 meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch delete mode 100644 meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch delete mode 100644 meta/recipes-devtools/flex/flex/CVE-2016-6354.patch delete mode 100644 meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch rename meta/recipes-devtools/flex/{flex_2.6.0.bb => flex_2.6.2.bb} (79%) diff --git a/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch b/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch new file mode 100644 index 0000000..08f7688 --- /dev/null +++ b/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch @@ -0,0 +1,51 @@ +Subject: use stage1flex from flex-native to fix cross compiling + +When cross compiling, we would have failure because stage1flex cannot run on host. +Use stage1flex from flex-native to fix this problem. + +This patch is OE specific as upstream may have other way to fix this cross compilation +problem. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + src/Makefile.am | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 77ddf4b..09ffddb 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -6,17 +6,10 @@ LIBS = @LIBS@ + m4 = @M4@ + + bin_PROGRAMS = flex +-noinst_PROGRAMS = stage1flex + lib_LTLIBRARIES = \ + libfl.la \ + libfl_pic.la + +-stage1flex_SOURCES = \ +- scan.l \ +- $(COMMON_SOURCES) +- +-stage1flex_CFLAGS = $(AM_CFLAGS) +- + flex_SOURCES = \ + $(COMMON_SOURCES) + +@@ -89,8 +82,8 @@ skel.c: flex.skl mkskel.sh flexint.h tables_shared.h tables_shared.c + $(SHELL) $(srcdir)/mkskel.sh > $@.tmp + mv $@.tmp $@ + +-stage1scan.c: scan.l stage1flex$(EXEEXT) +- ./stage1flex$(EXEEXT) -o $@ $< ++stage1scan.c: scan.l ++ stage1flex$(EXEEXT) -o $@ $< + + # make needs to be told to make parse.h so that parallelized runs will + # not fail. +-- +2.1.0 + diff --git a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch b/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch deleted file mode 100644 index 438ca5f..0000000 --- a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 7072befe1397af4eb01c3ff7edf99f0cd5076089 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 30 Aug 2016 14:25:32 +0200 -Subject: [PATCH] avoid c++ comments in c-code - fails with gcc-6 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -fixes: - -| error: C++ style comments are not allowed in ISO C90 -| num_to_alloc = 1; // After all that talk, this was set to 1 anyways... - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - src/flex.skl | 2 +- - src/scan.c | 2 +- - src/skel.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/flex.skl b/src/flex.skl -index 73a0b9e..ed71627 100644 ---- a/src/flex.skl -+++ b/src/flex.skl -@@ -2350,7 +2350,7 @@ void yyFlexLexer::yyensure_buffer_stack(void) - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ -- num_to_alloc = 1; // After all that talk, this was set to 1 anyways... -+ num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ - YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - M4_YY_CALL_LAST_ARG); -diff --git a/src/scan.c b/src/scan.c -index b55df2d..f1dce75 100644 ---- a/src/scan.c -+++ b/src/scan.c -@@ -4672,7 +4672,7 @@ static void yyensure_buffer_stack (void) - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ -- num_to_alloc = 1; // After all that talk, this was set to 1 anyways... -+ num_to_alloc = 1; /* After all that talk, this was set to 1 anyways...*/ - (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - ); -diff --git a/src/skel.c b/src/skel.c -index ef657d3..26cc889 100644 ---- a/src/skel.c -+++ b/src/skel.c -@@ -2561,7 +2561,7 @@ const char *skel[] = { - " * scanner will even need a stack. We use 2 instead of 1 to avoid an", - " * immediate realloc on the next call.", - " */", -- " num_to_alloc = 1; // After all that talk, this was set to 1 anyways...", -+ " num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */", - " YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc", - " (num_to_alloc * sizeof(struct yy_buffer_state*)", - " M4_YY_CALL_LAST_ARG);", --- -2.5.5 - diff --git a/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch b/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch deleted file mode 100644 index 216ac7a..0000000 --- a/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 3939eccdff598f47e5b37b05d58bf1b44d3796e7 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Fri, 7 Oct 2016 14:15:38 +0300 -Subject: [PATCH] Prevent buffer overflow in yy_get_next_buffer - -This is upstream commit a5cbe929ac3255d371e698f62dc256afe7006466 -with some additional backporting to make binutils build again. - -Upstream-Status: Backport -CVE: CVE-2016-6354 -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - src/flex.skl | 2 +- - src/scan.c | 2 +- - src/skel.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/flex.skl b/src/flex.skl -index ed71627..814d562 100644 ---- a/src/flex.skl -+++ b/src/flex.skl -@@ -1718,7 +1718,7 @@ int yyFlexLexer::yy_get_next_buffer() - - else - { -- yy_size_t num_to_read = -+ int num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) -diff --git a/src/scan.c b/src/scan.c -index f1dce75..1949872 100644 ---- a/src/scan.c -+++ b/src/scan.c -@@ -4181,7 +4181,7 @@ static int yy_get_next_buffer (void) - - else - { -- yy_size_t num_to_read = -+ int num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) -diff --git a/src/skel.c b/src/skel.c -index 26cc889..0344d18 100644 ---- a/src/skel.c -+++ b/src/skel.c -@@ -1929,7 +1929,7 @@ const char *skel[] = { - "", - " else", - " {", -- " yy_size_t num_to_read =", -+ " int num_to_read =", - " YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;", - "", - " while ( num_to_read <= 0 )", --- -2.1.4 - diff --git a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch b/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch deleted file mode 100644 index 032833ae..0000000 --- a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Inappropriate (embedded specific) - -Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> - -Index: flex-2.5.37/doc/Makefile.am -=================================================================== ---- flex-2.5.37.orig/doc/Makefile.am 2012-07-21 04:18:27.000000000 +0300 -+++ flex-2.5.37/doc/Makefile.am 2013-07-30 17:57:09.834834531 +0300 -@@ -2,7 +2,7 @@ - - info_TEXINFOS = flex.texi - dist_man_MANS = flex.1 --dist_doc_DATA= flex.pdf -+EXTRA_DIST= flex.pdf - - CLEANFILES = \ - flex.hks \ diff --git a/meta/recipes-devtools/flex/flex_2.6.0.bb b/meta/recipes-devtools/flex/flex_2.6.2.bb similarity index 79% rename from meta/recipes-devtools/flex/flex_2.6.0.bb rename to meta/recipes-devtools/flex/flex_2.6.2.bb index ab35b09..e723124 100644 --- a/meta/recipes-devtools/flex/flex_2.6.0.bb +++ b/meta/recipes-devtools/flex/flex_2.6.2.bb @@ -5,22 +5,23 @@ HOMEPAGE = "http://sourceforge.net/projects/flex/" SECTION = "devel" LICENSE = "BSD" -DEPENDS = "${@bb.utils.contains('PTEST_ENABLED', '1', 'bison-native flex-native', '', d)}" +DEPENDS = "flex-native ${@bb.utils.contains('PTEST_ENABLED', '1', 'bison-native', '', d)}" BBCLASSEXTEND = "native nativesdk" LIC_FILES_CHKSUM = "file://COPYING;md5=e4742cf92e89040b39486a6219b68067" -SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \ +SRC_URI = "https://github.com/westes/flex/releases/download/v${PV}/flex-${PV}.tar.gz \ file://run-ptest \ - file://do_not_create_pdf_doc.patch \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ - file://0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch \ - file://CVE-2016-6354.patch \ ${@bb.utils.contains('PTEST_ENABLED', '1', '', 'file://disable-tests.patch', d)} \ " -SRC_URI[md5sum] = "266270f13c48ed043d95648075084d59" -SRC_URI[sha256sum] = "24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9" +SRC_URI_append_class-target = " \ + file://0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch \ + " + +SRC_URI[md5sum] = "cc6d76c333db7653d5caf423a3335239" +SRC_URI[sha256sum] = "9a01437a1155c799b7dc2508620564ef806ba66250c36bf5f9034b1c207cb2c9" # Flex has moved to github from 2.6.1 onwards UPSTREAM_CHECK_URI = "https://github.com/westes/flex/releases" @@ -37,6 +38,7 @@ EXTRA_OEMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', 'FLEX=${STAGING_BIND do_install_append_class-native() { create_wrapper ${D}/${bindir}/flex M4=${M4} + cp ${B}/src/stage1flex ${D}/${bindir} } do_install_append_class-nativesdk() { -- 1.9.1 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH 4/7] flex: upgrade to 2.6.2 2016-12-26 8:10 ` [PATCH 4/7] flex: upgrade to 2.6.2 Chen Qi @ 2017-01-06 14:59 ` Burton, Ross 2017-01-09 1:53 ` ChenQi 2017-01-09 9:39 ` ChenQi 2017-01-26 22:39 ` Martin Jansa 1 sibling, 2 replies; 23+ messages in thread From: Burton, Ross @ 2017-01-06 14:59 UTC (permalink / raw) To: Chen Qi; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 238 bytes --] On 26 December 2016 at 08:10, Chen Qi <Qi.Chen@windriver.com> wrote: > + cp ${B}/src/stage1flex ${D}/${bindir} > Can this not just use the flex from flex-native directly instead of having to install the stage1flex? Ross [-- Attachment #2: Type: text/html, Size: 680 bytes --] ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/7] flex: upgrade to 2.6.2 2017-01-06 14:59 ` Burton, Ross @ 2017-01-09 1:53 ` ChenQi 2017-01-09 15:24 ` Burton, Ross 2017-01-09 9:39 ` ChenQi 1 sibling, 1 reply; 23+ messages in thread From: ChenQi @ 2017-01-09 1:53 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 592 bytes --] On 01/06/2017 10:59 PM, Burton, Ross wrote: > > On 26 December 2016 at 08:10, Chen Qi <Qi.Chen@windriver.com > <mailto:Qi.Chen@windriver.com>> wrote: > > + cp ${B}/src/stage1flex ${D}/${bindir} > > > Can this not just use the flex from flex-native directly instead of > having to install the stage1flex? > > Ross Hi Ross, I'm not sure if I understand it correctly. stage1flex has to be in sysroot to be used safely. Otherwise, if rm_work is enabled, things are removed. And for stage1flex to be in sysroot, it has to be installed. Best Regards, Chen Qi [-- Attachment #2: Type: text/html, Size: 1788 bytes --] ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/7] flex: upgrade to 2.6.2 2017-01-09 1:53 ` ChenQi @ 2017-01-09 15:24 ` Burton, Ross 0 siblings, 0 replies; 23+ messages in thread From: Burton, Ross @ 2017-01-09 15:24 UTC (permalink / raw) To: ChenQi; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 515 bytes --] On 9 January 2017 at 01:53, ChenQi <Qi.Chen@windriver.com> wrote: > I'm not sure if I understand it correctly. stage1flex has to be in sysroot > to be used safely. Otherwise, if rm_work is enabled, things are removed. > And for stage1flex to be in sysroot, it has to be installed. > > This reminded me that there was work upstream over the holiday to fix the cross-compile problem and they asked for my testing. It appears to work so I'll submit an update myself shortly which incorporates that. Ross [-- Attachment #2: Type: text/html, Size: 900 bytes --] ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/7] flex: upgrade to 2.6.2 2017-01-06 14:59 ` Burton, Ross 2017-01-09 1:53 ` ChenQi @ 2017-01-09 9:39 ` ChenQi 1 sibling, 0 replies; 23+ messages in thread From: ChenQi @ 2017-01-09 9:39 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 730 bytes --] On 01/06/2017 10:59 PM, Burton, Ross wrote: > > On 26 December 2016 at 08:10, Chen Qi <Qi.Chen@windriver.com > <mailto:Qi.Chen@windriver.com>> wrote: > > + cp ${B}/src/stage1flex ${D}/${bindir} > > > Can this not just use the flex from flex-native directly instead of > having to install the stage1flex? > > Ross Hi Ross, I just found that nativesdk-flex also needs the following patch to compile correctly. 0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch I've fixed the problem and updated the remote branch. git://git.pokylinux.org/poky-contrib ChenQi/PU-20161226 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/PU-20161226 Best Regards, Chen Qi [-- Attachment #2: Type: text/html, Size: 2081 bytes --] ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/7] flex: upgrade to 2.6.2 2016-12-26 8:10 ` [PATCH 4/7] flex: upgrade to 2.6.2 Chen Qi 2017-01-06 14:59 ` Burton, Ross @ 2017-01-26 22:39 ` Martin Jansa 2017-01-27 2:16 ` Khem Raj 1 sibling, 1 reply; 23+ messages in thread From: Martin Jansa @ 2017-01-26 22:39 UTC (permalink / raw) To: Chen Qi; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 13079 bytes --] This is breaking number of recipes as discussed in acpica thread: http://lists.openembedded.org/pipermail/openembedded-core/2017-January/131555.html in by builds I also see failures in qtwebkit, upstart, libpbnjson, ... I've tried to upgrade to 2.6.3 as suggested in: https://github.com/westes/flex/issues/164 but that brings different set of undefined yy* symbols (e.g. yywrap in yylex function when building binutils-crosssdk and in the end it doesn't help at all, because even binutils, binutils-cross, dtc-native fail much sooner. Is someone working on flex upgrade or can we revert this 2.6.2 upgrade until these issues are resolved? On Mon, Dec 26, 2016 at 9:10 AM, Chen Qi <Qi.Chen@windriver.com> wrote: > Upgrade flex to 2.6.2. > > The following two patches are removed as they have been merged. > 0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > CVE-2016-6354.patch > > do_not_create_pdf_doc.patch is removed as it's not suitable for the new > version. > > 0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch is added > to fix cross compiling problem. > > Signed-off-by: Chen Qi <Qi.Chen@windriver.com> > --- > ...lex-from-flex-native-to-fix-cross-compili.patch | 51 +++++++++++++++++ > ...oid-c-comments-in-c-code-fails-with-gcc-6.patch | 64 > ---------------------- > .../recipes-devtools/flex/flex/CVE-2016-6354.patch | 59 > -------------------- > .../flex/flex/do_not_create_pdf_doc.patch | 17 ------ > .../flex/{flex_2.6.0.bb => flex_2.6.2.bb} | 16 +++--- > 5 files changed, 60 insertions(+), 147 deletions(-) > create mode 100644 meta/recipes-devtools/flex/ > flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch > delete mode 100644 meta/recipes-devtools/flex/ > flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > delete mode 100644 meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > delete mode 100644 meta/recipes-devtools/flex/flex/do_not_create_pdf_doc. > patch > rename meta/recipes-devtools/flex/{flex_2.6.0.bb => flex_2.6.2.bb} (79%) > > diff --git a/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from- > flex-native-to-fix-cross-compili.patch b/meta/recipes-devtools/flex/ > flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch > new file mode 100644 > index 0000000..08f7688 > --- /dev/null > +++ b/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from- > flex-native-to-fix-cross-compili.patch > @@ -0,0 +1,51 @@ > +Subject: use stage1flex from flex-native to fix cross compiling > + > +When cross compiling, we would have failure because stage1flex cannot run > on host. > +Use stage1flex from flex-native to fix this problem. > + > +This patch is OE specific as upstream may have other way to fix this > cross compilation > +problem. > + > +Upstream-Status: Inappropriate [OE specific] > + > +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> > +--- > + src/Makefile.am | 11 ++--------- > + 1 file changed, 2 insertions(+), 9 deletions(-) > + > +diff --git a/src/Makefile.am b/src/Makefile.am > +index 77ddf4b..09ffddb 100644 > +--- a/src/Makefile.am > ++++ b/src/Makefile.am > +@@ -6,17 +6,10 @@ LIBS = @LIBS@ > + m4 = @M4@ > + > + bin_PROGRAMS = flex > +-noinst_PROGRAMS = stage1flex > + lib_LTLIBRARIES = \ > + libfl.la \ > + libfl_pic.la > + > +-stage1flex_SOURCES = \ > +- scan.l \ > +- $(COMMON_SOURCES) > +- > +-stage1flex_CFLAGS = $(AM_CFLAGS) > +- > + flex_SOURCES = \ > + $(COMMON_SOURCES) > + > +@@ -89,8 +82,8 @@ skel.c: flex.skl mkskel.sh flexint.h tables_shared.h > tables_shared.c > + $(SHELL) $(srcdir)/mkskel.sh > $@.tmp > + mv $@.tmp $@ > + > +-stage1scan.c: scan.l stage1flex$(EXEEXT) > +- ./stage1flex$(EXEEXT) -o $@ $< > ++stage1scan.c: scan.l > ++ stage1flex$(EXEEXT) -o $@ $< > + > + # make needs to be told to make parse.h so that parallelized runs will > + # not fail. > +-- > +2.1.0 > + > diff --git a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > b/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in- > c-code-fails-with-gcc-6.patch > deleted file mode 100644 > index 438ca5f..0000000 > --- a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in- > c-code-fails-with-gcc-6.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From 7072befe1397af4eb01c3ff7edf99f0cd5076089 Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> > -Date: Tue, 30 Aug 2016 14:25:32 +0200 > -Subject: [PATCH] avoid c++ comments in c-code - fails with gcc-6 > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -fixes: > - > -| error: C++ style comments are not allowed in ISO C90 > -| num_to_alloc = 1; // After all that talk, this was set to 1 anyways... > - > -Upstream-Status: Pending > - > -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> > ---- > - src/flex.skl | 2 +- > - src/scan.c | 2 +- > - src/skel.c | 2 +- > - 3 files changed, 3 insertions(+), 3 deletions(-) > - > -diff --git a/src/flex.skl b/src/flex.skl > -index 73a0b9e..ed71627 100644 > ---- a/src/flex.skl > -+++ b/src/flex.skl > -@@ -2350,7 +2350,7 @@ void yyFlexLexer::yyensure_buffer_stack(void) > - * scanner will even need a stack. We use 2 instead of 1 > to avoid an > - * immediate realloc on the next call. > - */ > -- num_to_alloc = 1; // After all that talk, this was set to > 1 anyways... > -+ num_to_alloc = 1; /* After all that talk, this was set to > 1 anyways... */ > - YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc > - > (num_to_alloc * sizeof(struct yy_buffer_state*) > - > M4_YY_CALL_LAST_ARG); > -diff --git a/src/scan.c b/src/scan.c > -index b55df2d..f1dce75 100644 > ---- a/src/scan.c > -+++ b/src/scan.c > -@@ -4672,7 +4672,7 @@ static void yyensure_buffer_stack (void) > - * scanner will even need a stack. We use 2 instead of 1 > to avoid an > - * immediate realloc on the next call. > - */ > -- num_to_alloc = 1; // After all that talk, this was set to > 1 anyways... > -+ num_to_alloc = 1; /* After all that talk, this was set to > 1 anyways...*/ > - (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc > - > (num_to_alloc * sizeof(struct yy_buffer_state*) > - ); > -diff --git a/src/skel.c b/src/skel.c > -index ef657d3..26cc889 100644 > ---- a/src/skel.c > -+++ b/src/skel.c > -@@ -2561,7 +2561,7 @@ const char *skel[] = { > - " * scanner will even need a stack. We use 2 instead of 1 > to avoid an", > - " * immediate realloc on the next call.", > - " */", > -- " num_to_alloc = 1; // After all that talk, this was set to > 1 anyways...", > -+ " num_to_alloc = 1; /* After all that talk, this was set to > 1 anyways... */", > - " YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc", > - " > (num_to_alloc * sizeof(struct yy_buffer_state*)", > - " > M4_YY_CALL_LAST_ARG);", > --- > -2.5.5 > - > diff --git a/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > b/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > deleted file mode 100644 > index 216ac7a..0000000 > --- a/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > +++ /dev/null > @@ -1,59 +0,0 @@ > -From 3939eccdff598f47e5b37b05d58bf1b44d3796e7 Mon Sep 17 00:00:00 2001 > -From: Jussi Kukkonen <jussi.kukkonen@intel.com> > -Date: Fri, 7 Oct 2016 14:15:38 +0300 > -Subject: [PATCH] Prevent buffer overflow in yy_get_next_buffer > - > -This is upstream commit a5cbe929ac3255d371e698f62dc256afe7006466 > -with some additional backporting to make binutils build again. > - > -Upstream-Status: Backport > -CVE: CVE-2016-6354 > -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > ---- > - src/flex.skl | 2 +- > - src/scan.c | 2 +- > - src/skel.c | 2 +- > - 3 files changed, 3 insertions(+), 3 deletions(-) > - > -diff --git a/src/flex.skl b/src/flex.skl > -index ed71627..814d562 100644 > ---- a/src/flex.skl > -+++ b/src/flex.skl > -@@ -1718,7 +1718,7 @@ int yyFlexLexer::yy_get_next_buffer() > - > - else > - { > -- yy_size_t num_to_read = > -+ int num_to_read = > - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - > number_to_move - 1; > - > - while ( num_to_read <= 0 ) > -diff --git a/src/scan.c b/src/scan.c > -index f1dce75..1949872 100644 > ---- a/src/scan.c > -+++ b/src/scan.c > -@@ -4181,7 +4181,7 @@ static int yy_get_next_buffer (void) > - > - else > - { > -- yy_size_t num_to_read = > -+ int num_to_read = > - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - > number_to_move - 1; > - > - while ( num_to_read <= 0 ) > -diff --git a/src/skel.c b/src/skel.c > -index 26cc889..0344d18 100644 > ---- a/src/skel.c > -+++ b/src/skel.c > -@@ -1929,7 +1929,7 @@ const char *skel[] = { > - "", > - " else", > - " {", > -- " yy_size_t num_to_read =", > -+ " int num_to_read =", > - " YY_CURRENT_BUFFER_LVALUE->yy_buf_size - > number_to_move - 1;", > - "", > - " while ( num_to_read <= 0 )", > --- > -2.1.4 > - > diff --git a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > b/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > deleted file mode 100644 > index 032833ae..0000000 > --- a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > +++ /dev/null > @@ -1,17 +0,0 @@ > -Upstream-Status: Inappropriate (embedded specific) > - > -Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> > - > -Index: flex-2.5.37/doc/Makefile.am > -=================================================================== > ---- flex-2.5.37.orig/doc/Makefile.am 2012-07-21 04:18:27.000000000 > +0300 > -+++ flex-2.5.37/doc/Makefile.am 2013-07-30 17:57:09.834834531 +0300 > -@@ -2,7 +2,7 @@ > - > - info_TEXINFOS = flex.texi > - dist_man_MANS = flex.1 > --dist_doc_DATA= flex.pdf > -+EXTRA_DIST= flex.pdf > - > - CLEANFILES = \ > - flex.hks \ > diff --git a/meta/recipes-devtools/flex/flex_2.6.0.bb > b/meta/recipes-devtools/flex/flex_2.6.2.bb > similarity index 79% > rename from meta/recipes-devtools/flex/flex_2.6.0.bb > rename to meta/recipes-devtools/flex/flex_2.6.2.bb > index ab35b09..e723124 100644 > --- a/meta/recipes-devtools/flex/flex_2.6.0.bb > +++ b/meta/recipes-devtools/flex/flex_2.6.2.bb > @@ -5,22 +5,23 @@ HOMEPAGE = "http://sourceforge.net/projects/flex/" > SECTION = "devel" > LICENSE = "BSD" > > -DEPENDS = "${@bb.utils.contains('PTEST_ENABLED', '1', 'bison-native > flex-native', '', d)}" > +DEPENDS = "flex-native ${@bb.utils.contains('PTEST_ENABLED', '1', > 'bison-native', '', d)}" > BBCLASSEXTEND = "native nativesdk" > > LIC_FILES_CHKSUM = "file://COPYING;md5=e4742cf92e89040b39486a6219b68067" > > -SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \ > +SRC_URI = "https://github.com/westes/flex/releases/download/v${PV}/ > flex-${PV}.tar.gz \ > file://run-ptest \ > - file://do_not_create_pdf_doc.patch \ > file://0001-tests-add-a-target-for-building-tests-without-runnin.patch > \ > - file://0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > \ > - file://CVE-2016-6354.patch \ > ${@bb.utils.contains('PTEST_ENABLED', '1', '', > 'file://disable-tests.patch', d)} \ > " > > -SRC_URI[md5sum] = "266270f13c48ed043d95648075084d59" > -SRC_URI[sha256sum] = "24e611ef5a4703a191012f80c1027d > c9d12555183ce0ecd46f3636e587e9b8e9" > +SRC_URI_append_class-target = " \ > + file://0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch > \ > + " > + > +SRC_URI[md5sum] = "cc6d76c333db7653d5caf423a3335239" > +SRC_URI[sha256sum] = "9a01437a1155c799b7dc2508620564 > ef806ba66250c36bf5f9034b1c207cb2c9" > > # Flex has moved to github from 2.6.1 onwards > UPSTREAM_CHECK_URI = "https://github.com/westes/flex/releases" > @@ -37,6 +38,7 @@ EXTRA_OEMAKE += "${@bb.utils.contains('PTEST_ENABLED', > '1', 'FLEX=${STAGING_BIND > > do_install_append_class-native() { > create_wrapper ${D}/${bindir}/flex M4=${M4} > + cp ${B}/src/stage1flex ${D}/${bindir} > } > > do_install_append_class-nativesdk() { > -- > 1.9.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 17651 bytes --] ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/7] flex: upgrade to 2.6.2 2017-01-26 22:39 ` Martin Jansa @ 2017-01-27 2:16 ` Khem Raj 2017-01-27 2:19 ` Martin Jansa 0 siblings, 1 reply; 23+ messages in thread From: Khem Raj @ 2017-01-27 2:16 UTC (permalink / raw) To: openembedded-core On 1/26/17 2:39 PM, Martin Jansa wrote: > This is breaking number of recipes as discussed in acpica thread: > http://lists.openembedded.org/pipermail/openembedded-core/2017-January/131555.html > > in by builds I also see failures in qtwebkit, upstart, libpbnjson, ... > > I've tried to upgrade to 2.6.3 as suggested in: > https://github.com/westes/flex/issues/164 > > but that brings different set of undefined yy* symbols (e.g. yywrap in > yylex function when building binutils-crosssdk and in the end it doesn't > help at all, because even binutils, binutils-cross, dtc-native fail much > sooner. > > Is someone working on flex upgrade or can we revert this 2.6.2 upgrade > until these issues are resolved? > +1 I have reverted this upgrade locally. Its breaking webkit too. I think we should either revert this or try out 2.6.3 in short time. > On Mon, Dec 26, 2016 at 9:10 AM, Chen Qi <Qi.Chen@windriver.com > <mailto:Qi.Chen@windriver.com>> wrote: > > Upgrade flex to 2.6.2. > > The following two patches are removed as they have been merged. > 0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > CVE-2016-6354.patch > > do_not_create_pdf_doc.patch is removed as it's not suitable for the new > version. > > 0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch is added > to fix cross compiling problem. > > Signed-off-by: Chen Qi <Qi.Chen@windriver.com > <mailto:Qi.Chen@windriver.com>> > --- > ...lex-from-flex-native-to-fix-cross-compili.patch | 51 > +++++++++++++++++ > ...oid-c-comments-in-c-code-fails-with-gcc-6.patch | 64 > ---------------------- > .../recipes-devtools/flex/flex/CVE-2016-6354.patch | 59 > -------------------- > .../flex/flex/do_not_create_pdf_doc.patch | 17 ------ > .../flex/{flex_2.6.0.bb <http://flex_2.6.0.bb> => flex_2.6.2.bb > <http://flex_2.6.2.bb>} | 16 +++--- > 5 files changed, 60 insertions(+), 147 deletions(-) > create mode 100644 > meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch > delete mode 100644 > meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > delete mode 100644 meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > delete mode 100644 > meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > rename meta/recipes-devtools/flex/{flex_2.6.0.bb > <http://flex_2.6.0.bb> => flex_2.6.2.bb <http://flex_2.6.2.bb>} (79%) > > diff --git > a/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch > b/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch > new file mode 100644 > index 0000000..08f7688 > --- /dev/null > +++ > b/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch > @@ -0,0 +1,51 @@ > +Subject: use stage1flex from flex-native to fix cross compiling > + > +When cross compiling, we would have failure because stage1flex > cannot run on host. > +Use stage1flex from flex-native to fix this problem. > + > +This patch is OE specific as upstream may have other way to fix > this cross compilation > +problem. > + > +Upstream-Status: Inappropriate [OE specific] > + > +Signed-off-by: Chen Qi <Qi.Chen@windriver.com > <mailto:Qi.Chen@windriver.com>> > +--- > + src/Makefile.am | 11 ++--------- > + 1 file changed, 2 insertions(+), 9 deletions(-) > + > +diff --git a/src/Makefile.am b/src/Makefile.am > +index 77ddf4b..09ffddb 100644 > +--- a/src/Makefile.am > ++++ b/src/Makefile.am > +@@ -6,17 +6,10 @@ LIBS = @LIBS@ > + m4 = @M4@ > + > + bin_PROGRAMS = flex > +-noinst_PROGRAMS = stage1flex > + lib_LTLIBRARIES = \ > + libfl.la <http://libfl.la> \ > + libfl_pic.la <http://libfl_pic.la> > + > +-stage1flex_SOURCES = \ > +- scan.l \ > +- $(COMMON_SOURCES) > +- > +-stage1flex_CFLAGS = $(AM_CFLAGS) > +- > + flex_SOURCES = \ > + $(COMMON_SOURCES) > + > +@@ -89,8 +82,8 @@ skel.c: flex.skl mkskel.sh flexint.h > tables_shared.h tables_shared.c > + $(SHELL) $(srcdir)/mkskel.sh > $@.tmp > + mv $@.tmp $@ > + > +-stage1scan.c: scan.l stage1flex$(EXEEXT) > +- ./stage1flex$(EXEEXT) -o $@ $< > ++stage1scan.c: scan.l > ++ stage1flex$(EXEEXT) -o $@ $< > + > + # make needs to be told to make parse.h so that parallelized runs will > + # not fail. > +-- > +2.1.0 > + > diff --git > a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > b/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > deleted file mode 100644 > index 438ca5f..0000000 > --- > a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From 7072befe1397af4eb01c3ff7edf99f0cd5076089 Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?Andreas=20M=C3=BCller?= > <schnitzeltony@googlemail.com <mailto:schnitzeltony@googlemail.com>> > -Date: Tue, 30 Aug 2016 14:25:32 +0200 > -Subject: [PATCH] avoid c++ comments in c-code - fails with gcc-6 > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -fixes: > - > -| error: C++ style comments are not allowed in ISO C90 > -| num_to_alloc = 1; // After all that talk, this was set to 1 > anyways... > - > -Upstream-Status: Pending > - > -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com > <mailto:schnitzeltony@googlemail.com>> > ---- > - src/flex.skl | 2 +- > - src/scan.c | 2 +- > - src/skel.c | 2 +- > - 3 files changed, 3 insertions(+), 3 deletions(-) > - > -diff --git a/src/flex.skl b/src/flex.skl > -index 73a0b9e..ed71627 100644 > ---- a/src/flex.skl > -+++ b/src/flex.skl > -@@ -2350,7 +2350,7 @@ void yyFlexLexer::yyensure_buffer_stack(void) > - * scanner will even need a stack. We use 2 instead > of 1 to avoid an > - * immediate realloc on the next call. > - */ > -- num_to_alloc = 1; // After all that talk, this was > set to 1 anyways... > -+ num_to_alloc = 1; /* After all that talk, this was > set to 1 anyways... */ > - YY_G(yy_buffer_stack) = (struct > yy_buffer_state**)yyalloc > - > (num_to_alloc * sizeof(struct yy_buffer_state*) > - > M4_YY_CALL_LAST_ARG); > -diff --git a/src/scan.c b/src/scan.c > -index b55df2d..f1dce75 100644 > ---- a/src/scan.c > -+++ b/src/scan.c > -@@ -4672,7 +4672,7 @@ static void yyensure_buffer_stack (void) > - * scanner will even need a stack. We use 2 instead > of 1 to avoid an > - * immediate realloc on the next call. > - */ > -- num_to_alloc = 1; // After all that talk, this was > set to 1 anyways... > -+ num_to_alloc = 1; /* After all that talk, this was > set to 1 anyways...*/ > - (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc > - > (num_to_alloc * sizeof(struct yy_buffer_state*) > - ); > -diff --git a/src/skel.c b/src/skel.c > -index ef657d3..26cc889 100644 > ---- a/src/skel.c > -+++ b/src/skel.c > -@@ -2561,7 +2561,7 @@ const char *skel[] = { > - " * scanner will even need a stack. We use 2 instead > of 1 to avoid an", > - " * immediate realloc on the next call.", > - " */", > -- " num_to_alloc = 1; // After all that talk, this was > set to 1 anyways...", > -+ " num_to_alloc = 1; /* After all that talk, this was > set to 1 anyways... */", > - " YY_G(yy_buffer_stack) = (struct > yy_buffer_state**)yyalloc", > - " > (num_to_alloc * sizeof(struct yy_buffer_state*)", > - " > M4_YY_CALL_LAST_ARG);", > --- > -2.5.5 > - > diff --git a/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > b/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > deleted file mode 100644 > index 216ac7a..0000000 > --- a/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > +++ /dev/null > @@ -1,59 +0,0 @@ > -From 3939eccdff598f47e5b37b05d58bf1b44d3796e7 Mon Sep 17 00:00:00 2001 > -From: Jussi Kukkonen <jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com>> > -Date: Fri, 7 Oct 2016 14:15:38 +0300 > -Subject: [PATCH] Prevent buffer overflow in yy_get_next_buffer > - > -This is upstream commit a5cbe929ac3255d371e698f62dc256afe7006466 > -with some additional backporting to make binutils build again. > - > -Upstream-Status: Backport > -CVE: CVE-2016-6354 > -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com > <mailto:jussi.kukkonen@intel.com>> > ---- > - src/flex.skl | 2 +- > - src/scan.c | 2 +- > - src/skel.c | 2 +- > - 3 files changed, 3 insertions(+), 3 deletions(-) > - > -diff --git a/src/flex.skl b/src/flex.skl > -index ed71627..814d562 100644 > ---- a/src/flex.skl > -+++ b/src/flex.skl > -@@ -1718,7 +1718,7 @@ int yyFlexLexer::yy_get_next_buffer() > - > - else > - { > -- yy_size_t num_to_read = > -+ int num_to_read = > - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - > number_to_move - 1; > - > - while ( num_to_read <= 0 ) > -diff --git a/src/scan.c b/src/scan.c > -index f1dce75..1949872 100644 > ---- a/src/scan.c > -+++ b/src/scan.c > -@@ -4181,7 +4181,7 @@ static int yy_get_next_buffer (void) > - > - else > - { > -- yy_size_t num_to_read = > -+ int num_to_read = > - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - > number_to_move - 1; > - > - while ( num_to_read <= 0 ) > -diff --git a/src/skel.c b/src/skel.c > -index 26cc889..0344d18 100644 > ---- a/src/skel.c > -+++ b/src/skel.c > -@@ -1929,7 +1929,7 @@ const char *skel[] = { > - "", > - " else", > - " {", > -- " yy_size_t num_to_read =", > -+ " int num_to_read =", > - " YY_CURRENT_BUFFER_LVALUE->yy_buf_size - > number_to_move - 1;", > - "", > - " while ( num_to_read <= 0 )", > --- > -2.1.4 > - > diff --git > a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > b/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > deleted file mode 100644 > index 032833ae..0000000 > --- a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > +++ /dev/null > @@ -1,17 +0,0 @@ > -Upstream-Status: Inappropriate (embedded specific) > - > -Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com > <mailto:laurentiu.palcu@intel.com>> > - > -Index: flex-2.5.37/doc/Makefile.am > -=================================================================== > ---- flex-2.5.37.orig/doc/Makefile.am 2012-07-21 > 04:18:27.000000000 +0300 > -+++ flex-2.5.37/doc/Makefile.am 2013-07-30 > 17:57:09.834834531 +0300 > -@@ -2,7 +2,7 @@ > - > - info_TEXINFOS = flex.texi > - dist_man_MANS = flex.1 > --dist_doc_DATA= flex.pdf > -+EXTRA_DIST= flex.pdf > - > - CLEANFILES = \ > - flex.hks \ > diff --git a/meta/recipes-devtools/flex/flex_2.6.0.bb > <http://flex_2.6.0.bb> b/meta/recipes-devtools/flex/flex_2.6.2.bb > <http://flex_2.6.2.bb> > similarity index 79% > rename from meta/recipes-devtools/flex/flex_2.6.0.bb > <http://flex_2.6.0.bb> > rename to meta/recipes-devtools/flex/flex_2.6.2.bb > <http://flex_2.6.2.bb> > index ab35b09..e723124 100644 > --- a/meta/recipes-devtools/flex/flex_2.6.0.bb <http://flex_2.6.0.bb> > +++ b/meta/recipes-devtools/flex/flex_2.6.2.bb <http://flex_2.6.2.bb> > @@ -5,22 +5,23 @@ HOMEPAGE = "http://sourceforge.net/projects/flex/ > <http://sourceforge.net/projects/flex/>" > SECTION = "devel" > LICENSE = "BSD" > > -DEPENDS = "${@bb.utils.contains('PTEST_ENABLED', '1', 'bison-native > flex-native', '', d)}" > +DEPENDS = "flex-native ${@bb.utils.contains('PTEST_ENABLED', '1', > 'bison-native', '', d)}" > BBCLASSEXTEND = "native nativesdk" > > LIC_FILES_CHKSUM = > "file://COPYING;md5=e4742cf92e89040b39486a6219b68067" > > -SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \ > +SRC_URI = > "https://github.com/westes/flex/releases/download/v${PV}/flex-${PV}.tar.gz > <https://github.com/westes/flex/releases/download/v${PV}/flex-${PV}.tar.gz> > \ > file://run-ptest \ > - file://do_not_create_pdf_doc.patch \ > > file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ > - > file://0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch \ > - file://CVE-2016-6354.patch \ > ${@bb.utils.contains('PTEST_ENABLED', '1', '', > 'file://disable-tests.patch', d)} \ > " > > -SRC_URI[md5sum] = "266270f13c48ed043d95648075084d59" > -SRC_URI[sha256sum] = > "24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9" > +SRC_URI_append_class-target = " \ > + > file://0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch > \ > + " > + > +SRC_URI[md5sum] = "cc6d76c333db7653d5caf423a3335239" > +SRC_URI[sha256sum] = > "9a01437a1155c799b7dc2508620564ef806ba66250c36bf5f9034b1c207cb2c9" > > # Flex has moved to github from 2.6.1 onwards > UPSTREAM_CHECK_URI = "https://github.com/westes/flex/releases > <https://github.com/westes/flex/releases>" > @@ -37,6 +38,7 @@ EXTRA_OEMAKE += > "${@bb.utils.contains('PTEST_ENABLED', '1', 'FLEX=${STAGING_BIND > > do_install_append_class-native() { > create_wrapper ${D}/${bindir}/flex M4=${M4} > + cp ${B}/src/stage1flex ${D}/${bindir} > } > > do_install_append_class-nativesdk() { > -- > 1.9.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > <mailto:Openembedded-core@lists.openembedded.org> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > <http://lists.openembedded.org/mailman/listinfo/openembedded-core> > > > > ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/7] flex: upgrade to 2.6.2 2017-01-27 2:16 ` Khem Raj @ 2017-01-27 2:19 ` Martin Jansa 2017-01-27 2:21 ` Khem Raj 0 siblings, 1 reply; 23+ messages in thread From: Martin Jansa @ 2017-01-27 2:19 UTC (permalink / raw) To: Khem Raj; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 17041 bytes --] I did try 2.6.3 but it was even worse as reported, if anyone wants to use it as starting point here it is: http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/master&id=4590c0145a7ae98e7ff7bbf40ec3e25471484f60 but then I've reverted both 2.6.3 and 2.6.2 upgrade and I don't plan to work on it. On Fri, Jan 27, 2017 at 3:16 AM, Khem Raj <raj.khem@gmail.com> wrote: > > > On 1/26/17 2:39 PM, Martin Jansa wrote: > > This is breaking number of recipes as discussed in acpica thread: > > http://lists.openembedded.org/pipermail/openembedded-core/ > 2017-January/131555.html > > > > in by builds I also see failures in qtwebkit, upstart, libpbnjson, ... > > > > I've tried to upgrade to 2.6.3 as suggested in: > > https://github.com/westes/flex/issues/164 > > > > but that brings different set of undefined yy* symbols (e.g. yywrap in > > yylex function when building binutils-crosssdk and in the end it doesn't > > help at all, because even binutils, binutils-cross, dtc-native fail much > > sooner. > > > > Is someone working on flex upgrade or can we revert this 2.6.2 upgrade > > until these issues are resolved? > > > > +1 > I have reverted this upgrade locally. Its breaking webkit too. I think > we should either revert this or try out 2.6.3 in short time. > > > On Mon, Dec 26, 2016 at 9:10 AM, Chen Qi <Qi.Chen@windriver.com > > <mailto:Qi.Chen@windriver.com>> wrote: > > > > Upgrade flex to 2.6.2. > > > > The following two patches are removed as they have been merged. > > 0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > > CVE-2016-6354.patch > > > > do_not_create_pdf_doc.patch is removed as it's not suitable for the > new > > version. > > > > 0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch is > added > > to fix cross compiling problem. > > > > Signed-off-by: Chen Qi <Qi.Chen@windriver.com > > <mailto:Qi.Chen@windriver.com>> > > --- > > ...lex-from-flex-native-to-fix-cross-compili.patch | 51 > > +++++++++++++++++ > > ...oid-c-comments-in-c-code-fails-with-gcc-6.patch | 64 > > ---------------------- > > .../recipes-devtools/flex/flex/CVE-2016-6354.patch | 59 > > -------------------- > > .../flex/flex/do_not_create_pdf_doc.patch | 17 ------ > > .../flex/{flex_2.6.0.bb <http://flex_2.6.0.bb> => flex_2.6.2.bb > > <http://flex_2.6.2.bb>} | 16 +++--- > > 5 files changed, 60 insertions(+), 147 deletions(-) > > create mode 100644 > > meta/recipes-devtools/flex/flex/0001-use-stage1flex-from- > flex-native-to-fix-cross-compili.patch > > delete mode 100644 > > meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in- > c-code-fails-with-gcc-6.patch > > delete mode 100644 meta/recipes-devtools/flex/ > flex/CVE-2016-6354.patch > > delete mode 100644 > > meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > > rename meta/recipes-devtools/flex/{flex_2.6.0.bb > > <http://flex_2.6.0.bb> => flex_2.6.2.bb <http://flex_2.6.2.bb>} > (79%) > > > > diff --git > > a/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from- > flex-native-to-fix-cross-compili.patch > > b/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from- > flex-native-to-fix-cross-compili.patch > > new file mode 100644 > > index 0000000..08f7688 > > --- /dev/null > > +++ > > b/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from- > flex-native-to-fix-cross-compili.patch > > @@ -0,0 +1,51 @@ > > +Subject: use stage1flex from flex-native to fix cross compiling > > + > > +When cross compiling, we would have failure because stage1flex > > cannot run on host. > > +Use stage1flex from flex-native to fix this problem. > > + > > +This patch is OE specific as upstream may have other way to fix > > this cross compilation > > +problem. > > + > > +Upstream-Status: Inappropriate [OE specific] > > + > > +Signed-off-by: Chen Qi <Qi.Chen@windriver.com > > <mailto:Qi.Chen@windriver.com>> > > +--- > > + src/Makefile.am | 11 ++--------- > > + 1 file changed, 2 insertions(+), 9 deletions(-) > > + > > +diff --git a/src/Makefile.am b/src/Makefile.am > > +index 77ddf4b..09ffddb 100644 > > +--- a/src/Makefile.am > > ++++ b/src/Makefile.am > > +@@ -6,17 +6,10 @@ LIBS = @LIBS@ > > + m4 = @M4@ > > + > > + bin_PROGRAMS = flex > > +-noinst_PROGRAMS = stage1flex > > + lib_LTLIBRARIES = \ > > + libfl.la <http://libfl.la> \ > > + libfl_pic.la <http://libfl_pic.la> > > + > > +-stage1flex_SOURCES = \ > > +- scan.l \ > > +- $(COMMON_SOURCES) > > +- > > +-stage1flex_CFLAGS = $(AM_CFLAGS) > > +- > > + flex_SOURCES = \ > > + $(COMMON_SOURCES) > > + > > +@@ -89,8 +82,8 @@ skel.c: flex.skl mkskel.sh flexint.h > > tables_shared.h tables_shared.c > > + $(SHELL) $(srcdir)/mkskel.sh > $@.tmp > > + mv $@.tmp $@ > > + > > +-stage1scan.c: scan.l stage1flex$(EXEEXT) > > +- ./stage1flex$(EXEEXT) -o $@ $< > > ++stage1scan.c: scan.l > > ++ stage1flex$(EXEEXT) -o $@ $< > > + > > + # make needs to be told to make parse.h so that parallelized runs > will > > + # not fail. > > +-- > > +2.1.0 > > + > > diff --git > > a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in- > c-code-fails-with-gcc-6.patch > > b/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in- > c-code-fails-with-gcc-6.patch > > deleted file mode 100644 > > index 438ca5f..0000000 > > --- > > a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in- > c-code-fails-with-gcc-6.patch > > +++ /dev/null > > @@ -1,64 +0,0 @@ > > -From 7072befe1397af4eb01c3ff7edf99f0cd5076089 Mon Sep 17 00:00:00 > 2001 > > -From: =?UTF-8?q?Andreas=20M=C3=BCller?= > > <schnitzeltony@googlemail.com <mailto:schnitzeltony@googlemail.com>> > > -Date: Tue, 30 Aug 2016 14:25:32 +0200 > > -Subject: [PATCH] avoid c++ comments in c-code - fails with gcc-6 > > -MIME-Version: 1.0 > > -Content-Type: text/plain; charset=UTF-8 > > -Content-Transfer-Encoding: 8bit > > - > > -fixes: > > - > > -| error: C++ style comments are not allowed in ISO C90 > > -| num_to_alloc = 1; // After all that talk, this was set to 1 > > anyways... > > - > > -Upstream-Status: Pending > > - > > -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com > > <mailto:schnitzeltony@googlemail.com>> > > ---- > > - src/flex.skl | 2 +- > > - src/scan.c | 2 +- > > - src/skel.c | 2 +- > > - 3 files changed, 3 insertions(+), 3 deletions(-) > > - > > -diff --git a/src/flex.skl b/src/flex.skl > > -index 73a0b9e..ed71627 100644 > > ---- a/src/flex.skl > > -+++ b/src/flex.skl > > -@@ -2350,7 +2350,7 @@ void yyFlexLexer::yyensure_buffer_stack(void) > > - * scanner will even need a stack. We use 2 instead > > of 1 to avoid an > > - * immediate realloc on the next call. > > - */ > > -- num_to_alloc = 1; // After all that talk, this was > > set to 1 anyways... > > -+ num_to_alloc = 1; /* After all that talk, this was > > set to 1 anyways... */ > > - YY_G(yy_buffer_stack) = (struct > > yy_buffer_state**)yyalloc > > - > > (num_to_alloc * sizeof(struct yy_buffer_state*) > > - > > M4_YY_CALL_LAST_ARG); > > -diff --git a/src/scan.c b/src/scan.c > > -index b55df2d..f1dce75 100644 > > ---- a/src/scan.c > > -+++ b/src/scan.c > > -@@ -4672,7 +4672,7 @@ static void yyensure_buffer_stack (void) > > - * scanner will even need a stack. We use 2 instead > > of 1 to avoid an > > - * immediate realloc on the next call. > > - */ > > -- num_to_alloc = 1; // After all that talk, this was > > set to 1 anyways... > > -+ num_to_alloc = 1; /* After all that talk, this was > > set to 1 anyways...*/ > > - (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc > > - > > (num_to_alloc * sizeof(struct yy_buffer_state*) > > - ); > > -diff --git a/src/skel.c b/src/skel.c > > -index ef657d3..26cc889 100644 > > ---- a/src/skel.c > > -+++ b/src/skel.c > > -@@ -2561,7 +2561,7 @@ const char *skel[] = { > > - " * scanner will even need a stack. We use 2 instead > > of 1 to avoid an", > > - " * immediate realloc on the next call.", > > - " */", > > -- " num_to_alloc = 1; // After all that talk, this was > > set to 1 anyways...", > > -+ " num_to_alloc = 1; /* After all that talk, this was > > set to 1 anyways... */", > > - " YY_G(yy_buffer_stack) = (struct > > yy_buffer_state**)yyalloc", > > - " > > (num_to_alloc * sizeof(struct yy_buffer_state*)", > > - " > > M4_YY_CALL_LAST_ARG);", > > --- > > -2.5.5 > > - > > diff --git a/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > > b/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > > deleted file mode 100644 > > index 216ac7a..0000000 > > --- a/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > > +++ /dev/null > > @@ -1,59 +0,0 @@ > > -From 3939eccdff598f47e5b37b05d58bf1b44d3796e7 Mon Sep 17 00:00:00 > 2001 > > -From: Jussi Kukkonen <jussi.kukkonen@intel.com > > <mailto:jussi.kukkonen@intel.com>> > > -Date: Fri, 7 Oct 2016 14:15:38 +0300 > > -Subject: [PATCH] Prevent buffer overflow in yy_get_next_buffer > > - > > -This is upstream commit a5cbe929ac3255d371e698f62dc256afe7006466 > > -with some additional backporting to make binutils build again. > > - > > -Upstream-Status: Backport > > -CVE: CVE-2016-6354 > > -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com > > <mailto:jussi.kukkonen@intel.com>> > > ---- > > - src/flex.skl | 2 +- > > - src/scan.c | 2 +- > > - src/skel.c | 2 +- > > - 3 files changed, 3 insertions(+), 3 deletions(-) > > - > > -diff --git a/src/flex.skl b/src/flex.skl > > -index ed71627..814d562 100644 > > ---- a/src/flex.skl > > -+++ b/src/flex.skl > > -@@ -1718,7 +1718,7 @@ int yyFlexLexer::yy_get_next_buffer() > > - > > - else > > - { > > -- yy_size_t num_to_read = > > -+ int num_to_read = > > - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - > > number_to_move - 1; > > - > > - while ( num_to_read <= 0 ) > > -diff --git a/src/scan.c b/src/scan.c > > -index f1dce75..1949872 100644 > > ---- a/src/scan.c > > -+++ b/src/scan.c > > -@@ -4181,7 +4181,7 @@ static int yy_get_next_buffer (void) > > - > > - else > > - { > > -- yy_size_t num_to_read = > > -+ int num_to_read = > > - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - > > number_to_move - 1; > > - > > - while ( num_to_read <= 0 ) > > -diff --git a/src/skel.c b/src/skel.c > > -index 26cc889..0344d18 100644 > > ---- a/src/skel.c > > -+++ b/src/skel.c > > -@@ -1929,7 +1929,7 @@ const char *skel[] = { > > - "", > > - " else", > > - " {", > > -- " yy_size_t num_to_read =", > > -+ " int num_to_read =", > > - " YY_CURRENT_BUFFER_LVALUE->yy_buf_size - > > number_to_move - 1;", > > - "", > > - " while ( num_to_read <= 0 )", > > --- > > -2.1.4 > > - > > diff --git > > a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > > b/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > > deleted file mode 100644 > > index 032833ae..0000000 > > --- a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > > +++ /dev/null > > @@ -1,17 +0,0 @@ > > -Upstream-Status: Inappropriate (embedded specific) > > - > > -Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com > > <mailto:laurentiu.palcu@intel.com>> > > - > > -Index: flex-2.5.37/doc/Makefile.am > > -=================================================================== > > ---- flex-2.5.37.orig/doc/Makefile.am 2012-07-21 > > 04:18:27.000000000 +0300 > > -+++ flex-2.5.37/doc/Makefile.am 2013-07-30 > > 17:57:09.834834531 +0300 > > -@@ -2,7 +2,7 @@ > > - > > - info_TEXINFOS = flex.texi > > - dist_man_MANS = flex.1 > > --dist_doc_DATA= flex.pdf > > -+EXTRA_DIST= flex.pdf > > - > > - CLEANFILES = \ > > - flex.hks \ > > diff --git a/meta/recipes-devtools/flex/flex_2.6.0.bb > > <http://flex_2.6.0.bb> b/meta/recipes-devtools/flex/flex_2.6.2.bb > > <http://flex_2.6.2.bb> > > similarity index 79% > > rename from meta/recipes-devtools/flex/flex_2.6.0.bb > > <http://flex_2.6.0.bb> > > rename to meta/recipes-devtools/flex/flex_2.6.2.bb > > <http://flex_2.6.2.bb> > > index ab35b09..e723124 100644 > > --- a/meta/recipes-devtools/flex/flex_2.6.0.bb <http://flex_2.6.0.bb > > > > +++ b/meta/recipes-devtools/flex/flex_2.6.2.bb <http://flex_2.6.2.bb > > > > @@ -5,22 +5,23 @@ HOMEPAGE = "http://sourceforge.net/projects/flex/ > > <http://sourceforge.net/projects/flex/>" > > SECTION = "devel" > > LICENSE = "BSD" > > > > -DEPENDS = "${@bb.utils.contains('PTEST_ENABLED', '1', 'bison-native > > flex-native', '', d)}" > > +DEPENDS = "flex-native ${@bb.utils.contains('PTEST_ENABLED', '1', > > 'bison-native', '', d)}" > > BBCLASSEXTEND = "native nativesdk" > > > > LIC_FILES_CHKSUM = > > "file://COPYING;md5=e4742cf92e89040b39486a6219b68067" > > > > -SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \ > > +SRC_URI = > > "https://github.com/westes/flex/releases/download/v${PV}/ > flex-${PV}.tar.gz > > <https://github.com/westes/flex/releases/download/v${PV}/ > flex-${PV}.tar.gz> > > \ > > file://run-ptest \ > > - file://do_not_create_pdf_doc.patch \ > > > > file://0001-tests-add-a-target-for-building-tests-without-runnin.patch > \ > > - > > file://0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch \ > > - file://CVE-2016-6354.patch \ > > ${@bb.utils.contains('PTEST_ENABLED', '1', '', > > 'file://disable-tests.patch', d)} \ > > " > > > > -SRC_URI[md5sum] = "266270f13c48ed043d95648075084d59" > > -SRC_URI[sha256sum] = > > "24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9" > > +SRC_URI_append_class-target = " \ > > + > > file://0001-use-stage1flex-from-flex-native-to-fix-cross- > compili.patch > > \ > > + " > > + > > +SRC_URI[md5sum] = "cc6d76c333db7653d5caf423a3335239" > > +SRC_URI[sha256sum] = > > "9a01437a1155c799b7dc2508620564ef806ba66250c36bf5f9034b1c207cb2c9" > > > > # Flex has moved to github from 2.6.1 onwards > > UPSTREAM_CHECK_URI = "https://github.com/westes/flex/releases > > <https://github.com/westes/flex/releases>" > > @@ -37,6 +38,7 @@ EXTRA_OEMAKE += > > "${@bb.utils.contains('PTEST_ENABLED', '1', 'FLEX=${STAGING_BIND > > > > do_install_append_class-native() { > > create_wrapper ${D}/${bindir}/flex M4=${M4} > > + cp ${B}/src/stage1flex ${D}/${bindir} > > } > > > > do_install_append_class-nativesdk() { > > -- > > 1.9.1 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > <mailto:Openembedded-core@lists.openembedded.org> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > <http://lists.openembedded.org/mailman/listinfo/openembedded-core> > > > > > > > > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 26249 bytes --] ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/7] flex: upgrade to 2.6.2 2017-01-27 2:19 ` Martin Jansa @ 2017-01-27 2:21 ` Khem Raj 2017-01-30 19:56 ` Denys Dmytriyenko 0 siblings, 1 reply; 23+ messages in thread From: Khem Raj @ 2017-01-27 2:21 UTC (permalink / raw) To: Martin Jansa; +Cc: Patches and discussions about the oe-core layer On Thu, Jan 26, 2017 at 6:19 PM, Martin Jansa <martin.jansa@gmail.com> wrote: > I did try 2.6.3 but it was even worse as reported, thats just sad. if anyone wants to use it > as starting point here it is: > http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/master&id=4590c0145a7ae98e7ff7bbf40ec3e25471484f60 > > but then I've reverted both 2.6.3 and 2.6.2 upgrade and I don't plan to work > on it. So I think revert it the only option for now. > > On Fri, Jan 27, 2017 at 3:16 AM, Khem Raj <raj.khem@gmail.com> wrote: >> >> >> >> On 1/26/17 2:39 PM, Martin Jansa wrote: >> > This is breaking number of recipes as discussed in acpica thread: >> > >> > http://lists.openembedded.org/pipermail/openembedded-core/2017-January/131555.html >> > >> > in by builds I also see failures in qtwebkit, upstart, libpbnjson, ... >> > >> > I've tried to upgrade to 2.6.3 as suggested in: >> > https://github.com/westes/flex/issues/164 >> > >> > but that brings different set of undefined yy* symbols (e.g. yywrap in >> > yylex function when building binutils-crosssdk and in the end it doesn't >> > help at all, because even binutils, binutils-cross, dtc-native fail much >> > sooner. >> > >> > Is someone working on flex upgrade or can we revert this 2.6.2 upgrade >> > until these issues are resolved? >> > >> >> +1 >> I have reverted this upgrade locally. Its breaking webkit too. I think >> we should either revert this or try out 2.6.3 in short time. >> >> > On Mon, Dec 26, 2016 at 9:10 AM, Chen Qi <Qi.Chen@windriver.com >> > <mailto:Qi.Chen@windriver.com>> wrote: >> > >> > Upgrade flex to 2.6.2. >> > >> > The following two patches are removed as they have been merged. >> > 0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch >> > CVE-2016-6354.patch >> > >> > do_not_create_pdf_doc.patch is removed as it's not suitable for the >> > new >> > version. >> > >> > 0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch is >> > added >> > to fix cross compiling problem. >> > >> > Signed-off-by: Chen Qi <Qi.Chen@windriver.com >> > <mailto:Qi.Chen@windriver.com>> >> > --- >> > ...lex-from-flex-native-to-fix-cross-compili.patch | 51 >> > +++++++++++++++++ >> > ...oid-c-comments-in-c-code-fails-with-gcc-6.patch | 64 >> > ---------------------- >> > .../recipes-devtools/flex/flex/CVE-2016-6354.patch | 59 >> > -------------------- >> > .../flex/flex/do_not_create_pdf_doc.patch | 17 ------ >> > .../flex/{flex_2.6.0.bb <http://flex_2.6.0.bb> => flex_2.6.2.bb >> > <http://flex_2.6.2.bb>} | 16 +++--- >> > 5 files changed, 60 insertions(+), 147 deletions(-) >> > create mode 100644 >> > >> > meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch >> > delete mode 100644 >> > >> > meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch >> > delete mode 100644 >> > meta/recipes-devtools/flex/flex/CVE-2016-6354.patch >> > delete mode 100644 >> > meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch >> > rename meta/recipes-devtools/flex/{flex_2.6.0.bb >> > <http://flex_2.6.0.bb> => flex_2.6.2.bb <http://flex_2.6.2.bb>} >> > (79%) >> > >> > diff --git >> > >> > a/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch >> > >> > b/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch >> > new file mode 100644 >> > index 0000000..08f7688 >> > --- /dev/null >> > +++ >> > >> > b/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch >> > @@ -0,0 +1,51 @@ >> > +Subject: use stage1flex from flex-native to fix cross compiling >> > + >> > +When cross compiling, we would have failure because stage1flex >> > cannot run on host. >> > +Use stage1flex from flex-native to fix this problem. >> > + >> > +This patch is OE specific as upstream may have other way to fix >> > this cross compilation >> > +problem. >> > + >> > +Upstream-Status: Inappropriate [OE specific] >> > + >> > +Signed-off-by: Chen Qi <Qi.Chen@windriver.com >> > <mailto:Qi.Chen@windriver.com>> >> > +--- >> > + src/Makefile.am | 11 ++--------- >> > + 1 file changed, 2 insertions(+), 9 deletions(-) >> > + >> > +diff --git a/src/Makefile.am b/src/Makefile.am >> > +index 77ddf4b..09ffddb 100644 >> > +--- a/src/Makefile.am >> > ++++ b/src/Makefile.am >> > +@@ -6,17 +6,10 @@ LIBS = @LIBS@ >> > + m4 = @M4@ >> > + >> > + bin_PROGRAMS = flex >> > +-noinst_PROGRAMS = stage1flex >> > + lib_LTLIBRARIES = \ >> > + libfl.la <http://libfl.la> \ >> > + libfl_pic.la <http://libfl_pic.la> >> > + >> > +-stage1flex_SOURCES = \ >> > +- scan.l \ >> > +- $(COMMON_SOURCES) >> > +- >> > +-stage1flex_CFLAGS = $(AM_CFLAGS) >> > +- >> > + flex_SOURCES = \ >> > + $(COMMON_SOURCES) >> > + >> > +@@ -89,8 +82,8 @@ skel.c: flex.skl mkskel.sh flexint.h >> > tables_shared.h tables_shared.c >> > + $(SHELL) $(srcdir)/mkskel.sh > $@.tmp >> > + mv $@.tmp $@ >> > + >> > +-stage1scan.c: scan.l stage1flex$(EXEEXT) >> > +- ./stage1flex$(EXEEXT) -o $@ $< >> > ++stage1scan.c: scan.l >> > ++ stage1flex$(EXEEXT) -o $@ $< >> > + >> > + # make needs to be told to make parse.h so that parallelized runs >> > will >> > + # not fail. >> > +-- >> > +2.1.0 >> > + >> > diff --git >> > >> > a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch >> > >> > b/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch >> > deleted file mode 100644 >> > index 438ca5f..0000000 >> > --- >> > >> > a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch >> > +++ /dev/null >> > @@ -1,64 +0,0 @@ >> > -From 7072befe1397af4eb01c3ff7edf99f0cd5076089 Mon Sep 17 00:00:00 >> > 2001 >> > -From: =?UTF-8?q?Andreas=20M=C3=BCller?= >> > <schnitzeltony@googlemail.com <mailto:schnitzeltony@googlemail.com>> >> > -Date: Tue, 30 Aug 2016 14:25:32 +0200 >> > -Subject: [PATCH] avoid c++ comments in c-code - fails with gcc-6 >> > -MIME-Version: 1.0 >> > -Content-Type: text/plain; charset=UTF-8 >> > -Content-Transfer-Encoding: 8bit >> > - >> > -fixes: >> > - >> > -| error: C++ style comments are not allowed in ISO C90 >> > -| num_to_alloc = 1; // After all that talk, this was set to 1 >> > anyways... >> > - >> > -Upstream-Status: Pending >> > - >> > -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com >> > <mailto:schnitzeltony@googlemail.com>> >> > ---- >> > - src/flex.skl | 2 +- >> > - src/scan.c | 2 +- >> > - src/skel.c | 2 +- >> > - 3 files changed, 3 insertions(+), 3 deletions(-) >> > - >> > -diff --git a/src/flex.skl b/src/flex.skl >> > -index 73a0b9e..ed71627 100644 >> > ---- a/src/flex.skl >> > -+++ b/src/flex.skl >> > -@@ -2350,7 +2350,7 @@ void yyFlexLexer::yyensure_buffer_stack(void) >> > - * scanner will even need a stack. We use 2 instead >> > of 1 to avoid an >> > - * immediate realloc on the next call. >> > - */ >> > -- num_to_alloc = 1; // After all that talk, this was >> > set to 1 anyways... >> > -+ num_to_alloc = 1; /* After all that talk, this was >> > set to 1 anyways... */ >> > - YY_G(yy_buffer_stack) = (struct >> > yy_buffer_state**)yyalloc >> > - >> > (num_to_alloc * sizeof(struct yy_buffer_state*) >> > - >> > M4_YY_CALL_LAST_ARG); >> > -diff --git a/src/scan.c b/src/scan.c >> > -index b55df2d..f1dce75 100644 >> > ---- a/src/scan.c >> > -+++ b/src/scan.c >> > -@@ -4672,7 +4672,7 @@ static void yyensure_buffer_stack (void) >> > - * scanner will even need a stack. We use 2 instead >> > of 1 to avoid an >> > - * immediate realloc on the next call. >> > - */ >> > -- num_to_alloc = 1; // After all that talk, this was >> > set to 1 anyways... >> > -+ num_to_alloc = 1; /* After all that talk, this was >> > set to 1 anyways...*/ >> > - (yy_buffer_stack) = (struct >> > yy_buffer_state**)yyalloc >> > - >> > (num_to_alloc * sizeof(struct yy_buffer_state*) >> > - ); >> > -diff --git a/src/skel.c b/src/skel.c >> > -index ef657d3..26cc889 100644 >> > ---- a/src/skel.c >> > -+++ b/src/skel.c >> > -@@ -2561,7 +2561,7 @@ const char *skel[] = { >> > - " * scanner will even need a stack. We use 2 instead >> > of 1 to avoid an", >> > - " * immediate realloc on the next call.", >> > - " */", >> > -- " num_to_alloc = 1; // After all that talk, this was >> > set to 1 anyways...", >> > -+ " num_to_alloc = 1; /* After all that talk, this was >> > set to 1 anyways... */", >> > - " YY_G(yy_buffer_stack) = (struct >> > yy_buffer_state**)yyalloc", >> > - " >> > (num_to_alloc * sizeof(struct yy_buffer_state*)", >> > - " >> > M4_YY_CALL_LAST_ARG);", >> > --- >> > -2.5.5 >> > - >> > diff --git a/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch >> > b/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch >> > deleted file mode 100644 >> > index 216ac7a..0000000 >> > --- a/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch >> > +++ /dev/null >> > @@ -1,59 +0,0 @@ >> > -From 3939eccdff598f47e5b37b05d58bf1b44d3796e7 Mon Sep 17 00:00:00 >> > 2001 >> > -From: Jussi Kukkonen <jussi.kukkonen@intel.com >> > <mailto:jussi.kukkonen@intel.com>> >> > -Date: Fri, 7 Oct 2016 14:15:38 +0300 >> > -Subject: [PATCH] Prevent buffer overflow in yy_get_next_buffer >> > - >> > -This is upstream commit a5cbe929ac3255d371e698f62dc256afe7006466 >> > -with some additional backporting to make binutils build again. >> > - >> > -Upstream-Status: Backport >> > -CVE: CVE-2016-6354 >> > -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com >> > <mailto:jussi.kukkonen@intel.com>> >> > ---- >> > - src/flex.skl | 2 +- >> > - src/scan.c | 2 +- >> > - src/skel.c | 2 +- >> > - 3 files changed, 3 insertions(+), 3 deletions(-) >> > - >> > -diff --git a/src/flex.skl b/src/flex.skl >> > -index ed71627..814d562 100644 >> > ---- a/src/flex.skl >> > -+++ b/src/flex.skl >> > -@@ -1718,7 +1718,7 @@ int yyFlexLexer::yy_get_next_buffer() >> > - >> > - else >> > - { >> > -- yy_size_t num_to_read = >> > -+ int num_to_read = >> > - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - >> > number_to_move - 1; >> > - >> > - while ( num_to_read <= 0 ) >> > -diff --git a/src/scan.c b/src/scan.c >> > -index f1dce75..1949872 100644 >> > ---- a/src/scan.c >> > -+++ b/src/scan.c >> > -@@ -4181,7 +4181,7 @@ static int yy_get_next_buffer (void) >> > - >> > - else >> > - { >> > -- yy_size_t num_to_read = >> > -+ int num_to_read = >> > - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - >> > number_to_move - 1; >> > - >> > - while ( num_to_read <= 0 ) >> > -diff --git a/src/skel.c b/src/skel.c >> > -index 26cc889..0344d18 100644 >> > ---- a/src/skel.c >> > -+++ b/src/skel.c >> > -@@ -1929,7 +1929,7 @@ const char *skel[] = { >> > - "", >> > - " else", >> > - " {", >> > -- " yy_size_t num_to_read =", >> > -+ " int num_to_read =", >> > - " YY_CURRENT_BUFFER_LVALUE->yy_buf_size - >> > number_to_move - 1;", >> > - "", >> > - " while ( num_to_read <= 0 )", >> > --- >> > -2.1.4 >> > - >> > diff --git >> > a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch >> > b/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch >> > deleted file mode 100644 >> > index 032833ae..0000000 >> > --- a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch >> > +++ /dev/null >> > @@ -1,17 +0,0 @@ >> > -Upstream-Status: Inappropriate (embedded specific) >> > - >> > -Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com >> > <mailto:laurentiu.palcu@intel.com>> >> > - >> > -Index: flex-2.5.37/doc/Makefile.am >> > -=================================================================== >> > ---- flex-2.5.37.orig/doc/Makefile.am 2012-07-21 >> > 04:18:27.000000000 +0300 >> > -+++ flex-2.5.37/doc/Makefile.am 2013-07-30 >> > 17:57:09.834834531 +0300 >> > -@@ -2,7 +2,7 @@ >> > - >> > - info_TEXINFOS = flex.texi >> > - dist_man_MANS = flex.1 >> > --dist_doc_DATA= flex.pdf >> > -+EXTRA_DIST= flex.pdf >> > - >> > - CLEANFILES = \ >> > - flex.hks \ >> > diff --git a/meta/recipes-devtools/flex/flex_2.6.0.bb >> > <http://flex_2.6.0.bb> b/meta/recipes-devtools/flex/flex_2.6.2.bb >> > <http://flex_2.6.2.bb> >> > similarity index 79% >> > rename from meta/recipes-devtools/flex/flex_2.6.0.bb >> > <http://flex_2.6.0.bb> >> > rename to meta/recipes-devtools/flex/flex_2.6.2.bb >> > <http://flex_2.6.2.bb> >> > index ab35b09..e723124 100644 >> > --- a/meta/recipes-devtools/flex/flex_2.6.0.bb >> > <http://flex_2.6.0.bb> >> > +++ b/meta/recipes-devtools/flex/flex_2.6.2.bb >> > <http://flex_2.6.2.bb> >> > @@ -5,22 +5,23 @@ HOMEPAGE = "http://sourceforge.net/projects/flex/ >> > <http://sourceforge.net/projects/flex/>" >> > SECTION = "devel" >> > LICENSE = "BSD" >> > >> > -DEPENDS = "${@bb.utils.contains('PTEST_ENABLED', '1', 'bison-native >> > flex-native', '', d)}" >> > +DEPENDS = "flex-native ${@bb.utils.contains('PTEST_ENABLED', '1', >> > 'bison-native', '', d)}" >> > BBCLASSEXTEND = "native nativesdk" >> > >> > LIC_FILES_CHKSUM = >> > "file://COPYING;md5=e4742cf92e89040b39486a6219b68067" >> > >> > -SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \ >> > +SRC_URI = >> > >> > "https://github.com/westes/flex/releases/download/v${PV}/flex-${PV}.tar.gz >> > >> > <https://github.com/westes/flex/releases/download/v${PV}/flex-${PV}.tar.gz> >> > \ >> > file://run-ptest \ >> > - file://do_not_create_pdf_doc.patch \ >> > >> > >> > file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ >> > - >> > file://0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch \ >> > - file://CVE-2016-6354.patch \ >> > ${@bb.utils.contains('PTEST_ENABLED', '1', '', >> > 'file://disable-tests.patch', d)} \ >> > " >> > >> > -SRC_URI[md5sum] = "266270f13c48ed043d95648075084d59" >> > -SRC_URI[sha256sum] = >> > "24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9" >> > +SRC_URI_append_class-target = " \ >> > + >> > >> > file://0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch >> > \ >> > + " >> > + >> > +SRC_URI[md5sum] = "cc6d76c333db7653d5caf423a3335239" >> > +SRC_URI[sha256sum] = >> > "9a01437a1155c799b7dc2508620564ef806ba66250c36bf5f9034b1c207cb2c9" >> > >> > # Flex has moved to github from 2.6.1 onwards >> > UPSTREAM_CHECK_URI = "https://github.com/westes/flex/releases >> > <https://github.com/westes/flex/releases>" >> > @@ -37,6 +38,7 @@ EXTRA_OEMAKE += >> > "${@bb.utils.contains('PTEST_ENABLED', '1', 'FLEX=${STAGING_BIND >> > >> > do_install_append_class-native() { >> > create_wrapper ${D}/${bindir}/flex M4=${M4} >> > + cp ${B}/src/stage1flex ${D}/${bindir} >> > } >> > >> > do_install_append_class-nativesdk() { >> > -- >> > 1.9.1 >> > >> > -- >> > _______________________________________________ >> > Openembedded-core mailing list >> > Openembedded-core@lists.openembedded.org >> > <mailto:Openembedded-core@lists.openembedded.org> >> > http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > <http://lists.openembedded.org/mailman/listinfo/openembedded-core> >> > >> > >> > >> > >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/7] flex: upgrade to 2.6.2 2017-01-27 2:21 ` Khem Raj @ 2017-01-30 19:56 ` Denys Dmytriyenko 2017-02-10 18:32 ` Trevor Woerner 0 siblings, 1 reply; 23+ messages in thread From: Denys Dmytriyenko @ 2017-01-30 19:56 UTC (permalink / raw) To: Khem Raj; +Cc: Patches and discussions about the oe-core layer On Thu, Jan 26, 2017 at 06:21:48PM -0800, Khem Raj wrote: > On Thu, Jan 26, 2017 at 6:19 PM, Martin Jansa <martin.jansa@gmail.com> wrote: > > I did try 2.6.3 but it was even worse as reported, > > thats just sad. > > if anyone wants to use it > > as starting point here it is: > > http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/master&id=4590c0145a7ae98e7ff7bbf40ec3e25471484f60 > > > > but then I've reverted both 2.6.3 and 2.6.2 upgrade and I don't plan to work > > on it. > > So I think revert it the only option for now. +1 for the revert here as well! -- Denys > > On Fri, Jan 27, 2017 at 3:16 AM, Khem Raj <raj.khem@gmail.com> wrote: > >> > >> > >> > >> On 1/26/17 2:39 PM, Martin Jansa wrote: > >> > This is breaking number of recipes as discussed in acpica thread: > >> > > >> > http://lists.openembedded.org/pipermail/openembedded-core/2017-January/131555.html > >> > > >> > in by builds I also see failures in qtwebkit, upstart, libpbnjson, ... > >> > > >> > I've tried to upgrade to 2.6.3 as suggested in: > >> > https://github.com/westes/flex/issues/164 > >> > > >> > but that brings different set of undefined yy* symbols (e.g. yywrap in > >> > yylex function when building binutils-crosssdk and in the end it doesn't > >> > help at all, because even binutils, binutils-cross, dtc-native fail much > >> > sooner. > >> > > >> > Is someone working on flex upgrade or can we revert this 2.6.2 upgrade > >> > until these issues are resolved? > >> > > >> > >> +1 > >> I have reverted this upgrade locally. Its breaking webkit too. I think > >> we should either revert this or try out 2.6.3 in short time. > >> > >> > On Mon, Dec 26, 2016 at 9:10 AM, Chen Qi <Qi.Chen@windriver.com > >> > <mailto:Qi.Chen@windriver.com>> wrote: > >> > > >> > Upgrade flex to 2.6.2. > >> > > >> > The following two patches are removed as they have been merged. > >> > 0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > >> > CVE-2016-6354.patch > >> > > >> > do_not_create_pdf_doc.patch is removed as it's not suitable for the > >> > new > >> > version. > >> > > >> > 0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch is > >> > added > >> > to fix cross compiling problem. > >> > > >> > Signed-off-by: Chen Qi <Qi.Chen@windriver.com > >> > <mailto:Qi.Chen@windriver.com>> > >> > --- > >> > ...lex-from-flex-native-to-fix-cross-compili.patch | 51 > >> > +++++++++++++++++ > >> > ...oid-c-comments-in-c-code-fails-with-gcc-6.patch | 64 > >> > ---------------------- > >> > .../recipes-devtools/flex/flex/CVE-2016-6354.patch | 59 > >> > -------------------- > >> > .../flex/flex/do_not_create_pdf_doc.patch | 17 ------ > >> > .../flex/{flex_2.6.0.bb <http://flex_2.6.0.bb> => flex_2.6.2.bb > >> > <http://flex_2.6.2.bb>} | 16 +++--- > >> > 5 files changed, 60 insertions(+), 147 deletions(-) > >> > create mode 100644 > >> > > >> > meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch > >> > delete mode 100644 > >> > > >> > meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > >> > delete mode 100644 > >> > meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > >> > delete mode 100644 > >> > meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > >> > rename meta/recipes-devtools/flex/{flex_2.6.0.bb > >> > <http://flex_2.6.0.bb> => flex_2.6.2.bb <http://flex_2.6.2.bb>} > >> > (79%) > >> > > >> > diff --git > >> > > >> > a/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch > >> > > >> > b/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch > >> > new file mode 100644 > >> > index 0000000..08f7688 > >> > --- /dev/null > >> > +++ > >> > > >> > b/meta/recipes-devtools/flex/flex/0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch > >> > @@ -0,0 +1,51 @@ > >> > +Subject: use stage1flex from flex-native to fix cross compiling > >> > + > >> > +When cross compiling, we would have failure because stage1flex > >> > cannot run on host. > >> > +Use stage1flex from flex-native to fix this problem. > >> > + > >> > +This patch is OE specific as upstream may have other way to fix > >> > this cross compilation > >> > +problem. > >> > + > >> > +Upstream-Status: Inappropriate [OE specific] > >> > + > >> > +Signed-off-by: Chen Qi <Qi.Chen@windriver.com > >> > <mailto:Qi.Chen@windriver.com>> > >> > +--- > >> > + src/Makefile.am | 11 ++--------- > >> > + 1 file changed, 2 insertions(+), 9 deletions(-) > >> > + > >> > +diff --git a/src/Makefile.am b/src/Makefile.am > >> > +index 77ddf4b..09ffddb 100644 > >> > +--- a/src/Makefile.am > >> > ++++ b/src/Makefile.am > >> > +@@ -6,17 +6,10 @@ LIBS = @LIBS@ > >> > + m4 = @M4@ > >> > + > >> > + bin_PROGRAMS = flex > >> > +-noinst_PROGRAMS = stage1flex > >> > + lib_LTLIBRARIES = \ > >> > + libfl.la <http://libfl.la> \ > >> > + libfl_pic.la <http://libfl_pic.la> > >> > + > >> > +-stage1flex_SOURCES = \ > >> > +- scan.l \ > >> > +- $(COMMON_SOURCES) > >> > +- > >> > +-stage1flex_CFLAGS = $(AM_CFLAGS) > >> > +- > >> > + flex_SOURCES = \ > >> > + $(COMMON_SOURCES) > >> > + > >> > +@@ -89,8 +82,8 @@ skel.c: flex.skl mkskel.sh flexint.h > >> > tables_shared.h tables_shared.c > >> > + $(SHELL) $(srcdir)/mkskel.sh > $@.tmp > >> > + mv $@.tmp $@ > >> > + > >> > +-stage1scan.c: scan.l stage1flex$(EXEEXT) > >> > +- ./stage1flex$(EXEEXT) -o $@ $< > >> > ++stage1scan.c: scan.l > >> > ++ stage1flex$(EXEEXT) -o $@ $< > >> > + > >> > + # make needs to be told to make parse.h so that parallelized runs > >> > will > >> > + # not fail. > >> > +-- > >> > +2.1.0 > >> > + > >> > diff --git > >> > > >> > a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > >> > > >> > b/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > >> > deleted file mode 100644 > >> > index 438ca5f..0000000 > >> > --- > >> > > >> > a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch > >> > +++ /dev/null > >> > @@ -1,64 +0,0 @@ > >> > -From 7072befe1397af4eb01c3ff7edf99f0cd5076089 Mon Sep 17 00:00:00 > >> > 2001 > >> > -From: =?UTF-8?q?Andreas=20M=C3=BCller?= > >> > <schnitzeltony@googlemail.com <mailto:schnitzeltony@googlemail.com>> > >> > -Date: Tue, 30 Aug 2016 14:25:32 +0200 > >> > -Subject: [PATCH] avoid c++ comments in c-code - fails with gcc-6 > >> > -MIME-Version: 1.0 > >> > -Content-Type: text/plain; charset=UTF-8 > >> > -Content-Transfer-Encoding: 8bit > >> > - > >> > -fixes: > >> > - > >> > -| error: C++ style comments are not allowed in ISO C90 > >> > -| num_to_alloc = 1; // After all that talk, this was set to 1 > >> > anyways... > >> > - > >> > -Upstream-Status: Pending > >> > - > >> > -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com > >> > <mailto:schnitzeltony@googlemail.com>> > >> > ---- > >> > - src/flex.skl | 2 +- > >> > - src/scan.c | 2 +- > >> > - src/skel.c | 2 +- > >> > - 3 files changed, 3 insertions(+), 3 deletions(-) > >> > - > >> > -diff --git a/src/flex.skl b/src/flex.skl > >> > -index 73a0b9e..ed71627 100644 > >> > ---- a/src/flex.skl > >> > -+++ b/src/flex.skl > >> > -@@ -2350,7 +2350,7 @@ void yyFlexLexer::yyensure_buffer_stack(void) > >> > - * scanner will even need a stack. We use 2 instead > >> > of 1 to avoid an > >> > - * immediate realloc on the next call. > >> > - */ > >> > -- num_to_alloc = 1; // After all that talk, this was > >> > set to 1 anyways... > >> > -+ num_to_alloc = 1; /* After all that talk, this was > >> > set to 1 anyways... */ > >> > - YY_G(yy_buffer_stack) = (struct > >> > yy_buffer_state**)yyalloc > >> > - > >> > (num_to_alloc * sizeof(struct yy_buffer_state*) > >> > - > >> > M4_YY_CALL_LAST_ARG); > >> > -diff --git a/src/scan.c b/src/scan.c > >> > -index b55df2d..f1dce75 100644 > >> > ---- a/src/scan.c > >> > -+++ b/src/scan.c > >> > -@@ -4672,7 +4672,7 @@ static void yyensure_buffer_stack (void) > >> > - * scanner will even need a stack. We use 2 instead > >> > of 1 to avoid an > >> > - * immediate realloc on the next call. > >> > - */ > >> > -- num_to_alloc = 1; // After all that talk, this was > >> > set to 1 anyways... > >> > -+ num_to_alloc = 1; /* After all that talk, this was > >> > set to 1 anyways...*/ > >> > - (yy_buffer_stack) = (struct > >> > yy_buffer_state**)yyalloc > >> > - > >> > (num_to_alloc * sizeof(struct yy_buffer_state*) > >> > - ); > >> > -diff --git a/src/skel.c b/src/skel.c > >> > -index ef657d3..26cc889 100644 > >> > ---- a/src/skel.c > >> > -+++ b/src/skel.c > >> > -@@ -2561,7 +2561,7 @@ const char *skel[] = { > >> > - " * scanner will even need a stack. We use 2 instead > >> > of 1 to avoid an", > >> > - " * immediate realloc on the next call.", > >> > - " */", > >> > -- " num_to_alloc = 1; // After all that talk, this was > >> > set to 1 anyways...", > >> > -+ " num_to_alloc = 1; /* After all that talk, this was > >> > set to 1 anyways... */", > >> > - " YY_G(yy_buffer_stack) = (struct > >> > yy_buffer_state**)yyalloc", > >> > - " > >> > (num_to_alloc * sizeof(struct yy_buffer_state*)", > >> > - " > >> > M4_YY_CALL_LAST_ARG);", > >> > --- > >> > -2.5.5 > >> > - > >> > diff --git a/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > >> > b/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > >> > deleted file mode 100644 > >> > index 216ac7a..0000000 > >> > --- a/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch > >> > +++ /dev/null > >> > @@ -1,59 +0,0 @@ > >> > -From 3939eccdff598f47e5b37b05d58bf1b44d3796e7 Mon Sep 17 00:00:00 > >> > 2001 > >> > -From: Jussi Kukkonen <jussi.kukkonen@intel.com > >> > <mailto:jussi.kukkonen@intel.com>> > >> > -Date: Fri, 7 Oct 2016 14:15:38 +0300 > >> > -Subject: [PATCH] Prevent buffer overflow in yy_get_next_buffer > >> > - > >> > -This is upstream commit a5cbe929ac3255d371e698f62dc256afe7006466 > >> > -with some additional backporting to make binutils build again. > >> > - > >> > -Upstream-Status: Backport > >> > -CVE: CVE-2016-6354 > >> > -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com > >> > <mailto:jussi.kukkonen@intel.com>> > >> > ---- > >> > - src/flex.skl | 2 +- > >> > - src/scan.c | 2 +- > >> > - src/skel.c | 2 +- > >> > - 3 files changed, 3 insertions(+), 3 deletions(-) > >> > - > >> > -diff --git a/src/flex.skl b/src/flex.skl > >> > -index ed71627..814d562 100644 > >> > ---- a/src/flex.skl > >> > -+++ b/src/flex.skl > >> > -@@ -1718,7 +1718,7 @@ int yyFlexLexer::yy_get_next_buffer() > >> > - > >> > - else > >> > - { > >> > -- yy_size_t num_to_read = > >> > -+ int num_to_read = > >> > - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - > >> > number_to_move - 1; > >> > - > >> > - while ( num_to_read <= 0 ) > >> > -diff --git a/src/scan.c b/src/scan.c > >> > -index f1dce75..1949872 100644 > >> > ---- a/src/scan.c > >> > -+++ b/src/scan.c > >> > -@@ -4181,7 +4181,7 @@ static int yy_get_next_buffer (void) > >> > - > >> > - else > >> > - { > >> > -- yy_size_t num_to_read = > >> > -+ int num_to_read = > >> > - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - > >> > number_to_move - 1; > >> > - > >> > - while ( num_to_read <= 0 ) > >> > -diff --git a/src/skel.c b/src/skel.c > >> > -index 26cc889..0344d18 100644 > >> > ---- a/src/skel.c > >> > -+++ b/src/skel.c > >> > -@@ -1929,7 +1929,7 @@ const char *skel[] = { > >> > - "", > >> > - " else", > >> > - " {", > >> > -- " yy_size_t num_to_read =", > >> > -+ " int num_to_read =", > >> > - " YY_CURRENT_BUFFER_LVALUE->yy_buf_size - > >> > number_to_move - 1;", > >> > - "", > >> > - " while ( num_to_read <= 0 )", > >> > --- > >> > -2.1.4 > >> > - > >> > diff --git > >> > a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > >> > b/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > >> > deleted file mode 100644 > >> > index 032833ae..0000000 > >> > --- a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch > >> > +++ /dev/null > >> > @@ -1,17 +0,0 @@ > >> > -Upstream-Status: Inappropriate (embedded specific) > >> > - > >> > -Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com > >> > <mailto:laurentiu.palcu@intel.com>> > >> > - > >> > -Index: flex-2.5.37/doc/Makefile.am > >> > -=================================================================== > >> > ---- flex-2.5.37.orig/doc/Makefile.am 2012-07-21 > >> > 04:18:27.000000000 +0300 > >> > -+++ flex-2.5.37/doc/Makefile.am 2013-07-30 > >> > 17:57:09.834834531 +0300 > >> > -@@ -2,7 +2,7 @@ > >> > - > >> > - info_TEXINFOS = flex.texi > >> > - dist_man_MANS = flex.1 > >> > --dist_doc_DATA= flex.pdf > >> > -+EXTRA_DIST= flex.pdf > >> > - > >> > - CLEANFILES = \ > >> > - flex.hks \ > >> > diff --git a/meta/recipes-devtools/flex/flex_2.6.0.bb > >> > <http://flex_2.6.0.bb> b/meta/recipes-devtools/flex/flex_2.6.2.bb > >> > <http://flex_2.6.2.bb> > >> > similarity index 79% > >> > rename from meta/recipes-devtools/flex/flex_2.6.0.bb > >> > <http://flex_2.6.0.bb> > >> > rename to meta/recipes-devtools/flex/flex_2.6.2.bb > >> > <http://flex_2.6.2.bb> > >> > index ab35b09..e723124 100644 > >> > --- a/meta/recipes-devtools/flex/flex_2.6.0.bb > >> > <http://flex_2.6.0.bb> > >> > +++ b/meta/recipes-devtools/flex/flex_2.6.2.bb > >> > <http://flex_2.6.2.bb> > >> > @@ -5,22 +5,23 @@ HOMEPAGE = "http://sourceforge.net/projects/flex/ > >> > <http://sourceforge.net/projects/flex/>" > >> > SECTION = "devel" > >> > LICENSE = "BSD" > >> > > >> > -DEPENDS = "${@bb.utils.contains('PTEST_ENABLED', '1', 'bison-native > >> > flex-native', '', d)}" > >> > +DEPENDS = "flex-native ${@bb.utils.contains('PTEST_ENABLED', '1', > >> > 'bison-native', '', d)}" > >> > BBCLASSEXTEND = "native nativesdk" > >> > > >> > LIC_FILES_CHKSUM = > >> > "file://COPYING;md5=e4742cf92e89040b39486a6219b68067" > >> > > >> > -SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \ > >> > +SRC_URI = > >> > > >> > "https://github.com/westes/flex/releases/download/v${PV}/flex-${PV}.tar.gz > >> > > >> > <https://github.com/westes/flex/releases/download/v${PV}/flex-${PV}.tar.gz> > >> > \ > >> > file://run-ptest \ > >> > - file://do_not_create_pdf_doc.patch \ > >> > > >> > > >> > file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ > >> > - > >> > file://0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch \ > >> > - file://CVE-2016-6354.patch \ > >> > ${@bb.utils.contains('PTEST_ENABLED', '1', '', > >> > 'file://disable-tests.patch', d)} \ > >> > " > >> > > >> > -SRC_URI[md5sum] = "266270f13c48ed043d95648075084d59" > >> > -SRC_URI[sha256sum] = > >> > "24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9" > >> > +SRC_URI_append_class-target = " \ > >> > + > >> > > >> > file://0001-use-stage1flex-from-flex-native-to-fix-cross-compili.patch > >> > \ > >> > + " > >> > + > >> > +SRC_URI[md5sum] = "cc6d76c333db7653d5caf423a3335239" > >> > +SRC_URI[sha256sum] = > >> > "9a01437a1155c799b7dc2508620564ef806ba66250c36bf5f9034b1c207cb2c9" > >> > > >> > # Flex has moved to github from 2.6.1 onwards > >> > UPSTREAM_CHECK_URI = "https://github.com/westes/flex/releases > >> > <https://github.com/westes/flex/releases>" > >> > @@ -37,6 +38,7 @@ EXTRA_OEMAKE += > >> > "${@bb.utils.contains('PTEST_ENABLED', '1', 'FLEX=${STAGING_BIND > >> > > >> > do_install_append_class-native() { > >> > create_wrapper ${D}/${bindir}/flex M4=${M4} > >> > + cp ${B}/src/stage1flex ${D}/${bindir} > >> > } > >> > > >> > do_install_append_class-nativesdk() { > >> > -- > >> > 1.9.1 > >> > > >> > -- > >> > _______________________________________________ > >> > Openembedded-core mailing list > >> > Openembedded-core@lists.openembedded.org > >> > <mailto:Openembedded-core@lists.openembedded.org> > >> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > >> > <http://lists.openembedded.org/mailman/listinfo/openembedded-core> > >> > > >> > > >> > > >> > > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core@lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/7] flex: upgrade to 2.6.2 2017-01-30 19:56 ` Denys Dmytriyenko @ 2017-02-10 18:32 ` Trevor Woerner 2017-02-10 18:36 ` Khem Raj 0 siblings, 1 reply; 23+ messages in thread From: Trevor Woerner @ 2017-02-10 18:32 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Mon, Jan 30, 2017 at 2:56 PM, Denys Dmytriyenko <denis@denix.org> wrote: > On Thu, Jan 26, 2017 at 06:21:48PM -0800, Khem Raj wrote: >> On Thu, Jan 26, 2017 at 6:19 PM, Martin Jansa <martin.jansa@gmail.com> wrote: >> > I did try 2.6.3 but it was even worse as reported, >> >> thats just sad. Has anyone made a decision on this? I wasn't able to compile libsepol from meta-security due to flex-2.6.2. I also tried upgrading to 2.6.3 but that caused binutils to fail. Reverting to 2.6.0 seems to fix the issues I'm seeing. ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/7] flex: upgrade to 2.6.2 2017-02-10 18:32 ` Trevor Woerner @ 2017-02-10 18:36 ` Khem Raj 0 siblings, 0 replies; 23+ messages in thread From: Khem Raj @ 2017-02-10 18:36 UTC (permalink / raw) To: openembedded-core On 2/10/17 10:32 AM, Trevor Woerner wrote: > On Mon, Jan 30, 2017 at 2:56 PM, Denys Dmytriyenko <denis@denix.org> wrote: >> On Thu, Jan 26, 2017 at 06:21:48PM -0800, Khem Raj wrote: >>> On Thu, Jan 26, 2017 at 6:19 PM, Martin Jansa <martin.jansa@gmail.com> wrote: >>>> I did try 2.6.3 but it was even worse as reported, >>> >>> thats just sad. > > Has anyone made a decision on this? I wasn't able to compile libsepol > from meta-security due to flex-2.6.2. I also tried upgrading to 2.6.3 > but that caused binutils to fail. Reverting to 2.6.0 seems to fix the > issues I'm seeing. > Can you help by sending a revert request and lets close it ^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 5/7] grep: upgrade to 2.27 2016-12-26 8:10 [PATCH 0/7] Package Upgrade: systemd-bootchart, dbus, dus-test, sysstat, flex, grep, byacc, coreutils Chen Qi ` (3 preceding siblings ...) 2016-12-26 8:10 ` [PATCH 4/7] flex: upgrade to 2.6.2 Chen Qi @ 2016-12-26 8:10 ` Chen Qi 2016-12-26 8:10 ` [PATCH 6/7] byacc: upgrade to 20161202 Chen Qi 2016-12-26 8:10 ` [PATCH 7/7] coreutils: upgrade to 8.26 Chen Qi 6 siblings, 0 replies; 23+ messages in thread From: Chen Qi @ 2016-12-26 8:10 UTC (permalink / raw) To: openembedded-core Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- meta/recipes-extended/grep/{grep_2.26.bb => grep_2.27.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/grep/{grep_2.26.bb => grep_2.27.bb} (88%) diff --git a/meta/recipes-extended/grep/grep_2.26.bb b/meta/recipes-extended/grep/grep_2.27.bb similarity index 88% rename from meta/recipes-extended/grep/grep_2.26.bb rename to meta/recipes-extended/grep/grep_2.27.bb index 9e6f05e..7d0a73b 100644 --- a/meta/recipes-extended/grep/grep_2.26.bb +++ b/meta/recipes-extended/grep/grep_2.27.bb @@ -9,8 +9,8 @@ SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ " -SRC_URI[md5sum] = "afdd61c7221434722671baf002ac9267" -SRC_URI[sha256sum] = "246a8fb37e82aa33d495b07c22fdab994c039ab0f818538eac81b01e78636870" +SRC_URI[md5sum] = "6138dd227c39d4a25f81eea76a44d4cb" +SRC_URI[sha256sum] = "ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb" inherit autotools gettext texinfo -- 1.9.1 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 6/7] byacc: upgrade to 20161202 2016-12-26 8:10 [PATCH 0/7] Package Upgrade: systemd-bootchart, dbus, dus-test, sysstat, flex, grep, byacc, coreutils Chen Qi ` (4 preceding siblings ...) 2016-12-26 8:10 ` [PATCH 5/7] grep: upgrade to 2.27 Chen Qi @ 2016-12-26 8:10 ` Chen Qi 2017-01-12 23:18 ` Burton, Ross 2016-12-26 8:10 ` [PATCH 7/7] coreutils: upgrade to 8.26 Chen Qi 6 siblings, 1 reply; 23+ messages in thread From: Chen Qi @ 2016-12-26 8:10 UTC (permalink / raw) To: openembedded-core Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- meta/recipes-extended/byacc/{byacc_20160606.bb => byacc_20161202.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/byacc/{byacc_20160606.bb => byacc_20161202.bb} (74%) diff --git a/meta/recipes-extended/byacc/byacc_20160606.bb b/meta/recipes-extended/byacc/byacc_20161202.bb similarity index 74% rename from meta/recipes-extended/byacc/byacc_20160606.bb rename to meta/recipes-extended/byacc/byacc_20161202.bb index 98129d0..755f8ab 100644 --- a/meta/recipes-extended/byacc/byacc_20160606.bb +++ b/meta/recipes-extended/byacc/byacc_20161202.bb @@ -8,5 +8,5 @@ LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=74533d32ffd38bca4cbf1f13 require byacc.inc -SRC_URI[md5sum] = "d527c811b360f04a8c5f5a0a90625966" -SRC_URI[sha256sum] = "cc8fdced486cb70cec7a7c9358de836bfd267d19d6456760bb4721ccfea5ac91" +SRC_URI[md5sum] = "48ef38447f2cc864c70ef864b26cf817" +SRC_URI[sha256sum] = "30dc58cfcdb708eea7ba022db29b41d2d392f20727491b956954366f2f2117f0" -- 1.9.1 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH 6/7] byacc: upgrade to 20161202 2016-12-26 8:10 ` [PATCH 6/7] byacc: upgrade to 20161202 Chen Qi @ 2017-01-12 23:18 ` Burton, Ross 2017-01-13 6:24 ` ChenQi 2017-01-13 10:57 ` ChenQi 0 siblings, 2 replies; 23+ messages in thread From: Burton, Ross @ 2017-01-12 23:18 UTC (permalink / raw) To: Chen Qi; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 387 bytes --] On 26 December 2016 at 08:10, Chen Qi <Qi.Chen@windriver.com> wrote: > Signed-off-by: Chen Qi <Qi.Chen@windriver.com> > I haven't yet looked into why it could be happening, but it appears the upgraded byacc doesn't like building for beaglebone on poky-lsb: https://autobuilder.yoctoproject.org/main/builders/nightly-arm-lsb/builds/1002/steps/BuildImages_1/logs/stdio Ross [-- Attachment #2: Type: text/html, Size: 1126 bytes --] ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 6/7] byacc: upgrade to 20161202 2017-01-12 23:18 ` Burton, Ross @ 2017-01-13 6:24 ` ChenQi 2017-01-13 10:57 ` ChenQi 1 sibling, 0 replies; 23+ messages in thread From: ChenQi @ 2017-01-13 6:24 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 629 bytes --] On 01/13/2017 07:18 AM, Burton, Ross wrote: > > On 26 December 2016 at 08:10, Chen Qi <Qi.Chen@windriver.com > <mailto:Qi.Chen@windriver.com>> wrote: > > Signed-off-by: Chen Qi <Qi.Chen@windriver.com > <mailto:Qi.Chen@windriver.com>> > > > I haven't yet looked into why it could be happening, but it appears > the upgraded byacc doesn't like building for beaglebone on poky-lsb: > > https://autobuilder.yoctoproject.org/main/builders/nightly-arm-lsb/builds/1002/steps/BuildImages_1/logs/stdio > > Ross Hi Ross, I've reproduced it. I'm now looking into this problem. Best Regards, Chen Qi [-- Attachment #2: Type: text/html, Size: 2154 bytes --] ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 6/7] byacc: upgrade to 20161202 2017-01-12 23:18 ` Burton, Ross 2017-01-13 6:24 ` ChenQi @ 2017-01-13 10:57 ` ChenQi 2017-01-13 11:20 ` Burton, Ross 1 sibling, 1 reply; 23+ messages in thread From: ChenQi @ 2017-01-13 10:57 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 920 bytes --] On 01/13/2017 07:18 AM, Burton, Ross wrote: > > On 26 December 2016 at 08:10, Chen Qi <Qi.Chen@windriver.com > <mailto:Qi.Chen@windriver.com>> wrote: > > Signed-off-by: Chen Qi <Qi.Chen@windriver.com > <mailto:Qi.Chen@windriver.com>> > > > I haven't yet looked into why it could be happening, but it appears > the upgraded byacc doesn't like building for beaglebone on poky-lsb: > > https://autobuilder.yoctoproject.org/main/builders/nightly-arm-lsb/builds/1002/steps/BuildImages_1/logs/stdio > > Ross Hi Ross, I've fixed the problem and updated the remote branch. git://git.pokylinux.org/poky-contrib ChenQi/PU-20161226 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/PU-20161226 In particular, 0001-byacc-do-not-reorder-CC-and-CFLAGS.patch is added to fix the problem of byacc configure script dropping some $CC options. Best Regards, Chen Qi [-- Attachment #2: Type: text/html, Size: 2675 bytes --] ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 6/7] byacc: upgrade to 20161202 2017-01-13 10:57 ` ChenQi @ 2017-01-13 11:20 ` Burton, Ross 0 siblings, 0 replies; 23+ messages in thread From: Burton, Ross @ 2017-01-13 11:20 UTC (permalink / raw) To: ChenQi; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 155 bytes --] On 13 January 2017 at 10:57, ChenQi <Qi.Chen@windriver.com> wrote: > I've fixed the problem and updated the remote branch. > > Thanks Chen! Ross [-- Attachment #2: Type: text/html, Size: 529 bytes --] ^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 7/7] coreutils: upgrade to 8.26 2016-12-26 8:10 [PATCH 0/7] Package Upgrade: systemd-bootchart, dbus, dus-test, sysstat, flex, grep, byacc, coreutils Chen Qi ` (5 preceding siblings ...) 2016-12-26 8:10 ` [PATCH 6/7] byacc: upgrade to 20161202 Chen Qi @ 2016-12-26 8:10 ` Chen Qi 6 siblings, 0 replies; 23+ messages in thread From: Chen Qi @ 2016-12-26 8:10 UTC (permalink / raw) To: openembedded-core Add 0001-local.mk-fix-cross-compiling-problem.patch to fix the following cross compiling problem. | Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- ...need_charset_alias-when-building-for-musl.patch | 0 ...0001-local.mk-fix-cross-compiling-problem.patch | 26 ++++++++++++++++++++++ ...e-report-processor-and-hardware-correctly.patch | 0 .../disable-ls-output-quoting.patch | 0 .../fix-selinux-flask.patch | 0 .../man-decouple-manpages-from-build.patch | 0 .../remove-usr-local-lib-from-m4.patch | 0 .../{coreutils_8.25.bb => coreutils_8.26.bb} | 9 ++++---- 8 files changed, 31 insertions(+), 4 deletions(-) rename meta/recipes-core/coreutils/{coreutils-8.25 => coreutils-8.26}/0001-Unset-need_charset_alias-when-building-for-musl.patch (100%) create mode 100644 meta/recipes-core/coreutils/coreutils-8.26/0001-local.mk-fix-cross-compiling-problem.patch rename meta/recipes-core/coreutils/{coreutils-8.25 => coreutils-8.26}/0001-uname-report-processor-and-hardware-correctly.patch (100%) rename meta/recipes-core/coreutils/{coreutils-8.25 => coreutils-8.26}/disable-ls-output-quoting.patch (100%) rename meta/recipes-core/coreutils/{coreutils-8.25 => coreutils-8.26}/fix-selinux-flask.patch (100%) rename meta/recipes-core/coreutils/{coreutils-8.25 => coreutils-8.26}/man-decouple-manpages-from-build.patch (100%) rename meta/recipes-core/coreutils/{coreutils-8.25 => coreutils-8.26}/remove-usr-local-lib-from-m4.patch (100%) rename meta/recipes-core/coreutils/{coreutils_8.25.bb => coreutils_8.26.bb} (93%) diff --git a/meta/recipes-core/coreutils/coreutils-8.25/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-core/coreutils/coreutils-8.26/0001-Unset-need_charset_alias-when-building-for-musl.patch similarity index 100% rename from meta/recipes-core/coreutils/coreutils-8.25/0001-Unset-need_charset_alias-when-building-for-musl.patch rename to meta/recipes-core/coreutils/coreutils-8.26/0001-Unset-need_charset_alias-when-building-for-musl.patch diff --git a/meta/recipes-core/coreutils/coreutils-8.26/0001-local.mk-fix-cross-compiling-problem.patch b/meta/recipes-core/coreutils/coreutils-8.26/0001-local.mk-fix-cross-compiling-problem.patch new file mode 100644 index 0000000..66f9a71 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.26/0001-local.mk-fix-cross-compiling-problem.patch @@ -0,0 +1,26 @@ +Subject: local.mk: fix cross compiling problem + +We meet the following error when cross compiling. +| Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop. +This patch fixes this problem. + +Upstream-Status: Pending + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + src/local.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/local.mk b/src/local.mk +index 36dfa4e..c5898cc 100644 +--- a/src/local.mk ++++ b/src/local.mk +@@ -649,4 +649,4 @@ cu_install_program = @INSTALL_PROGRAM@ + else + cu_install_program = src/ginstall + endif +-INSTALL = $(cu_install_program) -c ++INSTALL_PROGRAM = $(cu_install_program) +-- +2.1.0 + diff --git a/meta/recipes-core/coreutils/coreutils-8.25/0001-uname-report-processor-and-hardware-correctly.patch b/meta/recipes-core/coreutils/coreutils-8.26/0001-uname-report-processor-and-hardware-correctly.patch similarity index 100% rename from meta/recipes-core/coreutils/coreutils-8.25/0001-uname-report-processor-and-hardware-correctly.patch rename to meta/recipes-core/coreutils/coreutils-8.26/0001-uname-report-processor-and-hardware-correctly.patch diff --git a/meta/recipes-core/coreutils/coreutils-8.25/disable-ls-output-quoting.patch b/meta/recipes-core/coreutils/coreutils-8.26/disable-ls-output-quoting.patch similarity index 100% rename from meta/recipes-core/coreutils/coreutils-8.25/disable-ls-output-quoting.patch rename to meta/recipes-core/coreutils/coreutils-8.26/disable-ls-output-quoting.patch diff --git a/meta/recipes-core/coreutils/coreutils-8.25/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils-8.26/fix-selinux-flask.patch similarity index 100% rename from meta/recipes-core/coreutils/coreutils-8.25/fix-selinux-flask.patch rename to meta/recipes-core/coreutils/coreutils-8.26/fix-selinux-flask.patch diff --git a/meta/recipes-core/coreutils/coreutils-8.25/man-decouple-manpages-from-build.patch b/meta/recipes-core/coreutils/coreutils-8.26/man-decouple-manpages-from-build.patch similarity index 100% rename from meta/recipes-core/coreutils/coreutils-8.25/man-decouple-manpages-from-build.patch rename to meta/recipes-core/coreutils/coreutils-8.26/man-decouple-manpages-from-build.patch diff --git a/meta/recipes-core/coreutils/coreutils-8.25/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.26/remove-usr-local-lib-from-m4.patch similarity index 100% rename from meta/recipes-core/coreutils/coreutils-8.25/remove-usr-local-lib-from-m4.patch rename to meta/recipes-core/coreutils/coreutils-8.26/remove-usr-local-lib-from-m4.patch diff --git a/meta/recipes-core/coreutils/coreutils_8.25.bb b/meta/recipes-core/coreutils/coreutils_8.26.bb similarity index 93% rename from meta/recipes-core/coreutils/coreutils_8.25.bb rename to meta/recipes-core/coreutils/coreutils_8.26.bb index 6d6f7bc..caa6d96 100644 --- a/meta/recipes-core/coreutils/coreutils_8.25.bb +++ b/meta/recipes-core/coreutils/coreutils_8.26.bb @@ -20,12 +20,13 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz;name=tarball \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0001-uname-report-processor-and-hardware-correctly.patch \ file://disable-ls-output-quoting.patch \ + file://0001-local.mk-fix-cross-compiling-problem.patch \ " -SRC_URI[tarball.md5sum] = "070e43ba7f618d747414ef56ab248a48" -SRC_URI[tarball.sha256sum] = "31e67c057a5b32a582f26408c789e11c2e8d676593324849dcf5779296cdce87" -SRC_URI[manpages.md5sum] = "415cc0552bc4e480b27ce8b2aebfdeb5" -SRC_URI[manpages.sha256sum] = "2ee31c3a6d2276f49c5515375d4a0c1047580da6ac10536898e0f0de81707f29" +SRC_URI[tarball.md5sum] = "d5aa2072f662d4118b9f4c63b94601a6" +SRC_URI[tarball.sha256sum] = "155e94d748f8e2bc327c66e0cbebdb8d6ab265d2f37c3c928f7bf6c3beba9a8e" +SRC_URI[manpages.md5sum] = "b58107f532f7beffcb2f38e2ac1f2da3" +SRC_URI[manpages.sha256sum] = "9324ec412ffca3b0431e6299720c33ac98e749e430f72a7c6e65f3635c86aa29" EXTRA_OECONF_class-native = "--without-gmp" EXTRA_OECONF_class-target = "--enable-install-program=arch --libexecdir=${libdir}" -- 1.9.1 ^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2017-02-10 18:35 UTC | newest] Thread overview: 23+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-12-26 8:10 [PATCH 0/7] Package Upgrade: systemd-bootchart, dbus, dus-test, sysstat, flex, grep, byacc, coreutils Chen Qi 2016-12-26 8:10 ` [PATCH 1/7] systemd-bootchart: upgrade to 231 Chen Qi 2016-12-26 8:10 ` [PATCH 2/7] dbus/dbus-test: upgrade to 1.10.14 Chen Qi 2016-12-26 8:10 ` [PATCH 3/7] sysstat: upgrade to 11.5.3 Chen Qi 2016-12-26 8:10 ` [PATCH 4/7] flex: upgrade to 2.6.2 Chen Qi 2017-01-06 14:59 ` Burton, Ross 2017-01-09 1:53 ` ChenQi 2017-01-09 15:24 ` Burton, Ross 2017-01-09 9:39 ` ChenQi 2017-01-26 22:39 ` Martin Jansa 2017-01-27 2:16 ` Khem Raj 2017-01-27 2:19 ` Martin Jansa 2017-01-27 2:21 ` Khem Raj 2017-01-30 19:56 ` Denys Dmytriyenko 2017-02-10 18:32 ` Trevor Woerner 2017-02-10 18:36 ` Khem Raj 2016-12-26 8:10 ` [PATCH 5/7] grep: upgrade to 2.27 Chen Qi 2016-12-26 8:10 ` [PATCH 6/7] byacc: upgrade to 20161202 Chen Qi 2017-01-12 23:18 ` Burton, Ross 2017-01-13 6:24 ` ChenQi 2017-01-13 10:57 ` ChenQi 2017-01-13 11:20 ` Burton, Ross 2016-12-26 8:10 ` [PATCH 7/7] coreutils: upgrade to 8.26 Chen Qi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox