Patchwork mtools, syslinux: add ability to compile with nativesdk

login
register
mail settings
Submitter Jason Wessel
Date Oct. 30, 2013, 10:48 p.m.
Message ID <1383173291-4017-1-git-send-email-jason.wessel@windriver.com>
Download mbox | patch
Permalink /patch/60837/
State New
Headers show

Comments

Jason Wessel - Oct. 30, 2013, 10:48 p.m.
For regenerating and ISO or EFI boot image the nativesdk needs mtools
and syslinux.

Both recipes are patched in one patch since syslinux requires
mtools.

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
---
 meta/recipes-devtools/mtools/mtools_3.9.9.bb    |    9 +++++++--
 meta/recipes-devtools/mtools/mtools_4.0.18.bb   |   12 +++++++++---
 meta/recipes-devtools/syslinux/syslinux_6.01.bb |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
Khem Raj - Oct. 30, 2013, 11:47 p.m.
On Wed, Oct 30, 2013 at 3:48 PM, Jason Wessel
<jason.wessel@windriver.com> wrote:
> For regenerating and ISO or EFI boot image the nativesdk needs mtools
> and syslinux.
>
> Both recipes are patched in one patch since syslinux requires
> mtools.
>

as they depend on eglibc/glibc only. Can you also make sure that they
get flagged when building
systems with non-eglibc C libraries.

> Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
> ---
>  meta/recipes-devtools/mtools/mtools_3.9.9.bb    |    9 +++++++--
>  meta/recipes-devtools/mtools/mtools_4.0.18.bb   |   12 +++++++++---
>  meta/recipes-devtools/syslinux/syslinux_6.01.bb |    2 +-
>  3 files changed, 17 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-devtools/mtools/mtools_3.9.9.bb b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
> index 2213c17..8678a8b 100644
> --- a/meta/recipes-devtools/mtools/mtools_3.9.9.bb
> +++ b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
> @@ -9,8 +9,12 @@ LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=92b58ec77696788ce278b044d2a8e9d3"
>  PR = "r6"
>
> -RDEPENDS_${PN} = "glibc-gconv-ibm850"
> -RRECOMMENDS_${PN} = "\
> +targetdepgconv = ""
> +targetdepgconv_class-target = "glibc-gconv-ibm850"
> +RDEPENDS_${PN} = "${targetdepgconv}"
> +
> +targetrecgconv = ""
> +targetrecgconv_class-target = "\
>         glibc-gconv-ibm437 \
>         glibc-gconv-ibm737 \
>         glibc-gconv-ibm775 \
> @@ -26,6 +30,7 @@ RRECOMMENDS_${PN} = "\
>         glibc-gconv-ibm866 \
>         glibc-gconv-ibm869 \
>         "
> +RRECOMMENDS_${PN} = "${targetrecgconv}"
>
>  #http://mtools.linux.lu/mtools-${PV}.tar.gz
>  SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/mtools-${PV}.tar.gz \
> diff --git a/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/meta/recipes-devtools/mtools/mtools_4.0.18.bb
> index dcd6066..602b3c0 100644
> --- a/meta/recipes-devtools/mtools/mtools_4.0.18.bb
> +++ b/meta/recipes-devtools/mtools/mtools_4.0.18.bb
> @@ -6,8 +6,12 @@ LICENSE = "GPLv3"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>
>
> -RDEPENDS_${PN} = "glibc-gconv-ibm850"
> -RRECOMMENDS_${PN} = "\
> +targetdepgconv = ""
> +targetdepgconv_class-target = "glibc-gconv-ibm850"
> +RDEPENDS_${PN} = "${targetdepgconv}"
> +
> +targetrecgconv = ""
> +targetrecgconv_class-target = "\
>         glibc-gconv-ibm437 \
>         glibc-gconv-ibm737 \
>         glibc-gconv-ibm775 \
> @@ -23,6 +27,8 @@ RRECOMMENDS_${PN} = "\
>         glibc-gconv-ibm866 \
>         glibc-gconv-ibm869 \
>         "
> +RRECOMMENDS_${PN} = "${targetrecgconv}"
> +
>  SRC_URI[md5sum] = "a23646617546bf6ad56f061d8b283c85"
>  SRC_URI[sha256sum] = "59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85"
>
> @@ -37,4 +43,4 @@ EXTRA_OECONF = "--without-x"
>
>  PARALLEL_MAKEINST = ""
>
> -BBCLASSEXTEND = "native"
> +BBCLASSEXTEND = "native nativesdk"
> diff --git a/meta/recipes-devtools/syslinux/syslinux_6.01.bb b/meta/recipes-devtools/syslinux/syslinux_6.01.bb
> index 4438ea8..c6e83b5 100644
> --- a/meta/recipes-devtools/syslinux/syslinux_6.01.bb
> +++ b/meta/recipes-devtools/syslinux/syslinux_6.01.bb
> @@ -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"
> --
> 1.7.9.5
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Jason Wessel - Oct. 31, 2013, 2:31 a.m.
On 10/30/2013 06:47 PM, Khem Raj wrote:
> On Wed, Oct 30, 2013 at 3:48 PM, Jason Wessel
> <jason.wessel@windriver.com> wrote:
>> For regenerating and ISO or EFI boot image the nativesdk needs mtools
>> and syslinux.
>>
>> Both recipes are patched in one patch since syslinux requires
>> mtools.
>>
> as they depend on eglibc/glibc only. Can you also make sure that they
> get flagged when building
> systems with non-eglibc C libraries.


