diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2013-08-09 17:51:29 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-13 23:06:01 +0100 |
| commit | bef0aabeabec03823bbe4e14381ea0f370745b9e (patch) | |
| tree | 3f8fb045c03e1bc1ca3968cb41f2b0ed851291db /meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch | |
| parent | 5bac0df20117984cb5c9a47c9934c29fa28e972f (diff) | |
| download | poky-bef0aabeabec03823bbe4e14381ea0f370745b9e.tar.gz | |
rpm: Change references from RPM_VENDOR_POKY to RPM_VENDOR_OE
Change the #define references to match RPM_VENDOR_OE.
(From OE-Core rev: a84ecc5ad158a7529a904785de25ebfedf5767a7)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch index d81e25ac4e..c4b4c03de8 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch | |||
| @@ -12,7 +12,7 @@ diff -urN rpm-5.4.0.orig/lib/order.c rpm-5.4.0/lib/order.c | |||
| 12 | rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS)) | 12 | rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS)) |
| 13 | ? RPMLOG_WARNING : RPMLOG_ERR; | 13 | ? RPMLOG_WARNING : RPMLOG_ERR; |
| 14 | -#if defined(RPM_VENDOR_MANDRIVA) /* loop-detection-optional-loglevel */ | 14 | -#if defined(RPM_VENDOR_MANDRIVA) /* loop-detection-optional-loglevel */ |
| 15 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_POKY) /* loop-detection-optional-loglevel */ | 15 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OE) /* loop-detection-optional-loglevel */ |
| 16 | // Report loops as debug-level message by default (7 = RPMLOG_DEBUG), overridable | 16 | // Report loops as debug-level message by default (7 = RPMLOG_DEBUG), overridable |
| 17 | msglvl = rpmExpandNumeric("%{?_loop_detection_loglevel}%{?!_loop_detection_loglevel:7}"); | 17 | msglvl = rpmExpandNumeric("%{?_loop_detection_loglevel}%{?!_loop_detection_loglevel:7}"); |
| 18 | #endif | 18 | #endif |