disable allarch when multilib is used

From: Kai Kang <[email protected]>

Some allarch packages rdepends non-allarch packages. when multilib is used, it doesn't expand the dependency chain correctly, e.g.

core-image-sato -> ca-certificates(allarch) -> openssl

we expect dependency chain for lib32-core-image-sato:

lib32-core-image-sato -> ca-certificates(allarch) -> lib32-openssl

it should install lib32-openssl for ca-certificates but openssl is still wrongly required.

Only enable allarch when multilib is not used to fix the issue.

Signed-off-by kai kang <[email protected]>

---
 meta/classes/allarch.bbclass         | 12 +++++++++++-
 meta/classes/icecc.bbclass           |  2 +-
 meta/classes/multilib.bbclass        |  3 ++-
 meta/classes/multilib_global.bbclass |  4 +---
 meta/classes/package.bbclass         |  9 ++++++---
 5 files changed, 21 insertions(+), 9 deletions(-)

meta/classes/allarch.bbclass +1 -1

index 1eebe0bf2e..45f62a5939 100644
@@ -2,7 +2,17 @@
 # This class is used for architecture independent recipes/data files (usually scripts)
 #
 
-PACKAGE_ARCH = "all"
+python allarch_package_arch_handler () {

meta/classes/allarch.bbclass +0 -0

 python () {
     # Allow this class to be included but overridden - only set

meta/classes/icecc.bbclass +1 -1

index 0ca8de86c2..b5a8457747 100644
@@ -171,7 +171,7 @@ def use_icecc(bb,d):
     return "yes"
 
 def icecc_is_allarch(bb, d):
-    return d.getVar("PACKAGE_ARCH") == "all" or bb.data.inherits_class('allarch', d)
+    return d.getVar("PACKAGE_ARCH") == "all"
 
 def icecc_is_kernel(bb, d):
     return \

meta/classes/multilib.bbclass +2 -1

index f2ac8bdfef..7b4d6472b0 100644
@@ -50,7 +50,8 @@ python multilib_virtclass_handler () {
     if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
         raise bb.parse.SkipRecipe("We can't extend nativesdk recipes")
 
-    if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
+    if bb.data.inherits_class('allarch', e.data) and not d.getVar('MULTILIB_VARIANTS') \
+        and not bb.data.inherits_class('packagegroup', e.data):
         raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups")
 
     # Expand this since this won't work correctly once we set a multilib into place

meta/classes/multilib_global.bbclass +1 -3

index d2ec1adfea..1bb62427b0 100644
@@ -165,9 +165,7 @@ python multilib_virtclass_handler_global () {
         return
 
     if bb.data.inherits_class('kernel', e.data) or \
-            bb.data.inherits_class('module-base', e.data) or \
-            (bb.data.inherits_class('allarch', e.data) and\
-             not bb.data.inherits_class('packagegroup', e.data)):
+            bb.data.inherits_class('module-base', e.data):
             variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split()
 
             import oe.classextend

meta/classes/package.bbclass +6 -3

index 0b6f65a855..d1e9138c66 100644
@@ -494,7 +494,8 @@ def get_package_mapping (pkg, basepkg, d):
 
     if key in data:
         # Have to avoid undoing the write_extra_pkgs(global_variants...)
-        if bb.data.inherits_class('allarch', d) and data[key] == basepkg:
+        if bb.data.inherits_class('allarch', d) and not d.getVar('MULTILIB_VARIANTS') \
+            and data[key] == basepkg:
             return pkg
         return data[key]
 

@@ -1413,7 +1414,8 @@ fi
     if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
         write_extra_pkgs(variants, pn, packages, pkgdatadir)
 
-    if (bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d)):
+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
         write_extra_pkgs(global_variants, pn, packages, pkgdatadir)
 
     workdir = d.getVar('WORKDIR')

@@ -1502,7 +1504,8 @@ fi
     if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
         write_extra_runtime_pkgs(variants, packages, pkgdatadir)
 
-    if bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d):
+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
         write_extra_runtime_pkgs(global_variants, packages, pkgdatadir)
 
 }

Signature · 7 lines

2.18.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Quoted 35 lines · On Thu, Sep 06, 2018 at 11:52:24PM +0800, [email protected] wrote:

From: Kai Kang <[email protected]>

Some allarch packages rdepends non-allarch packages. when multilib is used, it doesn't expand the dependency chain correctly, e.g.

core-image-sato -> ca-certificates(allarch) -> openssl

we expect dependency chain for lib32-core-image-sato:

lib32-core-image-sato -> ca-certificates(allarch) -> lib32-openssl

it should install lib32-openssl for ca-certificates but openssl is still wrongly required.

Only enable allarch when multilib is not used to fix the issue.

Signed-off-by kai kang <[email protected]>

---
 meta/classes/allarch.bbclass         | 12 +++++++++++-
 meta/classes/icecc.bbclass           |  2 +-
 meta/classes/multilib.bbclass        |  3 ++-
 meta/classes/multilib_global.bbclass |  4 +---
 meta/classes/package.bbclass         |  9 ++++++---
 5 files changed, 21 insertions(+), 9 deletions(-)

meta/classes/allarch.bbclass +1 -1

index 1eebe0bf2e..45f62a5939 100644
@@ -2,7 +2,17 @@
 # This class is used for architecture independent recipes/data files (usually scripts)
 #
 
-PACKAGE_ARCH = "all"
+python allarch_package_arch_handler () {

meta/classes/allarch.bbclass line 15

Quoted 10 lines

meta/classes/allarch.bbclass +10 -0

+    if bb.data.inherits_class("nativesdk", d) or bb.data.inherits_class("crosssdk", d):
+        return
+
+    variants = d.getVar("MULTILIB_VARIANTS")
+    if not variants:
+        d.setVar("PACKAGE_ARCH", "all" )
+}
+
+addhandler allarch_package_arch_handler
+allarch_package_arch_handler[eventmask] = "bb.event.RecipePreFinalise"

Maybe I'm overlooking something, but doesn't this overwrite whatever PACKAGE_ARCH as set before this?

I have some recipes where the PACKAGE_ARCH is set to MACHINE_ARCH through another bbclass, but then overwritten with "all" by allarch_package_arch_handler:

# $PACKAGE_ARCH [5 operations]
# set oe-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set meta-lg-webos/meta-webos/conf/distro/include/webos.inc:241
# "${MACHINE_ARCH}"
# set oe-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set meta-lg-webos/meta-webos/classes/webos_machine_impl_dep.bbclass:11
# "${MACHINE_ARCH}"
# set allarch.bbclass:12 [allarch_package_arch_handler]
# "all"

# pre-expansion value:
#   "all"
PACKAGE_ARCH="all"

But surprisingly if I do the same with e.g. packagegroup-core-boot in oe-core I get:

# $PACKAGE_ARCH [4 operations]
# set /OE/build/oe-core/openembedded-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set /OE/build/oe-core/openembedded-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set /OE/build/oe-core/openembedded-core/meta/recipes-core/packagegroups/packagegroup-core-boot.bb:9
# "${MACHINE_ARCH}"
# set? /OE/build/oe-core/openembedded-core/meta/classes/packagegroup.bbclass:12
# "all"

# pre-expansion value:
#   "${MACHINE_ARCH}"
PACKAGE_ARCH="qemux86_64"

Why isn't allarch_package_arch_handler executed in the 2nd case?

Quoted 86 lines

meta/classes/allarch.bbclass +0 -0

 python () {
     # Allow this class to be included but overridden - only set

meta/classes/icecc.bbclass +1 -1

index 0ca8de86c2..b5a8457747 100644
@@ -171,7 +171,7 @@ def use_icecc(bb,d):
     return "yes"
 
 def icecc_is_allarch(bb, d):
-    return d.getVar("PACKAGE_ARCH") == "all" or bb.data.inherits_class('allarch', d)
+    return d.getVar("PACKAGE_ARCH") == "all"
 
 def icecc_is_kernel(bb, d):
     return \

meta/classes/multilib.bbclass +2 -1

index f2ac8bdfef..7b4d6472b0 100644
@@ -50,7 +50,8 @@ python multilib_virtclass_handler () {
     if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
         raise bb.parse.SkipRecipe("We can't extend nativesdk recipes")
 
-    if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
+    if bb.data.inherits_class('allarch', e.data) and not d.getVar('MULTILIB_VARIANTS') \
+        and not bb.data.inherits_class('packagegroup', e.data):
         raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups")
 
     # Expand this since this won't work correctly once we set a multilib into place

meta/classes/multilib_global.bbclass +1 -3

index d2ec1adfea..1bb62427b0 100644
@@ -165,9 +165,7 @@ python multilib_virtclass_handler_global () {
         return
 
     if bb.data.inherits_class('kernel', e.data) or \
-            bb.data.inherits_class('module-base', e.data) or \
-            (bb.data.inherits_class('allarch', e.data) and\
-             not bb.data.inherits_class('packagegroup', e.data)):
+            bb.data.inherits_class('module-base', e.data):
             variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split()
 
             import oe.classextend

meta/classes/package.bbclass +6 -3

index 0b6f65a855..d1e9138c66 100644
@@ -494,7 +494,8 @@ def get_package_mapping (pkg, basepkg, d):
 
     if key in data:
         # Have to avoid undoing the write_extra_pkgs(global_variants...)
-        if bb.data.inherits_class('allarch', d) and data[key] == basepkg:
+        if bb.data.inherits_class('allarch', d) and not d.getVar('MULTILIB_VARIANTS') \
+            and data[key] == basepkg:
             return pkg
         return data[key]
 

@@ -1413,7 +1414,8 @@ fi
     if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
         write_extra_pkgs(variants, pn, packages, pkgdatadir)
 
-    if (bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d)):
+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
         write_extra_pkgs(global_variants, pn, packages, pkgdatadir)
 
     workdir = d.getVar('WORKDIR')

@@ -1502,7 +1504,8 @@ fi
     if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
         write_extra_runtime_pkgs(variants, packages, pkgdatadir)
 
-    if bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d):
+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
         write_extra_runtime_pkgs(global_variants, packages, pkgdatadir)
 
 }

Signature · 7 lines

2.18.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Quoted 79 lines · Martin Jansa

Quoted 35 lines · On Thu, Sep 06, 2018 at 11:52:24PM +0800, [email protected] wrote:

From: Kai Kang <[email protected]>

Some allarch packages rdepends non-allarch packages. when multilib is used, it doesn't expand the dependency chain correctly, e.g.

core-image-sato -> ca-certificates(allarch) -> openssl

we expect dependency chain for lib32-core-image-sato:

lib32-core-image-sato -> ca-certificates(allarch) -> lib32-openssl

it should install lib32-openssl for ca-certificates but openssl is still wrongly required.

Only enable allarch when multilib is not used to fix the issue.

Signed-off-by kai kang <[email protected]>

---
 meta/classes/allarch.bbclass         | 12 +++++++++++-
 meta/classes/icecc.bbclass           |  2 +-
 meta/classes/multilib.bbclass        |  3 ++-
 meta/classes/multilib_global.bbclass |  4 +---
 meta/classes/package.bbclass         |  9 ++++++---
 5 files changed, 21 insertions(+), 9 deletions(-)

meta/classes/allarch.bbclass +1 -1

index 1eebe0bf2e..45f62a5939 100644
@@ -2,7 +2,17 @@
 # This class is used for architecture independent recipes/data files (usually scripts)
 #
 
-PACKAGE_ARCH = "all"
+python allarch_package_arch_handler () {

meta/classes/allarch.bbclass line 15

Quoted 10 lines

meta/classes/allarch.bbclass +10 -0

+    if bb.data.inherits_class("nativesdk", d) or bb.data.inherits_class("crosssdk", d):
+        return
+
+    variants = d.getVar("MULTILIB_VARIANTS")
+    if not variants:
+        d.setVar("PACKAGE_ARCH", "all" )
+}
+
+addhandler allarch_package_arch_handler
+allarch_package_arch_handler[eventmask] = "bb.event.RecipePreFinalise"

Maybe I'm overlooking something, but doesn't this overwrite whatever PACKAGE_ARCH as set before this?

I have some recipes where the PACKAGE_ARCH is set to MACHINE_ARCH through another bbclass, but then overwritten with "all" by allarch_package_arch_handler:

# $PACKAGE_ARCH [5 operations]
# set oe-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set meta-lg-webos/meta-webos/conf/distro/include/webos.inc:241
# "${MACHINE_ARCH}"
# set oe-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set meta-lg-webos/meta-webos/classes/webos_machine_impl_dep.bbclass:11
# "${MACHINE_ARCH}"
# set allarch.bbclass:12 [allarch_package_arch_handler]
# "all"

# pre-expansion value:
#   "all"
PACKAGE_ARCH="all"

But surprisingly if I do the same with e.g. packagegroup-core-boot in oe-core I get:

# $PACKAGE_ARCH [4 operations]
# set /OE/build/oe-core/openembedded-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set /OE/build/oe-core/openembedded-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set /OE/build/oe-core/openembedded-core/meta/recipes-core/packagegroups/packagegroup-core-boot.bb:9
# "${MACHINE_ARCH}"
# set? /OE/build/oe-core/openembedded-core/meta/classes/packagegroup.bbclass:12
# "all"

Quoted 5 lines

# pre-expansion value:
#   "${MACHINE_ARCH}"
PACKAGE_ARCH="qemux86_64"

Why isn't allarch_package_arch_handler executed in the 2nd case?

Now I see the difference, I was still living in the days when "disabling" allarch was possible just by setting PACKAGE_ARCH before inheritting allarch, but now I see that packagegroups do conditional inherit as well since:
http://git.openembedded.org/openembedded-core/commit/?id=9c826962ec8fa45c2b035427442b90a41517144e
http://git.openembedded.org/openembedded-core/commit/?id=2c9b1d304daade7b0907320aeb9c522e7ab9dcab
so I'll modify currently failing recipes to do the same and stop inheritting allarch when PACKAGE_ARCH is set to something else.

Cheers,

Quoted 89 lines

Quoted 86 lines

meta/classes/allarch.bbclass +0 -0

 python () {
     # Allow this class to be included but overridden - only set

meta/classes/icecc.bbclass +1 -1

index 0ca8de86c2..b5a8457747 100644
@@ -171,7 +171,7 @@ def use_icecc(bb,d):
     return "yes"
 
 def icecc_is_allarch(bb, d):
-    return d.getVar("PACKAGE_ARCH") == "all" or bb.data.inherits_class('allarch', d)
+    return d.getVar("PACKAGE_ARCH") == "all"
 
 def icecc_is_kernel(bb, d):
     return \

meta/classes/multilib.bbclass +2 -1

index f2ac8bdfef..7b4d6472b0 100644
@@ -50,7 +50,8 @@ python multilib_virtclass_handler () {
     if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
         raise bb.parse.SkipRecipe("We can't extend nativesdk recipes")
 
-    if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
+    if bb.data.inherits_class('allarch', e.data) and not d.getVar('MULTILIB_VARIANTS') \
+        and not bb.data.inherits_class('packagegroup', e.data):
         raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups")
 
     # Expand this since this won't work correctly once we set a multilib into place

meta/classes/multilib_global.bbclass +1 -3

index d2ec1adfea..1bb62427b0 100644
@@ -165,9 +165,7 @@ python multilib_virtclass_handler_global () {
         return
 
     if bb.data.inherits_class('kernel', e.data) or \
-            bb.data.inherits_class('module-base', e.data) or \
-            (bb.data.inherits_class('allarch', e.data) and\
-             not bb.data.inherits_class('packagegroup', e.data)):
+            bb.data.inherits_class('module-base', e.data):
             variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split()
 
             import oe.classextend

meta/classes/package.bbclass +6 -3

index 0b6f65a855..d1e9138c66 100644
@@ -494,7 +494,8 @@ def get_package_mapping (pkg, basepkg, d):
 
     if key in data:
         # Have to avoid undoing the write_extra_pkgs(global_variants...)
-        if bb.data.inherits_class('allarch', d) and data[key] == basepkg:
+        if bb.data.inherits_class('allarch', d) and not d.getVar('MULTILIB_VARIANTS') \
+            and data[key] == basepkg:
             return pkg
         return data[key]
 

@@ -1413,7 +1414,8 @@ fi
     if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
         write_extra_pkgs(variants, pn, packages, pkgdatadir)
 
-    if (bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d)):
+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
         write_extra_pkgs(global_variants, pn, packages, pkgdatadir)
 
     workdir = d.getVar('WORKDIR')

@@ -1502,7 +1504,8 @@ fi
     if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
         write_extra_runtime_pkgs(variants, packages, pkgdatadir)
 
-    if bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d):
+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
         write_extra_runtime_pkgs(global_variants, packages, pkgdatadir)
 
 }

Signature · 7 lines

2.18.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Quoted 86 lines · Martin Jansa

Quoted 79 lines · Martin Jansa

Quoted 35 lines · On Thu, Sep 06, 2018 at 11:52:24PM +0800, [email protected] wrote:

From: Kai Kang <[email protected]>

Some allarch packages rdepends non-allarch packages. when multilib is used, it doesn't expand the dependency chain correctly, e.g.

core-image-sato -> ca-certificates(allarch) -> openssl

we expect dependency chain for lib32-core-image-sato:

lib32-core-image-sato -> ca-certificates(allarch) -> lib32-openssl

it should install lib32-openssl for ca-certificates but openssl is still wrongly required.

Only enable allarch when multilib is not used to fix the issue.

Signed-off-by kai kang <[email protected]>

---
 meta/classes/allarch.bbclass         | 12 +++++++++++-
 meta/classes/icecc.bbclass           |  2 +-
 meta/classes/multilib.bbclass        |  3 ++-
 meta/classes/multilib_global.bbclass |  4 +---
 meta/classes/package.bbclass         |  9 ++++++---
 5 files changed, 21 insertions(+), 9 deletions(-)

meta/classes/allarch.bbclass +1 -1

index 1eebe0bf2e..45f62a5939 100644
@@ -2,7 +2,17 @@
 # This class is used for architecture independent recipes/data files (usually scripts)
 #
 
-PACKAGE_ARCH = "all"
+python allarch_package_arch_handler () {

meta/classes/allarch.bbclass line 15

Quoted 10 lines

meta/classes/allarch.bbclass +10 -0

+    if bb.data.inherits_class("nativesdk", d) or bb.data.inherits_class("crosssdk", d):
+        return
+
+    variants = d.getVar("MULTILIB_VARIANTS")
+    if not variants:
+        d.setVar("PACKAGE_ARCH", "all" )
+}
+
+addhandler allarch_package_arch_handler
+allarch_package_arch_handler[eventmask] = "bb.event.RecipePreFinalise"

Maybe I'm overlooking something, but doesn't this overwrite whatever PACKAGE_ARCH as set before this?

I have some recipes where the PACKAGE_ARCH is set to MACHINE_ARCH through another bbclass, but then overwritten with "all" by allarch_package_arch_handler:

# $PACKAGE_ARCH [5 operations]
# set oe-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set meta-lg-webos/meta-webos/conf/distro/include/webos.inc:241
# "${MACHINE_ARCH}"
# set oe-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set meta-lg-webos/meta-webos/classes/webos_machine_impl_dep.bbclass:11
# "${MACHINE_ARCH}"
# set allarch.bbclass:12 [allarch_package_arch_handler]
# "all"

# pre-expansion value:
#   "all"
PACKAGE_ARCH="all"

But surprisingly if I do the same with e.g. packagegroup-core-boot in oe-core I get:

# $PACKAGE_ARCH [4 operations]
# set /OE/build/oe-core/openembedded-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set /OE/build/oe-core/openembedded-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set /OE/build/oe-core/openembedded-core/meta/recipes-core/packagegroups/packagegroup-core-boot.bb:9
# "${MACHINE_ARCH}"
# set? /OE/build/oe-core/openembedded-core/meta/classes/packagegroup.bbclass:12
# "all"

Quoted 5 lines

# pre-expansion value:
#   "${MACHINE_ARCH}"
PACKAGE_ARCH="qemux86_64"

Why isn't allarch_package_arch_handler executed in the 2nd case?

Quoted 8 lines

Now I see the difference, I was still living in the days when "disabling" allarch was possible just by setting PACKAGE_ARCH before inheritting allarch, but now I see that packagegroups do conditional inherit as well since:
http://git.openembedded.org/openembedded-core/commit/?id=9c826962ec8fa45c2b035427442b90a41517144e
http://git.openembedded.org/openembedded-core/commit/?id=2c9b1d304daade7b0907320aeb9c522e7ab9dcab
so I'll modify currently failing recipes to do the same and stop inheritting allarch when PACKAGE_ARCH is set to something else.

From public layers I've found with test-signatures script only fbset-nodes recipe in meta-oe which was setting PACKAGE_ARCH after allarch inherit, allarch removal sent here:
http://lists.openembedded.org/pipermail/openembedded-devel/2018-September/120560.html

Quoted 98 lines

Cheers,

Quoted 89 lines

Quoted 86 lines

meta/classes/allarch.bbclass +0 -0

 python () {
     # Allow this class to be included but overridden - only set

meta/classes/icecc.bbclass +1 -1

index 0ca8de86c2..b5a8457747 100644
@@ -171,7 +171,7 @@ def use_icecc(bb,d):
     return "yes"
 
 def icecc_is_allarch(bb, d):
-    return d.getVar("PACKAGE_ARCH") == "all" or bb.data.inherits_class('allarch', d)
+    return d.getVar("PACKAGE_ARCH") == "all"
 
 def icecc_is_kernel(bb, d):
     return \

meta/classes/multilib.bbclass +2 -1

index f2ac8bdfef..7b4d6472b0 100644
@@ -50,7 +50,8 @@ python multilib_virtclass_handler () {
     if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
         raise bb.parse.SkipRecipe("We can't extend nativesdk recipes")
 
-    if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
+    if bb.data.inherits_class('allarch', e.data) and not d.getVar('MULTILIB_VARIANTS') \
+        and not bb.data.inherits_class('packagegroup', e.data):
         raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups")
 
     # Expand this since this won't work correctly once we set a multilib into place

meta/classes/multilib_global.bbclass +1 -3

index d2ec1adfea..1bb62427b0 100644
@@ -165,9 +165,7 @@ python multilib_virtclass_handler_global () {
         return
 
     if bb.data.inherits_class('kernel', e.data) or \
-            bb.data.inherits_class('module-base', e.data) or \
-            (bb.data.inherits_class('allarch', e.data) and\
-             not bb.data.inherits_class('packagegroup', e.data)):
+            bb.data.inherits_class('module-base', e.data):
             variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split()
 
             import oe.classextend

meta/classes/package.bbclass +6 -3

index 0b6f65a855..d1e9138c66 100644
@@ -494,7 +494,8 @@ def get_package_mapping (pkg, basepkg, d):
 
     if key in data:
         # Have to avoid undoing the write_extra_pkgs(global_variants...)
-        if bb.data.inherits_class('allarch', d) and data[key] == basepkg:
+        if bb.data.inherits_class('allarch', d) and not d.getVar('MULTILIB_VARIANTS') \
+            and data[key] == basepkg:
             return pkg
         return data[key]
 

@@ -1413,7 +1414,8 @@ fi
     if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
         write_extra_pkgs(variants, pn, packages, pkgdatadir)
 
-    if (bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d)):
+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
         write_extra_pkgs(global_variants, pn, packages, pkgdatadir)
 
     workdir = d.getVar('WORKDIR')

@@ -1502,7 +1504,8 @@ fi
     if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
         write_extra_runtime_pkgs(variants, packages, pkgdatadir)
 
-    if bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d):
+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
         write_extra_runtime_pkgs(global_variants, packages, pkgdatadir)
 
 }

Signature · 7 lines

2.18.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Quoted 93 lines · Martin Jansa

Quoted 84 lines · Martin Jansa

Quoted 78 lines · Martin Jansa

Quoted 35 lines · On Thu, Sep 06, 2018 at 11:52:24PM +0800, [email protected] wrote:

From: Kai Kang <[email protected]>

Some allarch packages rdepends non-allarch packages. when multilib is used, it doesn't expand the dependency chain correctly, e.g.

core-image-sato -> ca-certificates(allarch) -> openssl

we expect dependency chain for lib32-core-image-sato:

lib32-core-image-sato -> ca-certificates(allarch) -> lib32-openssl

it should install lib32-openssl for ca-certificates but openssl is still wrongly required.

Only enable allarch when multilib is not used to fix the issue.

Signed-off-by kai kang <[email protected]>

---
  meta/classes/allarch.bbclass         | 12 +++++++++++-
  meta/classes/icecc.bbclass           |  2 +-
  meta/classes/multilib.bbclass        |  3 ++-
  meta/classes/multilib_global.bbclass |  4 +---
  meta/classes/package.bbclass         |  9 ++++++---
  5 files changed, 21 insertions(+), 9 deletions(-)

meta/classes/allarch.bbclass +1 -1

index 1eebe0bf2e..45f62a5939 100644
@@ -2,7 +2,17 @@
  # This class is used for architecture independent recipes/data files (usually scripts)
  #
 
-PACKAGE_ARCH = "all"
+python allarch_package_arch_handler () {

meta/classes/allarch.bbclass line 15

Quoted 10 lines

meta/classes/allarch.bbclass +10 -0

+    if bb.data.inherits_class("nativesdk", d) or bb.data.inherits_class("crosssdk", d):
+        return
+
+    variants = d.getVar("MULTILIB_VARIANTS")
+    if not variants:
+        d.setVar("PACKAGE_ARCH", "all" )
+}
+
+addhandler allarch_package_arch_handler
+allarch_package_arch_handler[eventmask] = "bb.event.RecipePreFinalise"

Maybe I'm overlooking something, but doesn't this overwrite whatever PACKAGE_ARCH as set before this?

I have some recipes where the PACKAGE_ARCH is set to MACHINE_ARCH through another bbclass, but then overwritten with "all" by allarch_package_arch_handler:

# $PACKAGE_ARCH [5 operations]
# set oe-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set meta-lg-webos/meta-webos/conf/distro/include/webos.inc:241
# "${MACHINE_ARCH}"
# set oe-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set meta-lg-webos/meta-webos/classes/webos_machine_impl_dep.bbclass:11
# "${MACHINE_ARCH}"
# set allarch.bbclass:12 [allarch_package_arch_handler]
# "all"

# pre-expansion value:
#   "all"
PACKAGE_ARCH="all"

But surprisingly if I do the same with e.g. packagegroup-core-boot in oe-core I get:

# $PACKAGE_ARCH [4 operations]
# set /OE/build/oe-core/openembedded-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set /OE/build/oe-core/openembedded-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set /OE/build/oe-core/openembedded-core/meta/recipes-core/packagegroups/packagegroup-core-boot.bb:9
# "${MACHINE_ARCH}"
# set? /OE/build/oe-core/openembedded-core/meta/classes/packagegroup.bbclass:12
# "all"

Quoted 5 lines

# pre-expansion value:
#   "${MACHINE_ARCH}"
PACKAGE_ARCH="qemux86_64"

Why isn't allarch_package_arch_handler executed in the 2nd case?

Quoted 8 lines

Now I see the difference, I was still living in the days when "disabling" allarch was possible just by setting PACKAGE_ARCH before inheritting allarch, but now I see that packagegroups do conditional inherit as well since:
http://git.openembedded.org/openembedded-core/commit/?id=9c826962ec8fa45c2b035427442b90a41517144e
http://git.openembedded.org/openembedded-core/commit/?id=2c9b1d304daade7b0907320aeb9c522e7ab9dcab
so I'll modify currently failing recipes to do the same and stop inheritting allarch when PACKAGE_ARCH is set to something else.

Quoted 4 lines

From public layers I've found with test-signatures script only
fbset-nodes recipe in meta-oe which was setting PACKAGE_ARCH after allarch inherit, allarch removal sent here:
http://lists.openembedded.org/pipermail/openembedded-devel/2018-September/120560.html

target-sdk-provides-dummy seems to be affected as well:
=== Comparing signatures for task do_populate_sysroot.sigdata between qemux86 and qemux86copy ===
ERROR: lib32-target-sdk-provides-dummy different signature for task do_populate_sysroot.sigdata between qemux86 and qemux86copy basehash changed from b0a44b2c7003b6b4aa3a023d9cb9fe82 to 3a59fa25ddb6a95aff079d477ebf3457
Variable SSTATE_MANMACH value changed from 'qemux86' to 'qemux86copy'

ERROR: target-sdk-provides-dummy different signature for task do_populate_sysroot.sigdata between qemux86 and qemux86copy basehash changed from 9e44f1deb3d15886ee96db1a3332764c to 6b417d08a5113c9b06d13b3681f5ab4f
Variable SSTATE_MANMACH value changed from 'qemux86' to 'qemux86copy'

It's using:
inherit allarch

python() {
# Put the package somewhere separate to ensure it's never used except # when we want it
# (note that we have to do this in anonymous python here to avoid # allarch.bbclass disabling itself) d.setVar('PACKAGE_ARCH', '${DUMMYARCH}')
}

and DUMMYARCH = "sdk-provides-dummy-target"

The difference as shown with bitbake -e before and after reverting this commit:

before revert:
# $SSTATE_MANMACH [2 operations]
# set? oe-core/meta/classes/sstate.bbclass:61
# "${SSTATE_PKGARCH}"
# set sstate.bbclass:100 [__anon_111_oe_core_meta_classes_sstate_bbclass]
# "machineName"

# pre-expansion value:
#   "machineName"
SSTATE_MANMACH="machineName"

# $SSTATE_PKGARCH
# set oe-core/meta/classes/sstate.bbclass:11
# "${PACKAGE_ARCH}"
SSTATE_PKGARCH="sdk-provides-dummy-target"

# $PACKAGE_ARCH [3 operations]
# set oe-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set oe-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set dummy-sdk-package.inc:12 [__anon_12_oe_core_meta_recipes_core_meta_dummy_sdk_package_inc]
# "${DUMMYARCH}"

# pre-expansion value:
#   "${DUMMYARCH}"
PACKAGE_ARCH="sdk-provides-dummy-target"

after revert:
# $SSTATE_MANMACH
# set? oe-core/meta/classes/sstate.bbclass:61
# "${SSTATE_PKGARCH}"
SSTATE_MANMACH="allarch"

# $SSTATE_PKGARCH [2 operations]
# set oe-core/meta/classes/sstate.bbclass:11
# "${PACKAGE_ARCH}"
# set sstate.bbclass:98 [__anon_111__oe_core_meta_classes_sstate_bbclass]
# "allarch"

# pre-expansion value:
#   "allarch"
SSTATE_PKGARCH="allarch"

# $PACKAGE_ARCH [4 operations]
# set oe-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set oe-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set oe-core/meta/classes/allarch.bbclass:5
# "all"
# set dummy-sdk-package.inc:12 [__anon_12_oe_core_meta_recipes_core_meta_dummy_sdk_package_inc]
# "${DUMMYARCH}"

# pre-expansion value:
#   "${DUMMYARCH}"
PACKAGE_ARCH="sdk-provides-dummy-target"

the relevant part of the anonymous python in sstate.bbclass:

     elif bb.data.inherits_class('allarch', d) and d.getVar("PACKAGE_ARCH") == "all":
         d.setVar('SSTATE_PKGARCH', "allarch")
     else:
         d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))

