[hardknott] package_manager: ipk: Fix host manifest generation

Message ID 20220211095806.4360-1-ceggers@arri.de
State Accepted, archived
Commit 86cdad6283148232c69128870a4d27c6ac84663b
Headers show
Series [hardknott] package_manager: ipk: Fix host manifest generation | expand

Commit Message

Christian Eggers Feb. 11, 2022, 9:58 a.m. UTC
From: Oleksiy Obitotskyy <oobitots@cisco.com>

Since honister host manifest stopped to generate, i.e.
manifest file is empty but all ipks/files into sdk is
ok.

Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 79a2392f5d2a4cb6509a83afb40bca01bac59914)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 meta/lib/oe/sdk.py | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Alexander Kanavin Feb. 11, 2022, 10:22 a.m. UTC | #1
Looks like your mail system broke the indentation?

Alex

On Fri, 11 Feb 2022 at 10:58, Christian Eggers <ceggers@arri.de> wrote:

> From: Oleksiy Obitotskyy <oobitots@cisco.com>
>
> Since honister host manifest stopped to generate, i.e.
> manifest file is empty but all ipks/files into sdk is
> ok.
>
> Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit 79a2392f5d2a4cb6509a83afb40bca01bac59914)
> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
> ---
> meta/lib/oe/sdk.py | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py
> index 37b59afd1a99..27347667e846 100644
> --- a/meta/lib/oe/sdk.py
> +++ b/meta/lib/oe/sdk.py
> @@ -115,6 +115,10 @@ def sdk_list_installed_packages(d, target,
> rootfs_dir=None):
>
> rootfs_dir = [sdk_output, os.path.join(sdk_output, target_path)][target is
> True]
>
> + if target is False:
> + ipkgconf_sdk_target = d.getVar("IPKGCONF_SDK")
> + d.setVar("IPKGCONF_TARGET", ipkgconf_sdk_target)
> +
> img_type = d.getVar('IMAGE_PKGTYPE')
> import importlib
> cls = importlib.import_module('oe.package_manager.' + img_type)
> --
> 2.34.1
>
> _______________________________________________________​
> Christian
> Eggers
> Software Engineer
> ​
> ARRI
> Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
> Arriweg 17 ,
> 83071
> Stephanskirchen
>
>
> *www.arri.com * <http://www.arri.com/>
> *+49 8036 3009-3118* <+49%208036%203009-3118>
> *CEggers@arri.de* <CEggers@arri.de>
>
> ​
> [image: Orbiter Docking Ring]
> <https://www.arri.com/en/lighting/led/orbiter-accessories/orbiter-dockingring/>
> Get all the latest information from *www.arri.com* <http://www.arri.com/>
> , *Facebook* <https://www.facebook.com/TeamARRI>, *Twitter*
> <https://twitter.com/ARRIChannel>, *Instagram* <http://instagram.com/arri>
>  and *YouTube* <http://www.youtube.com/user/ARRIChannel>.
>
> Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
>
> Sitz: München ‑ Registergericht: Amtsgericht München ‑ Handelsregisternummer: HRA 57918
> Persönlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
>
> Sitz: München ‑ Registergericht: Amtsgericht München ‑ Handelsregisternummer: HRB 54477
>
> Geschäftsführer: Dr. Michael Neuhäuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
>
> ​
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#161638):
> https://lists.openembedded.org/g/openembedded-core/message/161638
> Mute This Topic: https://lists.openembedded.org/mt/89068016/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

Patch

diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py
index 37b59afd1a99..27347667e846 100644
--- a/meta/lib/oe/sdk.py
+++ b/meta/lib/oe/sdk.py
@@ -115,6 +115,10 @@  def sdk_list_installed_packages(d, target, rootfs_dir=None):
 
         rootfs_dir = [sdk_output, os.path.join(sdk_output, target_path)][target is True]
 
+    if target is False:
+        ipkgconf_sdk_target = d.getVar("IPKGCONF_SDK")
+        d.setVar("IPKGCONF_TARGET", ipkgconf_sdk_target)
+
     img_type = d.getVar('IMAGE_PKGTYPE')
     import importlib
     cls = importlib.import_module('oe.package_manager.' + img_type)