From: Alex Yao
This upgrades lcov to 1.16 and removes backported patches which are
now included since 1.15. This also removes dependencies added from
backported patches since the new version removes the need for these
dependencies.
Signed-off-by: Alex Yao
---
...Add-intermediate-text-format-support.patch | 898 --
...Add-intermediate-JSON-format-support.patch | 247 -
.../lcov/{lcov_1.14.bb => lcov_1.16.bb} | 14 +-
3 files changed, 3 insertions(+), 1156 deletions(-)
delete mode 100644
meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch
delete mode 100644
meta-oe/recipes-support/lcov/files/0002-geninfo-Add-intermediate-JSON-format-support.patch
rename meta-oe/recipes-support/lcov/{lcov_1.14.bb => lcov_1.16.bb} (79%)
diff --git
a/meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch
b/meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch
deleted file mode 100644
index 9ac0770f9..0
---
a/meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch
+++ /dev/null
@@ -1,898 +0,0 @@
-From ec3e1f411c332cbc2f2bc7ab7e2175ebf918b37a Mon Sep 17 00:00:00 2001
-From: Peter Oberparleiter
-Date: Fri, 24 May 2019 16:56:52 +0200
-Subject: [PATCH 1/2] geninfo: Add intermediate text format support
-
-This change adds support for parsing the output of gcov's intermediate
-text file format as implemented by GCC versions 5 to 8. The use of the
-gcov intermediate format should increase processing speed. It also
-provides branch coverage data when using the --initial command line
-option.
-
-Users can control whether geninfo uses the intermediate format via the
-geninfo_intermediate configuration file option. Valid values are:
-
- 0: Use normal text format
- 1: Use intermediate format
- auto: Use intermediate format if available. This is the default.
-
-Signed-off-by: Peter Oberparleiter
- bin/geninfo | 567 ---
- lcovrc | 3 +
- man/lcovrc.5 | 24 +++
- 3 files changed, 521 insertions(+), 73 deletions(-)
-
-Upstream-Status: Backport
-Download URL:
https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7
-
-diff --git a/bin/geninfo b/bin/geninfo
-index f41eaec..027 100755
a/bin/geninfo
-+++ b/bin/geninfo
-@@ -54,6 +54,8 @@ use warnings;
- use File::Basename;
- use File::Spec::Functions qw /abs2rel catdir file_name_is_absolute splitdir
- splitpath catpath/;
-+use File::Temp qw(tempfile tempdir);
-+use File::Copy qw(copy);
- use Getopt::Long;
- use Digest::MD5 qw(md5_base64);
- use Cwd qw/abs_path/;
-@@ -163,13 +165,13 @@ sub solve_relative_path($$);
- sub read_gcov_header($);
- sub read_gcov_file($);
- sub info(@);
-+sub process_intermediate($$$);
- sub map_llvm_version($);
- sub version_to_str($);
- sub get_gcov_version();
- sub system_no_output($@);
- sub read_config($);
- sub apply_config($);
--sub get_exclusion_data($);
- sub apply_exclusion_data($$);
- sub process_graphfile($$);
- sub filter_fn_name($);
-@@ -264,6 +266,8 @@ our $gcno_split_crc;
- our $func_coverage = 1;
- our $br_coverage = 0;
- our $rc_auto_base = 1;
-+our $rc_intermediate = "auto";
-+our $intermediate;
- our $excl_line = "LCOV_EXCL_LINE";
- our $excl_br_line = "LCOV_EXCL_BR_LINE";
-
-@@ -331,6 +335,7 @@ if ($config || %opt_rc)
- "geninfo_compat"=> \$opt_compat,
- "geninfo_adjust_src_path" => \$rc_adjust_src_path,
- "geninfo_auto_base" => \$rc_auto_base,
-+ "geninfo_intermediate" => \$rc_intermediate,
- "lcov_function_coverage"=> \$func_coverage,
- "lcov_branch_coverage" => \$br_coverage,
- "lcov_excl_line"=> \$excl_line,
-@@ -460,15 +465,38 @@ if (system_no_output(3, $gcov_tool, "--help") == -1)
- }
-
- ($gcov_version, $gcov_version_string) = get_gcov_version();
-+$gcov_caps = get_gcov_capabilities();
-+
-+# Determine intermediate mode
-+if ($rc_intermediate eq "0") {
-+ $intermediate = 0;
-+} elsif ($rc_intermediate eq "1") {
-+ $intermediate = 1;
-+} elsif (lc($rc_intermediate) eq "auto") {
-+ # Use intermediate format if supported by gcov
-+ $intermediate = $gcov_caps->{'intermediate-format'} ? 1 : 0;
-+} else {
-+ die("ERROR: invalid value for geninfo_intermediate: ".
-+ "'$rc_intermediate'\n");
-+}
-+
-+if ($intermediate) {
-+ info("Using intermediate gcov format\n");
-+ if ($opt_derive_func_data) {
-+ warn("WARNING: --derive-func-data is not compatible with ".
-+ "intermediate format - ignoring\n");
-+ $opt_derive_func_data = 0;
-+ }
-+}
-
- # Determine gcov options
--$gcov_caps = get_gcov_capabilities();
- push(@gcov_options, "-b") if