So with your change, the PACKAGE_ARCH isn't set to "all" because multilib is enabled, but that causes sstate.bbclass to set SSTATE_MANMACH to MACHINE instead of SSTATE_PKGARCH allarch, where it got MACHINE is still a bit of mystery to me.

Cheers,

Quoted 98 lines

Quoted 94 lines

Cheers,

Quoted 88 lines

Quoted 86 lines

meta/classes/allarch.bbclass +0 -0

  python () {
      # Allow this class to be included but overridden - only set

meta/classes/icecc.bbclass +1 -1

index 0ca8de86c2..b5a8457747 100644
@@ -171,7 +171,7 @@ def use_icecc(bb,d):
      return "yes"
 
  def icecc_is_allarch(bb, d):
-    return d.getVar("PACKAGE_ARCH") == "all" or bb.data.inherits_class('allarch', d)
+    return d.getVar("PACKAGE_ARCH") == "all"
 
  def icecc_is_kernel(bb, d):
      return \

meta/classes/multilib.bbclass +2 -1

index f2ac8bdfef..7b4d6472b0 100644
@@ -50,7 +50,8 @@ python multilib_virtclass_handler () {
      if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
          raise bb.parse.SkipRecipe("We can't extend nativesdk recipes")
 
-    if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
+    if bb.data.inherits_class('allarch', e.data) and not d.getVar('MULTILIB_VARIANTS') \
+        and not bb.data.inherits_class('packagegroup', e.data):
          raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups")
 
      # Expand this since this won't work correctly once we set a multilib into place

meta/classes/multilib_global.bbclass +1 -3

index d2ec1adfea..1bb62427b0 100644
@@ -165,9 +165,7 @@ python multilib_virtclass_handler_global () {
          return
 
      if bb.data.inherits_class('kernel', e.data) or \
-            bb.data.inherits_class('module-base', e.data) or \
-            (bb.data.inherits_class('allarch', e.data) and\
-             not bb.data.inherits_class('packagegroup', e.data)):
+            bb.data.inherits_class('module-base', e.data):
              variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split()
 
              import oe.classextend

meta/classes/package.bbclass +6 -3

index 0b6f65a855..d1e9138c66 100644
@@ -494,7 +494,8 @@ def get_package_mapping (pkg, basepkg, d):
 
      if key in data:
          # Have to avoid undoing the write_extra_pkgs(global_variants...)
-        if bb.data.inherits_class('allarch', d) and data[key] == basepkg:
+        if bb.data.inherits_class('allarch', d) and not d.getVar('MULTILIB_VARIANTS') \
+            and data[key] == basepkg:
              return pkg
          return data[key]
 

@@ -1413,7 +1414,8 @@ fi
      if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
          write_extra_pkgs(variants, pn, packages, pkgdatadir)
 
-    if (bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d)):
+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
          write_extra_pkgs(global_variants, pn, packages, pkgdatadir)
 
      workdir = d.getVar('WORKDIR')

@@ -1502,7 +1504,8 @@ fi
      if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
          write_extra_runtime_pkgs(variants, packages, pkgdatadir)
 
-    if bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d):
+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
          write_extra_runtime_pkgs(global_variants, packages, pkgdatadir)
 
  }

Signature · 7 lines

2.18.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Quoted 181 lines · Martin Jansa

Quoted 93 lines · Martin Jansa

Quoted 84 lines · Martin Jansa

Quoted 78 lines · Martin Jansa

Quoted 35 lines · On Thu, Sep 06, 2018 at 11:52:24PM +0800, [email protected] wrote:

From: Kai Kang <[email protected]>

Some allarch packages rdepends non-allarch packages. when multilib is used, it doesn't expand the dependency chain correctly, e.g.

core-image-sato -> ca-certificates(allarch) -> openssl

we expect dependency chain for lib32-core-image-sato:

lib32-core-image-sato -> ca-certificates(allarch) -> lib32-openssl

it should install lib32-openssl for ca-certificates but openssl is still wrongly required.

Only enable allarch when multilib is not used to fix the issue.

Signed-off-by kai kang <[email protected]>

---
  meta/classes/allarch.bbclass         | 12 +++++++++++-
  meta/classes/icecc.bbclass           |  2 +-
  meta/classes/multilib.bbclass        |  3 ++-
  meta/classes/multilib_global.bbclass |  4 +---
  meta/classes/package.bbclass         |  9 ++++++---
  5 files changed, 21 insertions(+), 9 deletions(-)

meta/classes/allarch.bbclass +1 -1

index 1eebe0bf2e..45f62a5939 100644
@@ -2,7 +2,17 @@
  # This class is used for architecture independent recipes/data files (usually scripts)
  #
 
-PACKAGE_ARCH = "all"
+python allarch_package_arch_handler () {

meta/classes/allarch.bbclass line 15

Quoted 10 lines

meta/classes/allarch.bbclass +10 -0

+    if bb.data.inherits_class("nativesdk", d) or bb.data.inherits_class("crosssdk", d):
+        return
+
+    variants = d.getVar("MULTILIB_VARIANTS")
+    if not variants:
+        d.setVar("PACKAGE_ARCH", "all" )
+}
+
+addhandler allarch_package_arch_handler
+allarch_package_arch_handler[eventmask] = "bb.event.RecipePreFinalise"

Maybe I'm overlooking something, but doesn't this overwrite whatever PACKAGE_ARCH as set before this?

I have some recipes where the PACKAGE_ARCH is set to MACHINE_ARCH through another bbclass, but then overwritten with "all" by allarch_package_arch_handler:

# $PACKAGE_ARCH [5 operations]
# set oe-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set meta-lg-webos/meta-webos/conf/distro/include/webos.inc:241
# "${MACHINE_ARCH}"
# set oe-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set meta-lg-webos/meta-webos/classes/webos_machine_impl_dep.bbclass:11
# "${MACHINE_ARCH}"
# set allarch.bbclass:12 [allarch_package_arch_handler]
# "all"

# pre-expansion value:
#   "all"
PACKAGE_ARCH="all"

But surprisingly if I do the same with e.g. packagegroup-core-boot in oe-core I get:

# $PACKAGE_ARCH [4 operations]
# set /OE/build/oe-core/openembedded-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set /OE/build/oe-core/openembedded-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set /OE/build/oe-core/openembedded-core/meta/recipes-core/packagegroups/packagegroup-core-boot.bb:9
# "${MACHINE_ARCH}"
# set? /OE/build/oe-core/openembedded-core/meta/classes/packagegroup.bbclass:12
# "all"

Quoted 5 lines

# pre-expansion value:
#   "${MACHINE_ARCH}"
PACKAGE_ARCH="qemux86_64"

Why isn't allarch_package_arch_handler executed in the 2nd case?

Quoted 8 lines

Now I see the difference, I was still living in the days when "disabling" allarch was possible just by setting PACKAGE_ARCH before inheritting allarch, but now I see that packagegroups do conditional inherit as well since:
http://git.openembedded.org/openembedded-core/commit/?id=9c826962ec8fa45c2b035427442b90a41517144e
http://git.openembedded.org/openembedded-core/commit/?id=2c9b1d304daade7b0907320aeb9c522e7ab9dcab
so I'll modify currently failing recipes to do the same and stop inheritting allarch when PACKAGE_ARCH is set to something else.

Quoted 4 lines

From public layers I've found with test-signatures script only
fbset-nodes recipe in meta-oe which was setting PACKAGE_ARCH after allarch inherit, allarch removal sent here:
http://lists.openembedded.org/pipermail/openembedded-devel/2018-September/120560.html

target-sdk-provides-dummy seems to be affected as well:
=== Comparing signatures for task do_populate_sysroot.sigdata between qemux86 and qemux86copy ===
ERROR: lib32-target-sdk-provides-dummy different signature for task do_populate_sysroot.sigdata between qemux86 and qemux86copy basehash changed from b0a44b2c7003b6b4aa3a023d9cb9fe82 to 3a59fa25ddb6a95aff079d477ebf3457
Variable SSTATE_MANMACH value changed from 'qemux86' to 'qemux86copy'

ERROR: target-sdk-provides-dummy different signature for task do_populate_sysroot.sigdata between qemux86 and qemux86copy basehash changed from 9e44f1deb3d15886ee96db1a3332764c to 6b417d08a5113c9b06d13b3681f5ab4f
Variable SSTATE_MANMACH value changed from 'qemux86' to 'qemux86copy'

It's using:
inherit allarch

python() {
# Put the package somewhere separate to ensure it's never used except # when we want it
# (note that we have to do this in anonymous python here to avoid # allarch.bbclass disabling itself) d.setVar('PACKAGE_ARCH', '${DUMMYARCH}')
}

and DUMMYARCH = "sdk-provides-dummy-target"

The difference as shown with bitbake -e before and after reverting this commit:

before revert:
# $SSTATE_MANMACH [2 operations]
# set? oe-core/meta/classes/sstate.bbclass:61
# "${SSTATE_PKGARCH}"
# set sstate.bbclass:100 [__anon_111_oe_core_meta_classes_sstate_bbclass]
# "machineName"

# pre-expansion value:
#   "machineName"
SSTATE_MANMACH="machineName"

# $SSTATE_PKGARCH
# set oe-core/meta/classes/sstate.bbclass:11
# "${PACKAGE_ARCH}"
SSTATE_PKGARCH="sdk-provides-dummy-target"

# $PACKAGE_ARCH [3 operations]
# set oe-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set oe-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set dummy-sdk-package.inc:12 [__anon_12_oe_core_meta_recipes_core_meta_dummy_sdk_package_inc]
# "${DUMMYARCH}"

# pre-expansion value:
#   "${DUMMYARCH}"
PACKAGE_ARCH="sdk-provides-dummy-target"

after revert:
# $SSTATE_MANMACH
# set? oe-core/meta/classes/sstate.bbclass:61
# "${SSTATE_PKGARCH}"
SSTATE_MANMACH="allarch"

# $SSTATE_PKGARCH [2 operations]
# set oe-core/meta/classes/sstate.bbclass:11
# "${PACKAGE_ARCH}"
# set sstate.bbclass:98 [__anon_111__oe_core_meta_classes_sstate_bbclass]
# "allarch"

# pre-expansion value:
#   "allarch"
SSTATE_PKGARCH="allarch"

# $PACKAGE_ARCH [4 operations]
# set oe-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set oe-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set oe-core/meta/classes/allarch.bbclass:5
# "all"
# set dummy-sdk-package.inc:12 [__anon_12_oe_core_meta_recipes_core_meta_dummy_sdk_package_inc]
# "${DUMMYARCH}"

# pre-expansion value:
#   "${DUMMYARCH}"
PACKAGE_ARCH="sdk-provides-dummy-target"

the relevant part of the anonymous python in sstate.bbclass:

Quoted 8 lines

     elif bb.data.inherits_class('allarch', d) and d.getVar("PACKAGE_ARCH") == "all":
         d.setVar('SSTATE_PKGARCH', "allarch")
     else:
         d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))

So with your change, the PACKAGE_ARCH isn't set to "all" because multilib is enabled, but that causes sstate.bbclass to set SSTATE_MANMACH to MACHINE instead of SSTATE_PKGARCH allarch, where it got MACHINE is still a bit of mystery to me.

The original story is that multilib packages such as lib32-curl depends on non-multilib package openssl that allarch package ca-certificates is in the dependency chain:

lib32-curl -> ca-certificates -> openssl

I sent some versions of commits to Richard but he thought these solutions affect current non-multilib build too much. And Richard proposed this solution which not affect current non-multilib build. When multilib is enabled/used, allarch packages are eliminated and treated as common packages. The vars SSTATE_*  are set as the same as normal packages such as zlib.

Package target-sdk-provides-dummy is a little special that it sets its PACKAGE_ARCH in its own recipe. And affects vars which depends on PACKAGE_ARCH.

Regards,
Kai

Quoted 103 lines

Cheers,

Quoted 98 lines

Quoted 94 lines

Cheers,

Quoted 88 lines

Quoted 86 lines