Is there an example in a recipe of what you are talking about?

I saw in another recipe:
python __anonymous() {
    if d.getVar("TARGET_OS", True) != "linux":
        return
    if d.getVar("TCLIBC", True) == "eglibc":
        raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - eglibc already provides iconv")
}

Or is there a build test I should be using to test with uClibc for when things like this change in general?

Thanks,
Jason.
Khem Raj - Oct. 31, 2013, 2:36 a.m.
On Wed, Oct 30, 2013 at 7:31 PM, Jason Wessel
<jason.wessel@windriver.com> wrote:
> On 10/30/2013 06:47 PM, Khem Raj wrote:
>> On Wed, Oct 30, 2013 at 3:48 PM, Jason Wessel
>> <jason.wessel@windriver.com> wrote:
>>> For regenerating and ISO or EFI boot image the nativesdk needs mtools
>>> and syslinux.
>>>
>>> Both recipes are patched in one patch since syslinux requires
>>> mtools.
>>>
>> as they depend on eglibc/glibc only. Can you also make sure that they
>> get flagged when building
>> systems with non-eglibc C libraries.
>
>
> Is there an example in a recipe of what you are talking about?
>
> I saw in another recipe:
> python __anonymous() {
>     if d.getVar("TARGET_OS", True) != "linux":
>         return
>     if d.getVar("TCLIBC", True) == "eglibc":
>         raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - eglibc already provides iconv")
> }
>
> Or is there a build test I should be using to test with uClibc for when things like this change in general?


yes converse of above is what we need here.

>
> Thanks,
> Jason.

Patch

diff --git a/meta/recipes-devtools/mtools/mtools_3.9.9.bb b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
index 2213c17..8678a8b 100644
--- a/meta/recipes-devtools/mtools/mtools_3.9.9.bb
+++ b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
@@ -9,8 +9,12 @@  LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=92b58ec77696788ce278b044d2a8e9d3"
 PR = "r6"
 
-RDEPENDS_${PN} = "glibc-gconv-ibm850"
-RRECOMMENDS_${PN} = "\
+targetdepgconv = ""
+targetdepgconv_class-target = "glibc-gconv-ibm850"
+RDEPENDS_${PN} = "${targetdepgconv}"
+
+targetrecgconv = ""
+targetrecgconv_class-target = "\
 	glibc-gconv-ibm437 \
 	glibc-gconv-ibm737 \
 	glibc-gconv-ibm775 \
@@ -26,6 +30,7 @@  RRECOMMENDS_${PN} = "\
 	glibc-gconv-ibm866 \
 	glibc-gconv-ibm869 \
 	"
+RRECOMMENDS_${PN} = "${targetrecgconv}"
 
 #http://mtools.linux.lu/mtools-${PV}.tar.gz 
 SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/mtools-${PV}.tar.gz \
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/meta/recipes-devtools/mtools/mtools_4.0.18.bb
index dcd6066..602b3c0 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.18.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.18.bb
@@ -6,8 +6,12 @@  LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 
-RDEPENDS_${PN} = "glibc-gconv-ibm850"
-RRECOMMENDS_${PN} = "\
+targetdepgconv = ""
+targetdepgconv_class-target = "glibc-gconv-ibm850"
+RDEPENDS_${PN} = "${targetdepgconv}"
+
+targetrecgconv = ""
+targetrecgconv_class-target = "\
 	glibc-gconv-ibm437 \
 	glibc-gconv-ibm737 \
 	glibc-gconv-ibm775 \
@@ -23,6 +27,8 @@  RRECOMMENDS_${PN} = "\
 	glibc-gconv-ibm866 \
 	glibc-gconv-ibm869 \
 	"
+RRECOMMENDS_${PN} = "${targetrecgconv}"
+
 SRC_URI[md5sum] = "a23646617546bf6ad56f061d8b283c85"
 SRC_URI[sha256sum] = "59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85"
 
@@ -37,4 +43,4 @@  EXTRA_OECONF = "--without-x"
 
 PARALLEL_MAKEINST = ""
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.01.bb b/meta/recipes-devtools/syslinux/syslinux_6.01.bb
index 4438ea8..c6e83b5 100644
--- a/meta/recipes-devtools/syslinux/syslinux_6.01.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_6.01.bb
@@ -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"