diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2013-08-09 17:51:29 -0500 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2013-08-13 10:13:19 -0700 |
| commit | a84ecc5ad158a7529a904785de25ebfedf5767a7 (patch) | |
| tree | b41f33354732936b3f553e5017bf377b00692f4b /meta/recipes-devtools/rpm/rpm/rpm-platform2.patch | |
| parent | 0f589b9a38397fdf55025062a45889b19d1c83c4 (diff) | |
| download | openembedded-core-contrib-a84ecc5ad158a7529a904785de25ebfedf5767a7.tar.gz | |
rpm: Change references from RPM_VENDOR_POKY to RPM_VENDOR_OE
Change the #define references to match RPM_VENDOR_OE.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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 { -#if defined(RPM_VENDOR_WINDRIVER) -+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) ++#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE) addMacro(NULL, "_usrlibrpm", NULL, __usrlibrpm, RMIL_DEFAULT); addMacro(NULL, "_etcrpm", NULL, __etcrpm, RMIL_DEFAULT); addMacro(NULL, "_vendor", NULL, "%{?_host_vendor}%{!?_host_vendor:wrs}", RMIL_DEFAULT); @@ -38,7 +38,7 @@ Index: rpm-5.4.9/lib/rpmrc.c } if (!parseCVOG(p, &cvog) && cvog != NULL) { -+#if defined(RPM_VENDOR_POKY) ++#if defined(RPM_VENDOR_OE) + char * _gnu = NULL; + + addMacro(NULL, "_platform_cpu", NULL, cvog->cpu, -1); @@ -98,7 +98,7 @@ Index: rpm-5.4.9/python/rpmmodule.c -#if defined(RPM_VENDOR_WINDRIVER) - platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_gnu}", NULL); -+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) ++#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE) + platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_host_gnu}%{!?_host_gnu:%{?_gnu}}", NULL); #else platform = rpmExpand(arch, "-", "%{_vendor}", "-", "%{_os}", NULL); |