meta/classes/allarch.bbclass +0 -0

  python () {
      # Allow this class to be included but overridden - only set

meta/classes/icecc.bbclass +1 -1

index 0ca8de86c2..b5a8457747 100644
@@ -171,7 +171,7 @@ def use_icecc(bb,d):
      return "yes"
 
  def icecc_is_allarch(bb, d):
-    return d.getVar("PACKAGE_ARCH") == "all" or bb.data.inherits_class('allarch', d)
+    return d.getVar("PACKAGE_ARCH") == "all"
 
  def icecc_is_kernel(bb, d):
      return \

meta/classes/multilib.bbclass +2 -1

index f2ac8bdfef..7b4d6472b0 100644
@@ -50,7 +50,8 @@ python multilib_virtclass_handler () {
      if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
          raise bb.parse.SkipRecipe("We can't extend nativesdk recipes")
 
-    if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
+    if bb.data.inherits_class('allarch', e.data) and not d.getVar('MULTILIB_VARIANTS') \
+        and not bb.data.inherits_class('packagegroup', e.data):
          raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups")
 
      # Expand this since this won't work correctly once we set a multilib into place

meta/classes/multilib_global.bbclass +1 -3

index d2ec1adfea..1bb62427b0 100644
@@ -165,9 +165,7 @@ python multilib_virtclass_handler_global () {
          return
 
      if bb.data.inherits_class('kernel', e.data) or \
-            bb.data.inherits_class('module-base', e.data) or \
-            (bb.data.inherits_class('allarch', e.data) and\
-             not bb.data.inherits_class('packagegroup', e.data)):
+            bb.data.inherits_class('module-base', e.data):
              variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split()
 
              import oe.classextend

meta/classes/package.bbclass +6 -3

index 0b6f65a855..d1e9138c66 100644
@@ -494,7 +494,8 @@ def get_package_mapping (pkg, basepkg, d):
 
      if key in data:
          # Have to avoid undoing the write_extra_pkgs(global_variants...)
-        if bb.data.inherits_class('allarch', d) and data[key] == basepkg:
+        if bb.data.inherits_class('allarch', d) and not d.getVar('MULTILIB_VARIANTS') \
+            and data[key] == basepkg:
              return pkg
          return data[key]
 

@@ -1413,7 +1414,8 @@ fi
      if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
          write_extra_pkgs(variants, pn, packages, pkgdatadir)
 
-    if (bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d)):
+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
          write_extra_pkgs(global_variants, pn, packages, pkgdatadir)
 
      workdir = d.getVar('WORKDIR')

@@ -1502,7 +1504,8 @@ fi
      if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
          write_extra_runtime_pkgs(variants, packages, pkgdatadir)
 
-    if bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d):
+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
          write_extra_runtime_pkgs(global_variants, packages, pkgdatadir)
 
  }

Signature · 7 lines

2.18.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Signature · 2 lines

Regards,
Neil | Kai Kang

Quoted 4 lines · Martin Jansa

Quoted 3 lines · Martin Jansa

Quoted 2 lines · Martin Jansa

Quoted 1 line · Martin Jansa

On Thu, Sep 06, 2018 at 11:52:24PM +0800, [email protected]

Quoted 5 lines · wrote:

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

From: Kai Kang <[email protected]>

Some allarch packages rdepends non-allarch packages. when multilib is used, it doesn't expand the dependency chain correctly, e.g.

Quoted 7 lines

Quoted 7 lines

Quoted 7 lines

Quoted 7 lines

Quoted 7 lines

core-image-sato -> ca-certificates(allarch) -> openssl

we expect dependency chain for lib32-core-image-sato:

lib32-core-image-sato -> ca-certificates(allarch) -> lib32-openssl

it should install lib32-openssl for ca-certificates but openssl is

still

Quoted 13 lines

Quoted 13 lines

Quoted 13 lines

Quoted 13 lines

Quoted 13 lines

wrongly required.

Only enable allarch when multilib is not used to fix the issue.

Signed-off-by kai kang <[email protected]>

---
  meta/classes/allarch.bbclass         | 12 +++++++++++-
  meta/classes/icecc.bbclass           |  2 +-
  meta/classes/multilib.bbclass        |  3 ++-
  meta/classes/multilib_global.bbclass |  4 +---
  meta/classes/package.bbclass         |  9 ++++++---
  5 files changed, 21 insertions(+), 9 deletions(-)

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

Review

Quoted 1 line

(quoted diff) +0 -0

b/meta/classes/allarch.bbclass

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

meta/classes/allarch.bbclass line 2

Quoted 5 lines

index 1eebe0bf2e..45f62a5939 100644

meta/classes/allarch.bbclass +0 -0

@@ -2,7 +2,17 @@
  # This class is used for architecture independent recipes/data

files (usually scripts)

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

meta/classes/allarch.bbclass

Quoted 5 lines

meta/classes/allarch.bbclass +2 -1

  #
 
-PACKAGE_ARCH = "all"
+python allarch_package_arch_handler () {
+    if bb.data.inherits_class("nativesdk", d) or

bb.data.inherits_class("crosssdk", d):

Quoted 9 lines

Quoted 9 lines

Quoted 9 lines

Quoted 9 lines

meta/classes/allarch.bbclass

Quoted 9 lines

meta/classes/allarch.bbclass +9 -0

+        return
+
+    variants = d.getVar("MULTILIB_VARIANTS")
+    if not variants:
+        d.setVar("PACKAGE_ARCH", "all" )
+}
+
+addhandler allarch_package_arch_handler
+allarch_package_arch_handler[eventmask] =

"bb.event.RecipePreFinalise"

Quoted 4 lines

Quoted 4 lines

Quoted 4 lines

Quoted 4 lines

Maybe I'm overlooking something, but doesn't this overwrite whatever PACKAGE_ARCH as set before this?

I have some recipes where the PACKAGE_ARCH is set to MACHINE_ARCH

through

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

another bbclass, but then overwritten with "all" by

allarch_package_arch_handler:

Quoted 9 lines

Quoted 9 lines

Quoted 9 lines

Quoted 9 lines

# $PACKAGE_ARCH [5 operations]
# set oe-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set meta-lg-webos/meta-webos/conf/distro/include/webos.inc:241
# "${MACHINE_ARCH}"
# set oe-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set

meta-lg-webos/meta-webos/classes/webos_machine_impl_dep.bbclass:11

Quoted 8 lines

Quoted 8 lines

Quoted 8 lines

Quoted 8 lines

# "${MACHINE_ARCH}"
# set allarch.bbclass:12 [allarch_package_arch_handler]
# "all"

# pre-expansion value:
#   "all"
PACKAGE_ARCH="all"

But surprisingly if I do the same with e.g. packagegroup-core-boot in

oe-core I get:

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

# $PACKAGE_ARCH [4 operations]
# set /OE/build/oe-core/openembedded-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set

/OE/build/oe-core/openembedded-core/meta/conf/documentation.conf:304

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

# [doc] "The architecture of the resulting package or packages."
# set

/OE/build/oe-core/openembedded-core/meta/recipes-core/packagegroups/ packagegroup-core-boot.bb:9

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

# "${MACHINE_ARCH}"
# set?

/OE/build/oe-core/openembedded-core/meta/classes/packagegroup.bbclass:12

Quoted 11 lines

Quoted 11 lines

Quoted 11 lines

Quoted 6 lines

# "all"

# pre-expansion value:
#   "${MACHINE_ARCH}"
PACKAGE_ARCH="qemux86_64"

Why isn't allarch_package_arch_handler executed in the 2nd case?

Now I see the difference, I was still living in the days when "disabling" allarch was possible just by setting PACKAGE_ARCH before inheritting allarch, but now I see that packagegroups do conditional inherit as well since:

http://git.openembedded.org/openembedded-core/commit/?id=9c826962ec8fa45c2b035427442b90a41517144e

Quoted 1 line

Quoted 1 line

Quoted 1 line

http://git.openembedded.org/openembedded-core/commit/?id=2c9b1d304daade7b0907320aeb9c522e7ab9dcab

Quoted 6 lines

Quoted 6 lines

Quoted 2 lines

so I'll modify currently failing recipes to do the same and stop inheritting allarch when PACKAGE_ARCH is set to something else.

From public layers I've found with test-signatures script only
fbset-nodes recipe in meta-oe which was setting PACKAGE_ARCH after allarch inherit, allarch removal sent here:

http://lists.openembedded.org/pipermail/openembedded-devel/2018-September/120560.html

Quoted 2 lines

target-sdk-provides-dummy seems to be affected as well:
=== Comparing signatures for task do_populate_sysroot.sigdata between

qemux86 and qemux86copy ===

Quoted 1 line

ERROR: lib32-target-sdk-provides-dummy different signature for task

do_populate_sysroot.sigdata between qemux86 and qemux86copy

Quoted 1 line

basehash changed from b0a44b2c7003b6b4aa3a023d9cb9fe82 to

3a59fa25ddb6a95aff079d477ebf3457

Quoted 3 lines

Variable SSTATE_MANMACH value changed from 'qemux86' to 'qemux86copy'

ERROR: target-sdk-provides-dummy different signature for task

do_populate_sysroot.sigdata between qemux86 and qemux86copy

