Patchwork systemd: Fix build with multilib

login
register
mail settings
Submitter Khem Raj
Date Sept. 6, 2013, 4:36 a.m.
Message ID <1378442169-15822-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/57535/
State New
Headers show

Comments

Khem Raj - Sept. 6, 2013, 4:36 a.m.
rpm macros should be independent of libdir
Fixes errors seen when multilib is turned on
it shows up since then libdir != usr/lib

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/systemd/systemd_206.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Ross Burton - Sept. 6, 2013, 9:10 a.m.
On 6 September 2013 05:36, Khem Raj <raj.khem@gmail.com> wrote:
> rpm macros should be independent of libdir
> Fixes errors seen when multilib is turned on
> it shows up since then libdir != usr/lib

I can't see a reason to package the rpm macros at all, it's not like
there'll be ever be used unless you are building RPMs from your own
spec files inside a Yocto image.

Ross
Khem Raj - Sept. 6, 2013, 4:51 p.m.
On Sep 6, 2013, at 2:10 AM, "Burton, Ross" <ross.burton@intel.com> wrote:

> On 6 September 2013 05:36, Khem Raj <raj.khem@gmail.com> wrote:
>> rpm macros should be independent of libdir
>> Fixes errors seen when multilib is turned on
>> it shows up since then libdir != usr/lib
> 
> I can't see a reason to package the rpm macros at all, it's not like
> there'll be ever be used unless you are building RPMs from your own
> spec files inside a Yocto image.

thats why its packaged into package of its own. Secondly Poky is one usecase of OE-Core
there are valid usecases of folks using on device SDKs and package management using other distributions driven
out of OE-Core

> 
> Ross

Patch

diff --git a/meta/recipes-core/systemd/systemd_206.bb b/meta/recipes-core/systemd/systemd_206.bb
index 75bdc61..120ab08 100644
--- a/meta/recipes-core/systemd/systemd_206.bb
+++ b/meta/recipes-core/systemd/systemd_206.bb
@@ -139,7 +139,7 @@  FILES_${PN}-kernel-install = "${bindir}/kernel-install \
                               ${sysconfdir}/kernel/ \
                               ${exec_prefix}/lib/kernel \
                              "
-FILES_${PN}-rpm-macros = "${libdir}/rpm \
+FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \
                          "
 
 RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts"