Patchwork [0/3] Image/SDK multilib fixes

login
mail settings
Submitter Mark Hatle
Date July 6, 2012, 7:13 p.m.
Message ID <cover.1341601764.git.mark.hatle@windriver.com>
Download mbox
Permalink /patch/31333/
State New
Headers show

Pull-request

git://git.pokylinux.org/poky-contrib mhatle/sdk

Comments

Mark Hatle - July 6, 2012, 7:13 p.m.
The image generation for RPM needs to be synced with the python fragement in
the populate_sdk case.  Otherwise the multilib configuations get out of sync.

Similar changes are NOT needed for deb or ipkg.

We also needed to enable multilib remapping when the populate_sdk_base is
loaded, otherwise we don't get matching package and sdk images.

Finally to avoid conflicts in the SDK generation, we compute the install 
solutions by adding --replacepkgs to the temporary database.  This does
not change the installed image behavior in any way.

The following changes since commit 8f16811a8d51982a8b3d70e6087aef4a41926840:

  bootimg: Use STAGING_KERNEL_DIR (2012-07-06 09:38:17 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib mhatle/sdk
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/sdk

Mark Hatle (3):
  populate_sdk_rpm: Sync multilib configuration with rootfs_rpm
  multilib: Enable multilib remapping for SDK generation
  package_rpm: Avoid duplicate package generation failures

 meta/classes/multilib.bbclass         |    6 ++++++
 meta/classes/package_rpm.bbclass      |   10 +++++-----
 meta/classes/populate_sdk_rpm.bbclass |   15 ++++++++++-----
 meta/classes/rootfs_rpm.bbclass       |    1 +
 4 files changed, 22 insertions(+), 10 deletions(-)
Saul Wold - July 9, 2012, 5:30 p.m.
On 07/06/2012 12:13 PM, Mark Hatle wrote:
> The image generation for RPM needs to be synced with the python fragement in
> the populate_sdk case.  Otherwise the multilib configuations get out of sync.
>
> Similar changes are NOT needed for deb or ipkg.
>
> We also needed to enable multilib remapping when the populate_sdk_base is
> loaded, otherwise we don't get matching package and sdk images.
>
> Finally to avoid conflicts in the SDK generation, we compute the install
> solutions by adding --replacepkgs to the temporary database.  This does
> not change the installed image behavior in any way.
>
> The following changes since commit 8f16811a8d51982a8b3d70e6087aef4a41926840:
>
>    bootimg: Use STAGING_KERNEL_DIR (2012-07-06 09:38:17 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib mhatle/sdk
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/sdk
>
> Mark Hatle (3):
>    populate_sdk_rpm: Sync multilib configuration with rootfs_rpm
>    multilib: Enable multilib remapping for SDK generation
>    package_rpm: Avoid duplicate package generation failures
>
>   meta/classes/multilib.bbclass         |    6 ++++++
>   meta/classes/package_rpm.bbclass      |   10 +++++-----
>   meta/classes/populate_sdk_rpm.bbclass |   15 ++++++++++-----
>   meta/classes/rootfs_rpm.bbclass       |    1 +
>   4 files changed, 22 insertions(+), 10 deletions(-)
>

Merged into OE-Core with the updated request

Thanks
	Sau!