Quoted 1 line

basehash changed from 9e44f1deb3d15886ee96db1a3332764c to

6b417d08a5113c9b06d13b3681f5ab4f

Quoted 8 lines

Variable SSTATE_MANMACH value changed from 'qemux86' to 'qemux86copy'

It's using:
inherit allarch

python() {
# Put the package somewhere separate to ensure it's never used

except

Quoted 9 lines

     # when we want it
     # (note that we have to do this in anonymous python here to avoid
     # allarch.bbclass disabling itself)
     d.setVar('PACKAGE_ARCH', '${DUMMYARCH}')
}

and DUMMYARCH = "sdk-provides-dummy-target"

The difference as shown with bitbake -e before and after reverting this

commit:

Quoted 6 lines

before revert:
# $SSTATE_MANMACH [2 operations]
# set? oe-core/meta/classes/sstate.bbclass:61
# "${SSTATE_PKGARCH}"
# set sstate.bbclass:100

[__anon_111_oe_core_meta_classes_sstate_bbclass]

Quoted 10 lines

# "machineName"

# pre-expansion value:
#   "machineName"
SSTATE_MANMACH="machineName"

# $SSTATE_PKGARCH
# set oe-core/meta/classes/sstate.bbclass:11
# "${PACKAGE_ARCH}"
SSTATE_PKGARCH="sdk-provides-dummy-target"

Quoted 6 lines

# $PACKAGE_ARCH [3 operations]
# set oe-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set oe-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set dummy-sdk-package.inc:12

[__anon_12_oe_core_meta_recipes_core_meta_dummy_sdk_package_inc]

Quoted 11 lines

# "${DUMMYARCH}"

# pre-expansion value:
#   "${DUMMYARCH}"
PACKAGE_ARCH="sdk-provides-dummy-target"

after revert:
# $SSTATE_MANMACH
# set? oe-core/meta/classes/sstate.bbclass:61
# "${SSTATE_PKGARCH}"
SSTATE_MANMACH="allarch"

Quoted 4 lines

# $SSTATE_PKGARCH [2 operations]
# set oe-core/meta/classes/sstate.bbclass:11
# "${PACKAGE_ARCH}"
# set sstate.bbclass:98

[__anon_111__oe_core_meta_classes_sstate_bbclass]

Quoted 5 lines

# "allarch"

# pre-expansion value:
#   "allarch"
SSTATE_PKGARCH="allarch"

Quoted 8 lines

# $PACKAGE_ARCH [4 operations]
# set oe-core/meta/conf/bitbake.conf:150
# [_defaultval] "${TUNE_PKGARCH}"
# set oe-core/meta/conf/documentation.conf:304
# [doc] "The architecture of the resulting package or packages."
# set oe-core/meta/classes/allarch.bbclass:5
# "all"
# set dummy-sdk-package.inc:12

[__anon_12_oe_core_meta_recipes_core_meta_dummy_sdk_package_inc]

Quoted 9 lines

# "${DUMMYARCH}"

# pre-expansion value:
#   "${DUMMYARCH}"
PACKAGE_ARCH="sdk-provides-dummy-target"

the relevant part of the anonymous python in sstate.bbclass:

elif bb.data.inherits_class('allarch', d) and

d.getVar("PACKAGE_ARCH") == "all":

Quoted 5 lines

         d.setVar('SSTATE_PKGARCH', "allarch")
     else:
         d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))

So with your change, the PACKAGE_ARCH isn't set to "all" because

multilib is enabled,

Quoted 1 line

but that causes sstate.bbclass to set SSTATE_MANMACH to MACHINE instead

of SSTATE_PKGARCH

Quoted 1 line

allarch, where it got MACHINE is still a bit of mystery to me.

The original story is that multilib packages such as lib32-curl depends on non-multilib package openssl that allarch package ca-certificates is in the dependency chain:

lib32-curl -> ca-certificates -> openssl

I sent some versions of commits to Richard but he thought these solutions affect current non-multilib build too much. And Richard proposed this solution which not affect current non-multilib build. When multilib is enabled/used, allarch packages are eliminated and treated as common packages. The vars SSTATE_* are set as the same as normal packages such as zlib.

Package target-sdk-provides-dummy is a little special that it sets its PACKAGE_ARCH in its own recipe. And affects vars which depends on PACKAGE_ARCH.

Regards,
Kai

Quoted 14 lines

Cheers,

Quoted 11 lines

Quoted 11 lines

Cheers,

Quoted 9 lines

Quoted 9 lines

