diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2016-07-17 20:32:42 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-25 23:46:59 +0100 |
| commit | 79c574979f64f2dbe8ca05774446de21a53b3a87 (patch) | |
| tree | 016d9f0166df7886fb211f09c8b24a96962f62b2 | |
| parent | 038c09d6ab9581030efdc16aa1b96972970eeaab (diff) | |
| download | openembedded-core-contrib-79c574979f64f2dbe8ca05774446de21a53b3a87.tar.gz | |
build-compare: remove space at head
The command like:
rpm -qp --nodigest --nosignature --qf '<foo> [%{REQUIRENAME}\n]\n'
^^space
The space will be printed, and will impact the check result, so remove it.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-devtools/build-compare/build-compare_git.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/build-compare/files/functions.sh-remove-space-at-head.patch | 41 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-devtools/build-compare/build-compare_git.bb b/meta/recipes-devtools/build-compare/build-compare_git.bb index 676f11dd88..88996e27f8 100644 --- a/meta/recipes-devtools/build-compare/build-compare_git.bb +++ b/meta/recipes-devtools/build-compare/build-compare_git.bb @@ -9,6 +9,7 @@ SRC_URI = "git://github.com/openSUSE/build-compare.git \ file://Rename-rpm-check.sh-to-pkg-diff.sh.patch;striplevel=1 \ file://Ignore-DWARF-sections.patch;striplevel=1 \ file://0001-Add-support-for-deb-and-ipk-packaging.patch \ + file://functions.sh-remove-space-at-head.patch \ " SRCREV = "c5352c054c6ef15735da31b76d6d88620f4aff0a" diff --git a/meta/recipes-devtools/build-compare/files/functions.sh-remove-space-at-head.patch b/meta/recipes-devtools/build-compare/files/functions.sh-remove-space-at-head.patch new file mode 100644 index 0000000000..02e96bab5a --- /dev/null +++ b/meta/recipes-devtools/build-compare/files/functions.sh-remove-space-at-head.patch @@ -0,0 +1,41 @@ +From 402a821e604f280e62c34bf4d40c6d1b4c6c892d Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Mon, 4 Jul 2016 20:11:33 -0700 +Subject: [PATCH] functions.sh: remove space at head + +The command like: +rpm -qp --nodigest --nosignature --qf '<foo> [%{REQUIRENAME}\n]\n' + ^^space + +The space will be printed, and will impact the check result, so remove it. + +Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pull/9] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + functions.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/functions.sh b/functions.sh +index 85c9003..b1069d2 100644 +--- a/functions.sh ++++ b/functions.sh +@@ -26,6 +26,7 @@ function trim_release_old() + sed -e " + /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_old_regex_l\$\)/{s,$version_release_old_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_old_regex_s,@VERSION@-@RELEASE_SHORT@,g} + s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g ++ s/^ *//g + " + } + function trim_release_new() +@@ -33,6 +34,7 @@ function trim_release_new() + sed -e " + /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_new_regex_l\$\)/{s,$version_release_new_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_new_regex_s,@VERSION@-@RELEASE_SHORT@,g} + s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_new_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g ++ s/^ *//g + " + } + # Get single directory or filename with long or short release string +-- +2.9.0 + |