summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-09-29 19:19:17 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 11:40:49 +0100
commite602247c0823f7076bf518f6c51a5ea76e529840 (patch)
tree01a262dd00ede4cff393575133f91b06a1fc9f42 /meta/recipes-devtools/rpm
parenta2e7adad277cb8f71febaccf734a1df727d2ce8a (diff)
downloadpoky-e602247c0823f7076bf518f6c51a5ea76e529840.tar.gz
rpm: Add rpm patch to fix git_strerror issues
Remove the optimzation append from recipe and add the patch that is in the rpm cvs repo, http://www.mail-archive.com/rpm-cvs@rpm5.org/msg08907.html. The -O2 optimzation append is removed since it can limit debugging options that are provided when -O0 is used. This was tested by setting: SELECTED_OPTIMIZATION = "-O0" (From OE-Core rev: d109c6bd163469d6281d20174e4b79cb63483cd4) Signed-off-by: Morgan Little <morgan.little@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-stub-out-git_strerror.patch60
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb3
2 files changed, 62 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-stub-out-git_strerror.patch b/meta/recipes-devtools/rpm/rpm/rpm-stub-out-git_strerror.patch
new file mode 100644
index 0000000000..2cfc163fe1
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-stub-out-git_strerror.patch
@@ -0,0 +1,60 @@
1git: fix: stud-out git_strerror when --without-git
2
3Patch taken from the cvs repo,http://www.mail-archive.com/rpm-cvs@rpm5.org/msg08907.html.
4
5Upstream-status: Backport
6
7Signed-off-by: Morgan Little <morgan.little@windriver.com>
8
9Server: rpm5.org Name: Jeff Johnson
10Root: /v/rpm/cvs Email: j...@rpm5.org
11Module: rpm Date: 07-Jun-2012 16:17:02
12Branch: rpm-5_4 Handle: 2012060714165803
13
14Modified files: (Branch: rpm-5_4)
15 rpm CHANGES
16 rpm/rpmio rpmgit.c tgit.c
17
18Log:
19 - git: fix: stub-out git_strerror when --without-git.
20
21Summary:
22 Revision Changes Path
23 2.1.2.11 +3 -1 rpm/rpmio/rpmgit.c
24 1.1.2.7 +0 -1 rpm/rpmio/tgit.c
25____________________________________________________________________________
26Index: rpm/rpmio/rpmgit.c
27============================================================================
28--- rpm/rpmio/rpmgit.c
29+++ rpm/rpmio/rpmgit.c
30@@ -145,6 +145,9 @@
31 #endif /* defined(WITH_LIBGT2) */
32
33 /*==============================================================*/
34+#if !defined(WITH_LIBGIT2)
35+#define git_strerror(_rc) ""
36+#endif
37
38 static int Xchkgit(/*@unused@*/ rpmgit git, const char * msg,
39 int error, int printit,
40@@ -157,7 +157,6 @@
41 int rc = error;
42
43 if (printit && rc) {
44- /* XXX git_strerror? */
45 rpmlog(RPMLOG_ERR, "%s:%s:%u: %s(%d): %s\n",
46 func, fn, ln, msg, rc, git_strerror(rc));
47 }
48Index: rpm/rpmio/tgit.c
49============================================================================
50--- rpm/rpmio/tgit.c
51+++ rpm/rpmio/tgit.c
52@@ -34,7 +34,6 @@
53 int rc = error;
54
55 if (printit && rc) {
56- /* XXX git_strerror? */
57 rpmlog(RPMLOG_ERR, "%s:%s:%u: %s(%d): %s\n",
58 func, fn, ln, msg, rc, git_strerror(rc));
59 }
60
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 41943652b0..671268bb85 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" 43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
44 44
45DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" 45DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native"
46PR = "r50" 46PR = "r51"
47 47
48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
49# in order to extract the distribution SRPM into a format we can extract... 49# in order to extract the distribution SRPM into a format we can extract...
@@ -78,6 +78,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
78 file://dbconvert.patch \ 78 file://dbconvert.patch \
79 file://rpm-uuid-include.patch \ 79 file://rpm-uuid-include.patch \
80 file://makefile-am-exec-hook.patch \ 80 file://makefile-am-exec-hook.patch \
81 file://rpm-stub-out-git_strerror.patch \
81 " 82 "
82 83
83SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" 84SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768"