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/rpm/rpm | |
parent | 3d8fd40f9f339564d8b7c80e2f60cc4f49826def (diff) | |
download | 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/rpm/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch | 33 |
1 files changed, 33 insertions, 0 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 @@ | |||
1 | rpmmodule.c: Export a few additional RPMSENSE values | ||
2 | |||
3 | We want to see the RPMSENSE_SCRIPT values for use with SMART. We also | ||
4 | want to see the MISSINGOK value so we can avoid recommended packages causing | ||
5 | failures. | ||
6 | |||
7 | Upstream-status: Pending | ||
8 | |||
9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
10 | |||
11 | Index: 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); | ||