Skip to contentSkip to conversation

mtools, syslinux: add ability to compile with nativesdk

PATCH In review Hongxu Jia 3 participants 7 messages Dec 3, 2013 – Dec 10, 2013

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

cover mtools, syslinux: add ability to compile with nativesdk

The following changes since commit a17ffbdbb7d142a94ef842a32b749b18e2e7f0a1:

bitbake: hob: fix rotating progress icon animation (2013-12-02 17:51:35 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-mtools
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-mtools

Hongxu Jia (3):
mtools: add ability to compile with nativesdk
syslinux: add ability to compile with nativesdk eglibc-locale.inc: use nativesdk override with the PACKAGES_DYNAMIC
statement

 meta/recipes-core/eglibc/eglibc-locale.inc      | 6 ++++++
 meta/recipes-devtools/mtools/mtools_3.9.9.bb    | 2 +-
 meta/recipes-devtools/mtools/mtools_4.0.18.bb   | 2 +-
 meta/recipes-devtools/syslinux/syslinux_6.01.bb | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 1/3 mtools: add ability to compile with nativesdk

For regenerating and ISO or EFI boot image the nativesdk needs mtools.

[YOCTO #5623]

---
 meta/recipes-devtools/mtools/mtools_3.9.9.bb  | 2 +-
 meta/recipes-devtools/mtools/mtools_4.0.18.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/mtools/mtools_3.9.9.bb +1 -1
index 2213c17..38f09de 100644
@@ -44,4 +44,4 @@ EXTRA_OECONF = "--without-x"
 
 PARALLEL_MAKEINST = ""
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
meta/recipes-devtools/mtools/mtools_4.0.18.bb +1 -1
index dcd6066..0cc7f6c 100644
@@ -37,4 +37,4 @@ EXTRA_OECONF = "--without-x"
 
 PARALLEL_MAKEINST = ""
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
1.8.1.2
author
#2 lore raw

PATCH 2/3 syslinux: add ability to compile with nativesdk

In reply to Hongxu Jia

For regenerating and ISO or EFI boot image the nativesdk needs mtools and syslinux.

[YOCTO #5623]

---
 meta/recipes-devtools/syslinux/syslinux_6.01.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/syslinux/syslinux_6.01.bb +1 -1
index 538be56..1c240de 100644
@@ -65,4 +65,4 @@ FILES_${PN}-dev += "${datadir}/${BPN}/com32/lib*${SOLIBS} ${datadir}/${BPN}/com3
 FILES_${PN}-staticdev += "${datadir}/${BPN}/com32/lib*.a ${libdir}/${BPN}/com32/lib*.a"
 FILES_${PN}-misc = "${datadir}/${BPN}/* ${libdir}/${BPN}/* ${bindir}/*"
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
1.8.1.2
author
#3 lore raw

PATCH 3/3 eglibc-locale.inc: use nativesdk override with the PACKAGES_DYNAMIC statement

In reply to Hongxu Jia

While compiling nativesdk-mtools, there was failure:
...
Nothing PROVIDES 'nativesdk-glibc-gconv-ibm850'. Close matches:
...

Using nativesdk override with the PACKAGES_DYNAMIC statement fixed this issue.

[YOCTO #5623]

---
 meta/recipes-core/eglibc/eglibc-locale.inc | 6 ++++++
 1 file changed, 6 insertions(+)
meta/recipes-core/eglibc/eglibc-locale.inc +6 -0
index 83569da..5e256a5 100644
@@ -35,6 +35,12 @@ PACKAGES_DYNAMIC = "^locale-base-.* \
                     ^eglibc-gconv-.* ^eglibc-charmap-.* ^eglibc-localedata-.* ^eglibc-binary-localedata-.* \
                     ^glibc-gconv-.*  ^glibc-charmap-.*  ^glibc-localedata-.*  ^glibc-binary-localedata-.*"
 
+PACKAGES_DYNAMIC_class-nativesdk = "^nativesdk-locale-base-.* \
+                    ^nativesdk-eglibc-gconv-.* ^nativesdk-eglibc-charmap-.* \
+                    ^nativesdk-eglibc-localedata-.* ^nativesdk-eglibc-binary-localedata-.* \
+                    ^nativesdk-glibc-gconv-.*  ^nativesdk-glibc-charmap-.*  \
+                    ^nativesdk-glibc-localedata-.*  ^nativesdk-glibc-binary-localedata-.*"
+
 # Create a eglibc-binaries package
 ALLOW_EMPTY_${BPN}-binaries = "1"
 PACKAGES += "${BPN}-binaries"
Signature · 1 line
1.8.1.2
#4 lore raw

Re: [PATCH 3/3] eglibc-locale.inc: use nativesdk override with the PACKAGES_DYNAMIC statement

Quoted 5 lines · Hongxu Jia

While compiling nativesdk-mtools, there was failure:
...
Nothing PROVIDES 'nativesdk-glibc-gconv-ibm850'. Close matches:
...

Quoted 8 lines

Using nativesdk override with the PACKAGES_DYNAMIC statement fixed this issue.

[YOCTO #5623]

---
 meta/recipes-core/eglibc/eglibc-locale.inc | 6 ++++++
 1 file changed, 6 insertions(+)

No.

lib/oe/classextend.py has a map_regexp_variable() function which is called from classes/multilib.bbclass:

clsextend.map_regexp_variable("PACKAGES_DYNAMIC")

Perhaps such a line should be added to nativesdk.bbclass to fix this properly instead?

Cheers,

Richard

Quoted 17 lines
meta/recipes-core/eglibc/eglibc-locale.inc +6 -0
index 83569da..5e256a5 100644
@@ -35,6 +35,12 @@ PACKAGES_DYNAMIC = "^locale-base-.* \
                     ^eglibc-gconv-.* ^eglibc-charmap-.* ^eglibc-localedata-.* ^eglibc-binary-localedata-.* \
                     ^glibc-gconv-.*  ^glibc-charmap-.*  ^glibc-localedata-.*  ^glibc-binary-localedata-.*"
 
+PACKAGES_DYNAMIC_class-nativesdk = "^nativesdk-locale-base-.* \
+                    ^nativesdk-eglibc-gconv-.* ^nativesdk-eglibc-charmap-.* \
+                    ^nativesdk-eglibc-localedata-.* ^nativesdk-eglibc-binary-localedata-.* \
+                    ^nativesdk-glibc-gconv-.*  ^nativesdk-glibc-charmap-.*  \
+                    ^nativesdk-glibc-localedata-.*  ^nativesdk-glibc-binary-localedata-.*"
+
 # Create a eglibc-binaries package
 ALLOW_EMPTY_${BPN}-binaries = "1"
 PACKAGES += "${BPN}-binaries"
author
#5 lore raw

Re: [PATCH 3/3] eglibc-locale.inc: use nativesdk override with the PACKAGES_DYNAMIC statement

Hi Richard,

I have updated this patch as your suggestion, and it works well.

nativesdk.bbclass: support nativesdk to override with the
PACKAGES_DYNAMIC statement

While compiling nativesdk-mtools, there was failure:
...
Nothing PROVIDES 'nativesdk-glibc-gconv-ibm850'. Close matches:
...
This patch supports nativesdk to override with the PACKAGES_DYNAMIC
statement

[YOCTO #5623]
meta/classes/nativesdk.bbclass +1 -0
index 94bc326..21a69c7 100644
@@ -81,6 +81,7 @@ python () {
     clsextend.map_depends_variable("DEPENDS")
     clsextend.map_packagevars()
     clsextend.map_variable("PROVIDES")
+    clsextend.map_regexp_variable("PACKAGES_DYNAMIC")
 }
 

//Hongxu

Quoted 46 lines · Richard Purdie
Quoted 5 lines · Hongxu Jia

While compiling nativesdk-mtools, there was failure:
...
Nothing PROVIDES 'nativesdk-glibc-gconv-ibm850'. Close matches:
...

Quoted 8 lines

Using nativesdk override with the PACKAGES_DYNAMIC statement fixed this issue.

[YOCTO #5623]

---
  meta/recipes-core/eglibc/eglibc-locale.inc | 6 ++++++
  1 file changed, 6 insertions(+)

No.

lib/oe/classextend.py has a map_regexp_variable() function which is called from classes/multilib.bbclass:

clsextend.map_regexp_variable("PACKAGES_DYNAMIC")

Perhaps such a line should be added to nativesdk.bbclass to fix this properly instead?

Cheers,

Richard

Quoted 17 lines
meta/recipes-core/eglibc/eglibc-locale.inc +6 -0
index 83569da..5e256a5 100644
@@ -35,6 +35,12 @@ PACKAGES_DYNAMIC = "^locale-base-.* \
                      ^eglibc-gconv-.* ^eglibc-charmap-.* ^eglibc-localedata-.* ^eglibc-binary-localedata-.* \
                      ^glibc-gconv-.*  ^glibc-charmap-.*  ^glibc-localedata-.*  ^glibc-binary-localedata-.*"
 
+PACKAGES_DYNAMIC_class-nativesdk = "^nativesdk-locale-base-.* \
+                    ^nativesdk-eglibc-gconv-.* ^nativesdk-eglibc-charmap-.* \
+                    ^nativesdk-eglibc-localedata-.* ^nativesdk-eglibc-binary-localedata-.* \
+                    ^nativesdk-glibc-gconv-.*  ^nativesdk-glibc-charmap-.*  \
+                    ^nativesdk-glibc-localedata-.*  ^nativesdk-glibc-binary-localedata-.*"
+
  # Create a eglibc-binaries package
  ALLOW_EMPTY_${BPN}-binaries = "1"
  PACKAGES += "${BPN}-binaries"
#6 lore raw

Re: [PATCH 3/3] eglibc-locale.inc: use nativesdk override with the PACKAGES_DYNAMIC statement

Quoted 14 lines · Hongxu Jia

Hi Richard,

I have updated this patch as your suggestion, and it works well.

nativesdk.bbclass: support nativesdk to override with the
PACKAGES_DYNAMIC statement

While compiling nativesdk-mtools, there was failure:
...
Nothing PROVIDES 'nativesdk-glibc-gconv-ibm850'. Close matches:
...
This patch supports nativesdk to override with the PACKAGES_DYNAMIC
statement

Quoted 3 lines
[YOCTO #5623]

In the future, please resend changes like this as a V2, we pulled the mtools change only to find that we did not have the correct nativesdk patch since it was not posted.

We have since found this patch in your branch and pulled it to master.

Thanks
Sau!

Quoted 74 lines
meta/classes/nativesdk.bbclass +1 -0
index 94bc326..21a69c7 100644
@@ -81,6 +81,7 @@ python () {
      clsextend.map_depends_variable("DEPENDS")
      clsextend.map_packagevars()
      clsextend.map_variable("PROVIDES")
+    clsextend.map_regexp_variable("PACKAGES_DYNAMIC")
  }
 
 //Hongxu
Quoted 44 lines · Richard Purdie
Quoted 8 lines · Hongxu Jia

While compiling nativesdk-mtools, there was failure:
...
Nothing PROVIDES 'nativesdk-glibc-gconv-ibm850'. Close matches:
...

Using nativesdk override with the PACKAGES_DYNAMIC statement fixed this issue.

Quoted 6 lines

[YOCTO #5623]

---
  meta/recipes-core/eglibc/eglibc-locale.inc | 6 ++++++
  1 file changed, 6 insertions(+)

No.

lib/oe/classextend.py has a map_regexp_variable() function which is called from classes/multilib.bbclass:

clsextend.map_regexp_variable("PACKAGES_DYNAMIC")

Perhaps such a line should be added to nativesdk.bbclass to fix this properly instead?

Cheers,

Richard

Quoted 15 lines
meta/recipes-core/eglibc/eglibc-locale.inc +0 -0
index 83569da..5e256a5 100644
@@ -35,6 +35,12 @@ PACKAGES_DYNAMIC = "^locale-base-.* \
                      ^eglibc-gconv-.* ^eglibc-charmap-.*
 ^eglibc-localedata-.* ^eglibc-binary-localedata-.* \
                      ^glibc-gconv-.*  ^glibc-charmap-.*

^glibc-localedata-.* ^glibc-binary-localedata-.*"

meta/recipes-core/eglibc/eglibc-locale.inc +2 -0
+PACKAGES_DYNAMIC_class-nativesdk = "^nativesdk-locale-base-.* \
+                    ^nativesdk-eglibc-gconv-.*

^nativesdk-eglibc-charmap-.* \
+ ^nativesdk-eglibc-localedata-.*
^nativesdk-eglibc-binary-localedata-.* \

Quoted 9 lines
Quoted 8 lines

+ ^nativesdk-glibc-gconv-.*
^nativesdk-glibc-charmap-.* \
+ ^nativesdk-glibc-localedata-.*
^nativesdk-glibc-binary-localedata-.*"
+
# Create a eglibc-binaries package
ALLOW_EMPTY_${BPN}-binaries = "1"
PACKAGES += "${BPN}-binaries"

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