summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/build-compare/files/pkg-diff.sh-remove-space-in-the-end-for-ftype.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/build-compare/files/pkg-diff.sh-remove-space-in-the-end-for-ftype.patch')
-rw-r--r--meta/recipes-devtools/build-compare/files/pkg-diff.sh-remove-space-in-the-end-for-ftype.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-devtools/build-compare/files/pkg-diff.sh-remove-space-in-the-end-for-ftype.patch b/meta/recipes-devtools/build-compare/files/pkg-diff.sh-remove-space-in-the-end-for-ftype.patch
deleted file mode 100644
index 8077172333..0000000000
--- a/meta/recipes-devtools/build-compare/files/pkg-diff.sh-remove-space-in-the-end-for-ftype.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 836a6783df9c582a834fca239f227063a5687715 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 14 Jul 2016 19:49:12 -0700
4Subject: [PATCH 2/4] pkg-diff.sh: remove space in the end for ftype
5
6Versions of file like 5.14 returns a " " in the end, for example:
7ftype="directory ", but we need ftype="directory", remove the space to
8fix the problem.
9
10Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pull/10]
11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13---
14 pkg-diff.sh | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/pkg-diff.sh b/pkg-diff.sh
18index 402d4a4..5dd3a38 100644
19--- a/pkg-diff.sh
20+++ b/pkg-diff.sh
21@@ -633,7 +633,7 @@ check_single_file()
22 ;;
23 esac
24
25- ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'`
26+ ftype=`/usr/bin/file old/$file | sed -e 's@^[^:]\+:[[:blank:]]*@@' -e 's@[[:blank:]]*$@@'`
27 case $ftype in
28 PE32\ executable*Mono\/\.Net\ assembly*)
29 echo "PE32 Mono/.Net assembly: $file"
30--
312.9.0
32