Skip to contentSkip to conversation

Patches pending from O.S. Systems' tree

PATCH Applied Otavio Salvador 2 participants 4 messages Feb 8, 2012 – Feb 10, 2012

lore
Share & tools
lore

Otavio Salvador

author
#0 lore raw

cover Patches pending from O.S. Systems' tree

This has removed the map_dependencies from the cross class as we were handling those by hand anyway in meta-chicken.

The following changes since commit 06b740d4ca077fb4c89ee6d1065fabb02da45ec6:

classes/buildhistory: sort list fields in package info (2012-02-08 10:43:01 +0000)

are available in the git repository at:
git://github.com/OSSystems/oe-core master
https://github.com/OSSystems/oe-core/tree/HEAD

Otavio Salvador (2):
cross.bbclass: add virtclass handler
useradd.bbclass: skip processing on virtclass-cross extended packages

 meta/classes/cross.bbclass   |   17 +++++++++++++++++
 meta/classes/useradd.bbclass |    3 +++
 2 files changed, 20 insertions(+), 0 deletions(-)
Signature · 1 line
1.7.2.5
author
#1 lore raw

PATCH 1/2 cross.bbclass: add virtclass handler

Allow use of BBCLASSEXTEND with 'cross' and use of virtclass-cross in recipes.

Signed-off-by Otavio Salvador <[email protected]>
---
 meta/classes/cross.bbclass |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
meta/classes/cross.bbclass +17 -0
index 5681ab9..8da3048 100644
@@ -55,6 +55,23 @@ libexecdir = "${exec_prefix}/libexec/${CROSS_TARGET_SYS_DIR}"
 
 do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}"
 
+python cross_virtclass_handler () {
+    if not isinstance(e, bb.event.RecipePreFinalise):
+        return
+
+    classextend = e.data.getVar('BBCLASSEXTEND', True) or ""
+    if "cross" not in classextend:
+        return
+
+    pn = e.data.getVar("PN", True)
+    if not pn.endswith("-cross"):
+        return
+
+    bb.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-cross", e.data)
+}
+
+addhandler cross_virtclass_handler
+
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 }
Signature · 1 line
1.7.2.5
author
#2 lore raw

PATCH 2/2 useradd.bbclass: skip processing on virtclass-cross extended packages

In reply to Otavio Salvador
Signed-off-by Otavio Salvador <[email protected]>
---
 meta/classes/useradd.bbclass |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
meta/classes/useradd.bbclass +3 -0
index 8eb6444..1fed755 100644
@@ -3,6 +3,7 @@
 # and support files needed to add and modify user and group accounts
 DEPENDS_append = "${USERADDDEPENDS}"
 USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow"
+USERADDDEPENDS_virtclass-cross = ""
 USERADDDEPENDS_virtclass-native = ""
 USERADDDEPENDS_virtclass-nativesdk = ""
 

@@ -104,10 +105,12 @@ useradd_sysroot_sstate () {
 
 do_install[prefuncs] += "${SYSROOTFUNC}"
 SYSROOTFUNC = "useradd_sysroot"
+SYSROOTFUNC_virtclass-cross = ""
 SYSROOTFUNC_virtclass-native = ""
 SYSROOTFUNC_virtclass-nativesdk = ""
 SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}"
 SYSROOTPOSTFUNC = "useradd_sysroot_sstate"
+SYSROOTPOSTFUNC_virtclass-cross = ""
 SYSROOTPOSTFUNC_virtclass-native = ""
 SYSROOTPOSTFUNC_virtclass-nativesdk = ""
Signature · 1 line
1.7.2.5
Applied
#3 lore raw
In reply to Otavio Salvador
Quoted 11 lines · Otavio Salvador

This has removed the map_dependencies from the cross class as we were handling those by hand anyway in meta-chicken.

The following changes since commit 06b740d4ca077fb4c89ee6d1065fabb02da45ec6:

classes/buildhistory: sort list fields in package info (2012-02-08 10:43:01 +0000)

are available in the git repository at:
git://github.com/OSSystems/oe-core master
https://github.com/OSSystems/oe-core/tree/HEAD

Quoted 8 lines

Otavio Salvador (2):
cross.bbclass: add virtclass handler
useradd.bbclass: skip processing on virtclass-cross extended packages

  meta/classes/cross.bbclass   |   17 +++++++++++++++++
  meta/classes/useradd.bbclass |    3 +++
  2 files changed, 20 insertions(+), 0 deletions(-)

Merged to OE-core

Thanks
Sau!