summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/build-compare/build-compare_git.bb1
-rw-r--r--meta/recipes-devtools/build-compare/files/functions.sh-remove-space-at-head.patch41
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 \
9 file://Rename-rpm-check.sh-to-pkg-diff.sh.patch;striplevel=1 \ 9 file://Rename-rpm-check.sh-to-pkg-diff.sh.patch;striplevel=1 \
10 file://Ignore-DWARF-sections.patch;striplevel=1 \ 10 file://Ignore-DWARF-sections.patch;striplevel=1 \
11 file://0001-Add-support-for-deb-and-ipk-packaging.patch \ 11 file://0001-Add-support-for-deb-and-ipk-packaging.patch \
12 file://functions.sh-remove-space-at-head.patch \
12 " 13 "
13 14
14SRCREV = "c5352c054c6ef15735da31b76d6d88620f4aff0a" 15SRCREV = "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 @@
1From 402a821e604f280e62c34bf4d40c6d1b4c6c892d Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 4 Jul 2016 20:11:33 -0700
4Subject: [PATCH] functions.sh: remove space at head
5
6The command like:
7rpm -qp --nodigest --nosignature --qf '<foo> [%{REQUIRENAME}\n]\n'
8 ^^space
9
10The space will be printed, and will impact the check result, so remove it.
11
12Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pull/9]
13
14Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15---
16 functions.sh | 2 ++
17 1 file changed, 2 insertions(+)
18
19diff --git a/functions.sh b/functions.sh
20index 85c9003..b1069d2 100644
21--- a/functions.sh
22+++ b/functions.sh
23@@ -26,6 +26,7 @@ function trim_release_old()
24 sed -e "
25 /\(\/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}
26 s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g
27+ s/^ *//g
28 "
29 }
30 function trim_release_new()
31@@ -33,6 +34,7 @@ function trim_release_new()
32 sed -e "
33 /\(\/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}
34 s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_new_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g
35+ s/^ *//g
36 "
37 }
38 # Get single directory or filename with long or short release string
39--
402.9.0
41