diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-platform2.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-platform2.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch index 6683d8fdbf..79124bb6c4 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch | |||
@@ -22,7 +22,7 @@ Index: rpm-5.4.9/lib/rpmrc.c | |||
22 | { | 22 | { |
23 | 23 | ||
24 | -#if defined(RPM_VENDOR_WINDRIVER) | 24 | -#if defined(RPM_VENDOR_WINDRIVER) |
25 | +#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) | 25 | +#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE) |
26 | addMacro(NULL, "_usrlibrpm", NULL, __usrlibrpm, RMIL_DEFAULT); | 26 | addMacro(NULL, "_usrlibrpm", NULL, __usrlibrpm, RMIL_DEFAULT); |
27 | addMacro(NULL, "_etcrpm", NULL, __etcrpm, RMIL_DEFAULT); | 27 | addMacro(NULL, "_etcrpm", NULL, __etcrpm, RMIL_DEFAULT); |
28 | addMacro(NULL, "_vendor", NULL, "%{?_host_vendor}%{!?_host_vendor:wrs}", RMIL_DEFAULT); | 28 | addMacro(NULL, "_vendor", NULL, "%{?_host_vendor}%{!?_host_vendor:wrs}", RMIL_DEFAULT); |
@@ -38,7 +38,7 @@ Index: rpm-5.4.9/lib/rpmrc.c | |||
38 | } | 38 | } |
39 | 39 | ||
40 | if (!parseCVOG(p, &cvog) && cvog != NULL) { | 40 | if (!parseCVOG(p, &cvog) && cvog != NULL) { |
41 | +#if defined(RPM_VENDOR_POKY) | 41 | +#if defined(RPM_VENDOR_OE) |
42 | + char * _gnu = NULL; | 42 | + char * _gnu = NULL; |
43 | + | 43 | + |
44 | + addMacro(NULL, "_platform_cpu", NULL, cvog->cpu, -1); | 44 | + addMacro(NULL, "_platform_cpu", NULL, cvog->cpu, -1); |
@@ -98,7 +98,7 @@ Index: rpm-5.4.9/python/rpmmodule.c | |||
98 | 98 | ||
99 | -#if defined(RPM_VENDOR_WINDRIVER) | 99 | -#if defined(RPM_VENDOR_WINDRIVER) |
100 | - platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_gnu}", NULL); | 100 | - platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_gnu}", NULL); |
101 | +#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) | 101 | +#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE) |
102 | + platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_host_gnu}%{!?_host_gnu:%{?_gnu}}", NULL); | 102 | + platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_host_gnu}%{!?_host_gnu:%{?_gnu}}", NULL); |
103 | #else | 103 | #else |
104 | platform = rpmExpand(arch, "-", "%{_vendor}", "-", "%{_os}", NULL); | 104 | platform = rpmExpand(arch, "-", "%{_vendor}", "-", "%{_os}", NULL); |