summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-10-31 14:42:03 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-18 16:42:02 +0000
commit11af6b042cee91c52e13df6f76628fdacc5c692a (patch)
tree8450579b61a2760efa8b3eee21a9de76c20d87c2 /meta/recipes-devtools/rpm
parent3d8fd40f9f339564d8b7c80e2f60cc4f49826def (diff)
downloadpoky-11af6b042cee91c52e13df6f76628fdacc5c692a.tar.gz
rpm: Add additional RPMSENSE values to python module
We add a number of additional RPMSENSE values to the python module to better support the dependency calculations in SMART. (From OE-Core rev: 431352d063b353ee0e0eaa5bfe24450962d71d6b) 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/python-rpm-rpmsense.patch33
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb3
2 files changed, 35 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch b/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
new file mode 100644
index 0000000000..61f1e0c69b
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
@@ -0,0 +1,33 @@
1rpmmodule.c: Export a few additional RPMSENSE values
2
3We want to see the RPMSENSE_SCRIPT values for use with SMART. We also
4want to see the MISSINGOK value so we can avoid recommended packages causing
5failures.
6
7Upstream-status: Pending
8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10
11Index: rpm-5.4.9/python/rpmmodule.c
12===================================================================
13--- rpm-5.4.9.orig/python/rpmmodule.c
14+++ rpm-5.4.9/python/rpmmodule.c
15@@ -494,12 +494,16 @@ void init_rpm(void)
16 REGISTER_ENUM(RPMSENSE_EQUAL);
17 REGISTER_ENUM(RPMSENSE_NOTEQUAL);
18 REGISTER_ENUM(RPMSENSE_FIND_REQUIRES);
19-#if defined(RPM_VENDOR_MANDRIVA)
20+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY)
21 REGISTER_ENUM(RPMSENSE_PREREQ);
22 REGISTER_ENUM(RPMSENSE_SCRIPT_PRE);
23 REGISTER_ENUM(RPMSENSE_SCRIPT_POST);
24 REGISTER_ENUM(RPMSENSE_SCRIPT_PREUN);
25- REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN)
26+ REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN);
27+#endif
28+
29+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY)
30+ REGISTER_ENUM(RPMSENSE_MISSINGOK);
31 #endif
32
33 REGISTER_ENUM(RPMDEPS_FLAG_NOUPGRADE);
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 44f1ca1aeb..a64ddd1ee9 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 = "r53" 46PR = "r54"
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...
@@ -81,6 +81,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
81 file://rpm-stub-out-git_strerror.patch \ 81 file://rpm-stub-out-git_strerror.patch \
82 file://rpm-db_buffer_small.patch \ 82 file://rpm-db_buffer_small.patch \
83 file://rpm-py-init.patch \ 83 file://rpm-py-init.patch \
84 file://python-rpm-rpmsense.patch \
84 " 85 "
85 86
86SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" 87SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768"