meta/classes/allarch.bbclass +0 -0

  python () {
      # Allow this class to be included but overridden - only set

meta/classes/icecc.bbclass +0 -0

index 0ca8de86c2..b5a8457747 100644
@@ -171,7 +171,7 @@ def use_icecc(bb,d):
      return "yes"
 

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

meta/classes/icecc.bbclass def use_icecc(bb,d): · line 174

Quoted 2 lines

meta/classes/icecc.bbclass +0 -1

  def icecc_is_allarch(bb, d):
-    return d.getVar("PACKAGE_ARCH") == "all" or

bb.data.inherits_class('allarch', d)

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

Review

Quoted 5 lines

meta/classes/icecc.bbclass +1 -0

+    return d.getVar("PACKAGE_ARCH") == "all"
 
  def icecc_is_kernel(bb, d):
      return \

(quoted diff) +0 -0

b/meta/classes/multilib.bbclass

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

meta/classes/multilib.bbclass python multilib_virtclass_handler () { · line 50

Quoted 5 lines

index f2ac8bdfef..7b4d6472b0 100644

meta/classes/multilib.bbclass +0 -0

@@ -50,7 +50,8 @@ python multilib_virtclass_handler () {
      if bb.data.inherits_class('nativesdk', e.data) or

bb.data.inherits_class('crosssdk', e.data):

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

meta/classes/multilib.bbclass python multilib_virtclass_handler () { · line 51

Quoted 1 line

meta/classes/multilib.bbclass +0 -0

          raise bb.parse.SkipRecipe("We can't extend nativesdk

recipes")

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

meta/classes/multilib.bbclass python multilib_virtclass_handler () { · line 52

Quoted 2 lines

meta/classes/multilib.bbclass +0 -1

-    if bb.data.inherits_class('allarch', e.data) and not

bb.data.inherits_class('packagegroup', e.data):

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

meta/classes/multilib.bbclass python multilib_virtclass_handler () { · line 52

Quoted 1 line

meta/classes/multilib.bbclass +1 -0

+    if bb.data.inherits_class('allarch', e.data) and not

d.getVar('MULTILIB_VARIANTS') \

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

meta/classes/multilib.bbclass python multilib_virtclass_handler () { · line 54

Quoted 2 lines

meta/classes/multilib.bbclass +1 -0

+        and not bb.data.inherits_class('packagegroup', e.data):
          raise bb.parse.SkipRecipe("Don't extend allarch recipes

which are not packagegroups")

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

meta/classes/multilib.bbclass python multilib_virtclass_handler () { · line 55

Quoted 2 lines

meta/classes/multilib.bbclass +0 -0

      # Expand this since this won't work correctly once we set a

multilib into place

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

Review

Quoted 1 line

(quoted diff) +0 -0

b/meta/classes/multilib_global.bbclass

Quoted 6 lines

Quoted 6 lines

Quoted 6 lines

Quoted 6 lines

Quoted 6 lines

index d2ec1adfea..1bb62427b0 100644

meta/classes/multilib_global.bbclass +0 -0

@@ -165,9 +165,7 @@ python multilib_virtclass_handler_global () {
          return
 

Quoted 6 lines

Quoted 6 lines

Quoted 6 lines

Quoted 6 lines

meta/classes/multilib_global.bbclass python multilib_virtclass_handler_global () {

Quoted 6 lines

meta/classes/multilib_global.bbclass +1 -3

      if bb.data.inherits_class('kernel', e.data) or \
-            bb.data.inherits_class('module-base', e.data) or \
-            (bb.data.inherits_class('allarch', e.data) and\
-             not bb.data.inherits_class('packagegroup', e.data)):
+            bb.data.inherits_class('module-base', e.data):
              variants = (e.data.getVar("MULTILIB_VARIANTS") or

"").split()

Quoted 3 lines

Quoted 3 lines

Quoted 3 lines

Quoted 3 lines

Review

Quoted 3 lines

meta/classes/multilib_global.bbclass +0 -0

              import oe.classextend

(quoted diff) +0 -0

b/meta/classes/package.bbclass

Quoted 7 lines

Quoted 7 lines

Quoted 7 lines

Quoted 7 lines

meta/classes/package.bbclass def get_package_mapping (pkg, basepkg, d): · line 496

Quoted 7 lines

index 0b6f65a855..d1e9138c66 100644

meta/classes/package.bbclass +0 -0

@@ -494,7 +494,8 @@ def get_package_mapping (pkg, basepkg, d):
 
      if key in data:
          # Have to avoid undoing the

write_extra_pkgs(global_variants...)

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

meta/classes/package.bbclass def get_package_mapping (pkg, basepkg, d): · line 497

Quoted 1 line

meta/classes/package.bbclass +0 -1

-        if bb.data.inherits_class('allarch', d) and data[key] ==

basepkg:

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

meta/classes/package.bbclass def get_package_mapping (pkg, basepkg, d): · line 497

Quoted 1 line

meta/classes/package.bbclass +1 -0

+        if bb.data.inherits_class('allarch', d) and not

d.getVar('MULTILIB_VARIANTS') \

Quoted 6 lines

Quoted 6 lines

Quoted 6 lines

Quoted 6 lines

meta/classes/package.bbclass fi · line 1414

Quoted 6 lines

meta/classes/package.bbclass +1 -0

+            and data[key] == basepkg:
              return pkg
          return data[key]
 

@@ -1413,7 +1414,8 @@ fi
      if bb.data.inherits_class('kernel', d) or

bb.data.inherits_class('module-base', d):

Quoted 3 lines

Quoted 3 lines

Quoted 3 lines

Quoted 3 lines

meta/classes/package.bbclass fi

Quoted 3 lines

meta/classes/package.bbclass +0 -1

          write_extra_pkgs(variants, pn, packages, pkgdatadir)
 
-    if (bb.data.inherits_class('allarch', d) and not

bb.data.inherits_class('packagegroup', d)):

Quoted 7 lines

Quoted 7 lines

Quoted 7 lines

Quoted 7 lines

meta/classes/package.bbclass fi · line 1504

Quoted 7 lines

meta/classes/package.bbclass +2 -0

+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
          write_extra_pkgs(global_variants, pn, packages, pkgdatadir)
 
      workdir = d.getVar('WORKDIR')

@@ -1502,7 +1504,8 @@ fi
      if bb.data.inherits_class('kernel', d) or

bb.data.inherits_class('module-base', d):

Quoted 3 lines

Quoted 3 lines

Quoted 3 lines

Quoted 3 lines

meta/classes/package.bbclass fi

Quoted 3 lines

meta/classes/package.bbclass +0 -1

          write_extra_runtime_pkgs(variants, packages, pkgdatadir)
 
-    if bb.data.inherits_class('allarch', d) and not

bb.data.inherits_class('packagegroup', d):

Quoted 3 lines

Quoted 3 lines

Quoted 3 lines

Quoted 3 lines

meta/classes/package.bbclass fi

Quoted 3 lines

meta/classes/package.bbclass +2 -0

+    if bb.data.inherits_class('allarch', d) and not variants \
+        and not bb.data.inherits_class('packagegroup', d):
          write_extra_runtime_pkgs(global_variants, packages,

pkgdatadir)

Quoted 14 lines

Quoted 14 lines

Quoted 14 lines

Quoted 12 lines

Quoted 10 lines

meta/classes/package.bbclass +0 -1

  }
--

2.18.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
Martin 'JaMa' Jansa jabber: [email protected]

Quoted 8 lines

Quoted 6 lines

Quoted 2 lines

--
Martin 'JaMa' Jansa jabber: [email protected]

--
Martin 'JaMa' Jansa jabber: [email protected]

--
Regards,
Neil | Kai Kang

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

I'm resurrecting this thread because this change negatively affects our use of multilib. The use case that this is fixing seems to be a a case that would be a better fit for multiconfig than it would multilib. My interpretation of the use cases of multilib and multiconfig is as follows and someone can correct me if this is wrong.

Multilib allows images to be built that support multiple architectures on the same image. Specifically this use case is interesting for cases where some library or tool has to be 32-bit (for whatever reason might apply) but the rest of the image is 64- bit. For example we have a 32-bit library from a third party vendor and that vendor won't provide us with a 64-bit version. So we want the majority of our system to be 64-bit but need multilib to support the subset of our image that needs to be 32-bit. The result is that some portion of our image has to be 32-bit but whenever possible we'd like to be using the 64-bit packages to reduce duplicating packages between 32 and 64 bit.

Multiconfig allows for multiple configs and seems well suited to cases where there are separate images for each config. So you could have a 32-bit image from one config and a 64-bit image from another config. If no image cross-contamination is required, as seems to be the intent of the request here, then multiconfig can ensure that while not reducing the usefulness of allarch. The original scenario seemed to follow this pattern where there is a lib32-core-image-sato and a core-image-sato.

In our multilib case we want the behavior from before this change. So in the specific use case of 'lib32-curl -> ca-certificate -> openssl' we actually want this. The reason behind this being the desired behavior is that the main architecture would certainly already require openssl so adding the 32-bit version would cause duplication and therefore increase our images size unnecessarily. In the past we had actually found that installing some duplicate things that overlapped like "/usr/bin/openssl" would cause racey behavior where sometimes we got the 32-bit version and others we got the 64-bit version.

Additionally the removal of allarch from all multilib builds also seem like a poor choice as multilib builds now lose all of the benefits that are generally available from allarch.

meta/recipes- renamed from meta/recipes-core/udev/eudev_3.2.5.bb +0 -0

core/udev/eudev_3.2.5.bb
index 75617c8d4e..75130f03ef 100644

meta/recipes-core/udev/eudev_3.2.5.bb +0 -0

@@ -23,7 +23,9 @@ SRC_URI = "http://dev.gentoo.org/~blueness/${BPN}/$
 {BP}.tar.gz \
 SRC_URI[md5sum] = "6ca08c0e14380f87df8e8aceac123671"
 SRC_URI[sha256sum] =

"49c2d04105cad2526302627e040fa24b1916a9a3e059539bc8bb919b973890af"

meta/recipes-core/udev/eudev_3.2.5.bb +1 -1

-inherit autotools update-rc.d qemu pkgconfig distro_features_check
+inherit autotools update-rc.d qemu pkgconfig distro_features_check

multilib_script

meta/recipes-core/udev/eudev_3.2.5.bb +3 -1

+
+MULTILIB_SCRIPTS = "${PN}-dev:${datadir}/pkgconfig/udev.pc"
 
 CONFLICT_DISTRO_FEATURES = "systemd"

@@ -65,7 +67,7 @@ PACKAGES =+ "eudev-hwdb"
 
 
 FILES_${PN} += "${libexecdir} ${base_libdir}/udev ${bindir}/udevadm"
-FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \
+FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc* \
                    ${includedir}/libudev.h ${libdir}/libudev.so \
                    ${includedir}/udev.h ${libdir}/libudev.la \
                    ${libdir}/libudev.a

${libdir}/pkgconfig/libudev.pc"

Quoted 22 lines · On Thu, 2018-09-06 at 23:52 +0800, [email protected] wrote:

meta/recipes- renamed from meta/recipes-core/udev/eudev_3.2.5.bb +0 -0

core/udev/eudev_3.2.5.bb
index 75617c8d4e..75130f03ef 100644

meta/recipes-core/udev/eudev_3.2.5.bb +0 -0

@@ -23,7 +23,9 @@ SRC_URI = "http://dev.gentoo.org/~blueness/${BPN}/$
 {BP}.tar.gz \
  SRC_URI[md5sum] = "6ca08c0e14380f87df8e8aceac123671"
  SRC_URI[sha256sum] =

"49c2d04105cad2526302627e040fa24b1916a9a3e059539bc8bb919b973890af"

meta/recipes-core/udev/eudev_3.2.5.bb +1 -1

-inherit autotools update-rc.d qemu pkgconfig distro_features_check
+inherit autotools update-rc.d qemu pkgconfig distro_features_check

multilib_script

meta/recipes-core/udev/eudev_3.2.5.bb +2 -0

+
+MULTILIB_SCRIPTS = "${PN}-dev:${datadir}/pkgconfig/udev.pc"
 
  CONFLICT_DISTRO_FEATURES = "systemd"

@@ -65,7 +67,7 @@ PACKAGES =+ "eudev-hwdb"
 
 

Quoted 7 lines

meta/recipes-core/udev/eudev_3.2.5.bb +1 -1

  FILES_${PN} += "${libexecdir} ${base_libdir}/udev ${bindir}/udevadm"
-FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \
+FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc* \
                     ${includedir}/libudev.h ${libdir}/libudev.so \
                     ${includedir}/udev.h ${libdir}/libudev.la \
                     ${libdir}/libudev.a

${libdir}/pkgconfig/libudev.pc"

I already commented on this, the file should be installed into libdir if its arch specific. I suspect libudev.pc is, udev.pc is not and udev.pc needs to stop referencing libdir.

Regardless, we're not using MULTILIB_SCRIPTS for .pc files.

Cheers,

Richard

From: Kai Kang <[email protected]>

V5:
* set PACKAGE_ARCH in event handler bb.event.RecipePreFinalise
* add execption of target-sdk-provides-dummy for package_qa_multilib check