summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-02-19 21:57:18 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-21 22:05:36 +0000
commit1f6e644859b814044046ec71594d4c0de5480a0c (patch)
tree35cd202ff92bd0d941aa9028ae9c52a900d5054a /meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
parente011e92e8c7a3acf853333e77ba8d005e1a9b417 (diff)
downloadpoky-1f6e644859b814044046ec71594d4c0de5480a0c.tar.gz
build-compare: update Rename-rpm-check.sh-to-pkg-diff.sh.patch
The patch can't be applied by "git am -3" with newer version of git (such as 2.0.1), and can't be applied by "git am/apply" with any version, now fix it (From OE-Core rev: 14990de8c7481c3aaf77174a7541d5bfb9a7411d) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch')
-rw-r--r--meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch37
1 files changed, 20 insertions, 17 deletions
diff --git a/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch b/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
index 3e1e679a9c..cff3a9e236 100644
--- a/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
+++ b/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
@@ -1,6 +1,6 @@
1From f5db896b7f49b56dad0d51c9bdb3d4c9525edab2 Mon Sep 17 00:00:00 2001 1From 4de3df5a1b361cd09a081f0e0bdb94cbf684ed48 Mon Sep 17 00:00:00 2001
2From: Randy Witt <randy.e.witt@linux.intel.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 5 Jan 2015 15:58:35 -0800 3Date: Thu, 19 Feb 2015 00:34:47 -0800
4Subject: [PATCH] Rename rpm-check.sh to pkg-diff.sh. 4Subject: [PATCH] Rename rpm-check.sh to pkg-diff.sh.
5 5
6The tool now accepts package input other than rpm, so change the name 6The tool now accepts package input other than rpm, so change the name
@@ -9,13 +9,17 @@ which could be misleading.
9Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pulls] 9Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pulls]
10 10
11Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> 11Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
12
13Updated for rpm-check.sh.
14
15Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12--- 16---
13 build-compare.spec | 2 +- 17 build-compare.spec | 2 +-
14 pkg-diff.sh | 765 +++++++++++++++++++++++++++++++++++++++++++++++++++ 18 pkg-diff.sh | 765 ++++++++++++++++++++++++++++++++++++++++++++++++++
15 rpm-check.sh | 765 --------------------------------------------------- 19 rpm-check.sh | 764 -------------------------------------------------
16 same-build-result.sh | 4 +- 20 same-build-result.sh | 4 +-
17 4 files changed, 768 insertions(+), 768 deletions(-) 21 4 files changed, 768 insertions(+), 767 deletions(-)
18 create mode 100755 pkg-diff.sh 22 create mode 100644 pkg-diff.sh
19 delete mode 100755 rpm-check.sh 23 delete mode 100755 rpm-check.sh
20 24
21diff --git a/build-compare.spec b/build-compare.spec 25diff --git a/build-compare.spec b/build-compare.spec
@@ -32,7 +36,7 @@ index 14a97e9..5f47ca1 100644
32 Source5: srpm-check.sh 36 Source5: srpm-check.sh
33 BuildRoot: %{_tmppath}/%{name}-%{version}-build 37 BuildRoot: %{_tmppath}/%{name}-%{version}-build
34diff --git a/pkg-diff.sh b/pkg-diff.sh 38diff --git a/pkg-diff.sh b/pkg-diff.sh
35new file mode 100755 39new file mode 100644
36index 0000000..56035c1 40index 0000000..56035c1
37--- /dev/null 41--- /dev/null
38+++ b/pkg-diff.sh 42+++ b/pkg-diff.sh
@@ -804,10 +808,10 @@ index 0000000..56035c1
804+# vim: tw=666 ts=2 et 808+# vim: tw=666 ts=2 et
805diff --git a/rpm-check.sh b/rpm-check.sh 809diff --git a/rpm-check.sh b/rpm-check.sh
806deleted file mode 100755 810deleted file mode 100755
807index 56035c1..0000000 811index dd47642..0000000
808--- a/rpm-check.sh 812--- a/rpm-check.sh
809+++ /dev/null 813+++ /dev/null
810@@ -1,765 +0,0 @@ 814@@ -1,764 +0,0 @@
811-#! /bin/bash 815-#! /bin/bash
812-# 816-#
813-# Copyright (c) 2009, 2010, 2011, 2012 SUSE Linux Product GmbH, Germany. 817-# Copyright (c) 2009, 2010, 2011, 2012 SUSE Linux Product GmbH, Germany.
@@ -1400,10 +1404,9 @@ index 56035c1..0000000
1400- *.ps) 1404- *.ps)
1401- for f in "old/$file" "new/$file"; do 1405- for f in "old/$file" "new/$file"; do
1402- sed -i -e ' 1406- sed -i -e '
1403- /^%%CreationDate:[[:blank:]]/d 1407- /^%%CreationDate:[[:blank:]]/d
1404- /^%%Creator:[[:blank:]]groff[[:blank:]]version[[:blank:]]/d 1408- /^%%Creator:[[:blank:]]groff[[:blank:]]version[[:blank:]]/d
1405- /^%DVIPSSource:[[:blank:]]/d 1409- ' "$f"
1406- ' "$f"
1407- done 1410- done
1408- ;; 1411- ;;
1409- *pdf) 1412- *pdf)
@@ -1592,5 +1595,5 @@ index c8907e2..7e9bd4f 100644
1592 1595
1593 check_all=1 1596 check_all=1
1594-- 1597--
15951.9.3 15981.7.9.5
1596 1599