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-platform.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-platform.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-platform.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch index 9e167d82f3..172510cb9e 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch | |||
| @@ -14,7 +14,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c | |||
| 14 | } | 14 | } |
| 15 | 15 | ||
| 16 | -#if defined(RPM_VENDOR_WINDRIVER) | 16 | -#if defined(RPM_VENDOR_WINDRIVER) |
| 17 | +#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_POKY) | 17 | +#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_OE) |
| 18 | /* | 18 | /* |
| 19 | * If we're capable of installing multiple colors | 19 | * If we're capable of installing multiple colors |
| 20 | * but at least one of the packages are white (0), we | 20 | * but at least one of the packages are white (0), we |
| @@ -23,7 +23,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c | |||
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | -#if defined(RPM_VENDOR_WINDRIVER) | 25 | -#if defined(RPM_VENDOR_WINDRIVER) |
| 26 | +#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_POKY) | 26 | +#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_OE) |
| 27 | /* Is "compat" compatible w/ arch? */ | 27 | /* Is "compat" compatible w/ arch? */ |
| 28 | int _isCompatibleArch(const char * arch, const char * compat) | 28 | int _isCompatibleArch(const char * arch, const char * compat) |
| 29 | { | 29 | { |
| @@ -32,7 +32,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c | |||
| 32 | if (arch == NULL || (parch = rpmteA(p)) == NULL) | 32 | if (arch == NULL || (parch = rpmteA(p)) == NULL) |
| 33 | continue; | 33 | continue; |
| 34 | -#if defined(RPM_VENDOR_WINDRIVER) | 34 | -#if defined(RPM_VENDOR_WINDRIVER) |
| 35 | +#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_POKY) | 35 | +#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_OE) |
| 36 | /* XXX hackery for alias matching. */ | 36 | /* XXX hackery for alias matching. */ |
| 37 | if (!_isCompatibleArch(arch, parch)) | 37 | if (!_isCompatibleArch(arch, parch)) |
| 38 | continue; | 38 | continue; |
| @@ -40,7 +40,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c | |||
| 40 | return rc; | 40 | return rc; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | +#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) | 43 | +#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE) |
| 44 | +#define _ETC_RPM_SYSINFO "%{_etcrpm}/sysinfo" | 44 | +#define _ETC_RPM_SYSINFO "%{_etcrpm}/sysinfo" |
| 45 | +#else | 45 | +#else |
| 46 | +#define _ETC_RPM_SYSINFO SYSCONFIGDIR "/sysinfo" | 46 | +#define _ETC_RPM_SYSINFO SYSCONFIGDIR "/sysinfo" |