diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-10-31 14:42:03 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-18 16:42:02 +0000 |
| commit | 11af6b042cee91c52e13df6f76628fdacc5c692a (patch) | |
| tree | 8450579b61a2760efa8b3eee21a9de76c20d87c2 /meta/recipes-devtools | |
| parent | 3d8fd40f9f339564d8b7c80e2f60cc4f49826def (diff) | |
| download | ast2050-yocto-poky-11af6b042cee91c52e13df6f76628fdacc5c692a.zip ast2050-yocto-poky-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')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 3 |
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 0000000..61f1e0c --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch @@ -0,0 +1,33 @@ +rpmmodule.c: Export a few additional RPMSENSE values + +We want to see the RPMSENSE_SCRIPT values for use with SMART. We also +want to see the MISSINGOK value so we can avoid recommended packages causing +failures. + +Upstream-status: Pending + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: rpm-5.4.9/python/rpmmodule.c +=================================================================== +--- rpm-5.4.9.orig/python/rpmmodule.c ++++ rpm-5.4.9/python/rpmmodule.c +@@ -494,12 +494,16 @@ void init_rpm(void) + REGISTER_ENUM(RPMSENSE_EQUAL); + REGISTER_ENUM(RPMSENSE_NOTEQUAL); + REGISTER_ENUM(RPMSENSE_FIND_REQUIRES); +-#if defined(RPM_VENDOR_MANDRIVA) ++#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) + REGISTER_ENUM(RPMSENSE_PREREQ); + REGISTER_ENUM(RPMSENSE_SCRIPT_PRE); + REGISTER_ENUM(RPMSENSE_SCRIPT_POST); + REGISTER_ENUM(RPMSENSE_SCRIPT_PREUN); +- REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN) ++ REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN); ++#endif ++ ++#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) ++ REGISTER_ENUM(RPMSENSE_MISSINGOK); + #endif + + 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 44f1ca1..a64ddd1 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" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" -PR = "r53" +PR = "r54" # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed # 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 file://rpm-stub-out-git_strerror.patch \ file://rpm-db_buffer_small.patch \ file://rpm-py-init.patch \ + file://python-rpm-rpmsense.patch \ " SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" |
