Applied, thanks!
Op 3 mrt. 2017, om 04:11 heeft Denys Dmytriyenko denis@denix.org het volgende geschreven:
From: Denys Dmytriyenko denys@ti.com
oe-core has finally reverted back to 2.6.0, no need to overlay it locally
This reverts commit eb86f6d7a079fb9240c466978c6d3b927ba4e0fb.
...-target-for-building-tests-without-runnin.patch | 28 ---------- ...oid-c-comments-in-c-code-fails-with-gcc-6.patch | 64 ---------------------- .../flex/flex/CVE-2016-6354.patch | 59 -------------------- .../flex/flex/disable-tests.patch | 19 ------- .../flex/flex/do_not_create_pdf_doc.patch | 17 ------ .../recipes-overlayed/flex/flex/run-ptest | 5 -- .../recipes-overlayed/flex/flex_2.6.0.bb | 62 --------------------- 7 files changed, 254 deletions(-) delete mode 100644 meta-linaro-integration/recipes-overlayed/flex/flex/0001-tests-add-a-target-for-building-tests-without-runnin.patch delete mode 100644 meta-linaro-integration/recipes-overlayed/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch delete mode 100644 meta-linaro-integration/recipes-overlayed/flex/flex/CVE-2016-6354.patch delete mode 100644 meta-linaro-integration/recipes-overlayed/flex/flex/disable-tests.patch delete mode 100644 meta-linaro-integration/recipes-overlayed/flex/flex/do_not_create_pdf_doc.patch delete mode 100755 meta-linaro-integration/recipes-overlayed/flex/flex/run-ptest delete mode 100644 meta-linaro-integration/recipes-overlayed/flex/flex_2.6.0.bb
diff --git a/meta-linaro-integration/recipes-overlayed/flex/flex/0001-tests-add-a-target-for-building-tests-without-runnin.patch b/meta-linaro-integration/recipes-overlayed/flex/flex/0001-tests-add-a-target-for-building-tests-without-runnin.patch deleted file mode 100644 index 556c240..0000000 --- a/meta-linaro-integration/recipes-overlayed/flex/flex/0001-tests-add-a-target-for-building-tests-without-runnin.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b4aa18d939fc0c8825fa584dfcee1a7da61099cf Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin alex.kanavin@gmail.com -Date: Thu, 10 Dec 2015 16:09:26 +0200 -Subject: [PATCH] tests: add a target for building tests without running them
-Upstream-Status: Inappropriate [oe specific]
-Signed-off-by: Alexander Kanavin alex.kanavin@gmail.com
- tests/Makefile.am | 3 +++
- 1 file changed, 3 insertions(+)
-diff --git a/tests/Makefile.am b/tests/Makefile.am -index 4ac3c17..0025cfe 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -21,6 +21,9 @@
- TESTS = $(check_PROGRAMS) options.cn
-+# This allows building tests without running them -+buildtests: $(TESTS) -+
- # The script testwrapper.sh will run most tests as is. A couple tests
- # in the suite end in .reject, .table and the like so that we can pass
- # different arguments to the test runner. We list those extensions so
-2.6.2
diff --git a/meta-linaro-integration/recipes-overlayed/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch b/meta-linaro-integration/recipes-overlayed/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch deleted file mode 100644 index 438ca5f..0000000 --- a/meta-linaro-integration/recipes-overlayed/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-linaro-integration/recipes-overlayed/flex/flex/CVE-2016-6354.patch b/meta-linaro-integration/recipes-overlayed/flex/flex/CVE-2016-6354.patch deleted file mode 100644 index 216ac7a..0000000 --- a/meta-linaro-integration/recipes-overlayed/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-linaro-integration/recipes-overlayed/flex/flex/disable-tests.patch b/meta-linaro-integration/recipes-overlayed/flex/flex/disable-tests.patch deleted file mode 100644 index 4dc801d..0000000 --- a/meta-linaro-integration/recipes-overlayed/flex/flex/disable-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -Due to automake stupidity the Makefile in tests/ has an 'all' target that -depends on $(BUILD_SOURCES), which means when building flex parts of the test -suite are built even if they're not needed, resulting in flex needing -flex-native and bison-native to build.
-This patch removes the tests directory from SUBDIRS and will be conditionally -applied by the recipe.
-Upstream-Status: Inappropriate -Signed-off-by: Ross Burton ross.burton@intel.com
-diff --git a/Makefile.am b/Makefile.am -index 076ccad..0574d7b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -55,3 +55,2 @@ SUBDIRS = \
- po \
-- tests \
- tools
diff --git a/meta-linaro-integration/recipes-overlayed/flex/flex/do_not_create_pdf_doc.patch b/meta-linaro-integration/recipes-overlayed/flex/flex/do_not_create_pdf_doc.patch deleted file mode 100644 index 032833a..0000000 --- a/meta-linaro-integration/recipes-overlayed/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-linaro-integration/recipes-overlayed/flex/flex/run-ptest b/meta-linaro-integration/recipes-overlayed/flex/flex/run-ptest deleted file mode 100755 index 19db337..0000000 --- a/meta-linaro-integration/recipes-overlayed/flex/flex/run-ptest +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh
-# make would want to rebuild some files with a compiler otherwise :-/ -make FLEX=/usr/bin/flex -t check-TESTS || true -make FLEX=/usr/bin/flex check-TESTS diff --git a/meta-linaro-integration/recipes-overlayed/flex/flex_2.6.0.bb b/meta-linaro-integration/recipes-overlayed/flex/flex_2.6.0.bb deleted file mode 100644 index ab35b09..0000000 --- a/meta-linaro-integration/recipes-overlayed/flex/flex_2.6.0.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Flex (The Fast Lexical Analyzer)" -DESCRIPTION = "Flex is a fast lexical analyser generator. Flex is a tool for generating programs that recognize \ -lexical patterns in text." -HOMEPAGE = "http://sourceforge.net/projects/flex/" -SECTION = "devel" -LICENSE = "BSD"
-DEPENDS = "${@bb.utils.contains('PTEST_ENABLED', '1', 'bison-native flex-native', '', d)}" -BBCLASSEXTEND = "native nativesdk"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e4742cf92e89040b39486a6219b68067"
-SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \
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"
-# Flex has moved to github from 2.6.1 onwards -UPSTREAM_CHECK_URI = "https://github.com/westes/flex/releases" -UPSTREAM_CHECK_REGEX = "flex-(?P<pver>\d+(.\d+)+).tar"
-inherit autotools gettext texinfo ptest
-M4 = "${bindir}/m4" -M4_class-native = "${STAGING_BINDIR_NATIVE}/m4" -EXTRA_OECONF += "ac_cv_path_M4=${M4}" -EXTRA_OEMAKE += "m4=${STAGING_BINDIR_NATIVE}/m4"
-EXTRA_OEMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', 'FLEX=${STAGING_BINDIR_NATIVE}/flex', '', d)}"
-do_install_append_class-native() {
- create_wrapper ${D}/${bindir}/flex M4=${M4}
-}
-do_install_append_class-nativesdk() {
- create_wrapper ${D}/${bindir}/flex M4=${M4}
-}
-RDEPENDS_${PN} += "m4" -RDEPENDS_${PN}-ptest += "bash gawk"
-do_compile_ptest() {
- oe_runmake -C ${B}/tests -f ${B}/tests/Makefile top_builddir=${B} INCLUDES=-I${S}/src buildtests
-}
-do_install_ptest() {
- mkdir -p ${D}${PTEST_PATH}/build-aux/
- cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/
- cp -r ${S}/tests/* ${D}${PTEST_PATH}
- cp -r ${B}/tests/* ${D}${PTEST_PATH}
- sed -e 's/^Makefile:/_Makefile:/' \
-e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/^top_srcdir = \(.*\)/top_srcdir = ./' \-e 's/^builddir = \(.*\)/builddir = ./' -e 's/^top_builddir = \(.*\)/top_builddir = ./' \-i ${D}${PTEST_PATH}/Makefile-}
2.7.4
OpenEmbedded mailing list OpenEmbedded@lists.linaro.org https://lists.linaro.org/mailman/listinfo/openembedded