summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-platform.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-platform.patch8
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"