Re: [OE-core] Branch management for OE-Core release
On Fri, Sep 23, 2011 at 11:12 AM, Otavio Salvador wrote: > On Fri, Sep 23, 2011 at 14:30, Richard Purdie > wrote: > ... >> I don't really see the point of this. Basically you're asking that every >> time there is a commit to the branch there is also a merge commit. You >> can just as easily either force a checkout of master, or merge against >> master with a one sided merge. Git doesn't have the confidence to do >> that automatically but I'm pretty sure there is a simple way to tell git >> to do a one sided merge... > > Not every time but at every release and point release. > > one sided merge make you lose all local changes you did. Doesn't seems > a valid upgrade path but a "replace path". I agree that we should do this, personally. I think there's almost always value in merging things back to master on occasion, whether a release branch or a stable branch or anything of the sort. -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] intltool: inherit gettext to add missing dependency on gettext
On Sun, Sep 25, 2011 at 10:16 AM, Richard Purdie wrote: > On Sat, 2011-09-24 at 17:11 -0700, Khem Raj wrote: >> Fixes the error like below >> >> | configure: error: GNU gettext tools not found; required for intltool >> | + bbfatal 'oe_runconf failed' >> | + echo 'ERROR: oe_runconf failed' >> | ERROR: oe_runconf failed >> >> Signed-off-by: Khem Raj >> --- >> meta/recipes-devtools/intltool/intltool.inc | 2 +- >> meta/recipes-devtools/intltool/intltool_0.40.6.bb | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/meta/recipes-devtools/intltool/intltool.inc >> b/meta/recipes-devtools/intltool/intltool.inc >> index 23a1ee9..1e54feb 100644 >> --- a/meta/recipes-devtools/intltool/intltool.inc >> +++ b/meta/recipes-devtools/intltool/intltool.inc >> @@ -12,7 +12,7 @@ DEPENDS_virtclass-native = "libxml-parser-perl-native" >> RRECOMMENDS_${PN} = "perl-modules" >> RRECOMMENDS_${PN}_virtclass-native = "" >> >> -inherit autotools pkgconfig perlnative >> +inherit autotools pkgconfig perlnative gettext >> >> export PERL = "${bindir}/env perl" >> PERL_virtclass-native = "/usr/bin/env nativeperl" >> diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb >> b/meta/recipes-devtools/intltool/intltool_0.40.6.bb >> index e9871fc..eae2b85 100644 >> --- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb >> +++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb >> @@ -1,7 +1,7 @@ >> require intltool.inc >> LICENSE="GPLv2" >> LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" >> -PR = "r5" >> +PR = "r6" >> >> SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \ >> ${NATIVEPATCHES} \ > > I investigated this one and intltool requires gettext at runtime, not > build time. Which package did you see the above error from as I suspect > it wasn't intltool itself but something using it? It was intltool itself. The situation happens during rebuild when intltool and gettext-native both are to be rebuilt and other deps are already there. it doesnt usually happen since we build gettext-native pretty early. > > Cheers, > > Richard > > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] feature-arm-d16.inc: add feature for arm cores which do not have a neon unit or no support for it in the kernel
On Sun, Sep 25, 2011 at 09:53:08PM +0200, Koen Kooi wrote: > > Op 25 sep. 2011, om 21:37 heeft Henning Heinold het volgende geschreven: > > > * call it d16 because of the -mfpu=vfpv3-d16 gcc option and > > avoid naming conflicts with vfp feature > > That's a highly artificial seperation to be honest. Is there really any > demonstrable real world use to it? Hi Koen, do you mean it's really useless gcc option at all or did you mean how to use it in machine.inc file? Bye Henning PS: Sorry for posting it twice. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] feature-arm-d16.inc: add feature for arm cores which do not have a neon unit or no support for it in the kernel
Op 25 sep. 2011, om 21:37 heeft Henning Heinold het volgende geschreven: > * call it d16 because of the -mfpu=vfpv3-d16 gcc option and > avoid naming conflicts with vfp feature That's a highly artificial seperation to be honest. Is there really any demonstrable real world use to it? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] tune-cortexa9.inc: add tunefile for cortexa9 socs
Signed-off-by: Henning Heinold --- meta/conf/machine/include/tune-cortexa9.inc | 24 1 files changed, 24 insertions(+), 0 deletions(-) create mode 100644 meta/conf/machine/include/tune-cortexa9.inc diff --git a/meta/conf/machine/include/tune-cortexa9.inc b/meta/conf/machine/include/tune-cortexa9.inc new file mode 100644 index 000..28049ab --- /dev/null +++ b/meta/conf/machine/include/tune-cortexa9.inc @@ -0,0 +1,24 @@ +DEFAULTTUNE ?= "cortexa9-neon" + +require conf/machine/include/arm/arch-armv7a.inc + +TUNEVALID[cortexa9] = "Enable Cortex-A9 specific processor optimizations" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "cortexa9", "-mtune=cortex-a9", "", d)}" + +# Little Endian base configs +AVAILTUNES += "cortexa9 cortexa9t cortexa9-neon" +TUNE_FEATURES_tune-cortexa9 = "${TUNE_FEATURES_tune-armv7a} cortexa9" +TUNE_FEATURES_tune-cortexa9t = "${TUNE_FEATURES_tune-armv7at} cortexa9" +TUNE_FEATURES_tune-cortexa9-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa9" +PACKAGE_EXTRA_ARCHS_tune-cortexa9 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at}" +PACKAGE_EXTRA_ARCHS_tune-cortexa9t = "${PACKAGE_EXTRA_ARCHS_tune-armv7at}" +PACKAGE_EXTRA_ARCHS_tune-cortexa9-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at-neon}" + +# VFP Tunes +AVAILTUNES += "cortexa9hf cortexa9thf cortexa9hf-neon" +TUNE_FEATURES_tune-cortexa9hf ?= "${TUNE_FEATURES_tune-armv7ahf} cortexa9" +TUNE_FEATURES_tune-cortexa9thf ?= "${TUNE_FEATURES_tune-armv7athf} cortexa9" +TUNE_FEATURES_tune-cortexa9hf-neon ?= "${TUNE_FEATURES_tune-armv7ahf-neon} cortexa9" +PACKAGE_EXTRA_ARCHS_tune-cortexa9hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf}" +PACKAGE_EXTRA_ARCHS_tune-cortexa9thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf}" +PACKAGE_EXTRA_ARCHS_tune-cortexa9hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon}" -- 1.7.6.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] tune: enable d16 feature for cortexa8 and cortexa9
Signed-off-by: Henning Heinold --- meta/conf/machine/include/arm/arch-armv7.inc | 25 + meta/conf/machine/include/arm/arch-armv7a.inc | 24 meta/conf/machine/include/tune-cortexa8.inc |8 ++-- meta/conf/machine/include/tune-cortexa9.inc |8 ++-- 4 files changed, 53 insertions(+), 12 deletions(-) diff --git a/meta/conf/machine/include/arm/arch-armv7.inc b/meta/conf/machine/include/arm/arch-armv7.inc index 8bc8d10..0a45726 100644 --- a/meta/conf/machine/include/arm/arch-armv7.inc +++ b/meta/conf/machine/include/arm/arch-armv7.inc @@ -7,49 +7,66 @@ TUNE_CONFLICTS[armv7] = "armv4 armv5 armv6" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7", "-march=armv7", "", d)}" require conf/machine/include/arm/arch-armv6.inc +require conf/machine/include/arm/feature-arm-d16.inc require conf/machine/include/arm/feature-arm-neon.inc # Little Endian base configs -AVAILTUNES += "armv7 armv7t armv7-neon armv7t-neon" +AVAILTUNES += "armv7 armv7t armv7-d16 armv7t-d16 armv7-neon armv7t-neon" TUNE_FEATURES_tune-armv7 ?= "armv7 vfp" TUNE_FEATURES_tune-armv7t ?= "armv7 vfp thumb" +TUNE_FEATURES_tune-armv7-d16 ?= "armv7 vfp d16" +TUNE_FEATURES_tune-armv7t-d16 ?= "armv7 vfp d16 thumb" TUNE_FEATURES_tune-armv7-neon ?= "armv7 vfp neon" TUNE_FEATURES_tune-armv7t-neon ?= "armv7 vfp neon thumb" PACKAGE_EXTRA_ARCHS_tune-armv7 = "${PACKAGE_EXTRA_ARCHS_tune-armv6} armv7-vfp" PACKAGE_EXTRA_ARCHS_tune-armv7t = "${PACKAGE_EXTRA_ARCHS_tune-armv6t} armv7-vfp armv7t2-vfp" +PACKAGE_EXTRA_ARCHS_tune-armv7-d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7-vfp-d16" +PACKAGE_EXTRA_ARCHS_tune-armv7t-d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7-vfp-d16 armv7at2-vfp-d16" PACKAGE_EXTRA_ARCHS_tune-armv7-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7-vfp-neon" PACKAGE_EXTRA_ARCHS_tune-armv7t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7-vfp-neon armv7at2-vfp-neon" # VFP Tunes -AVAILTUNES += "armv7hf armv7thf armv7hf-neon armv7thf-neon +AVAILTUNES += "armv7hf armv7thf armv7hf-d16 armv7thf-d16 armv7hf-neon armv7thf-neon" TUNE_FEATURES_tune-armv7hf ?= "${TUNE_FEATURES_tune-armv7} callconvention-hard" TUNE_FEATURES_tune-armv7thf ?= "${TUNE_FEATURES_tune-armv7t} callconvention-hard" +TUNE_FEATURES_tune-armv7hf-d16 ?= "${TUNE_FEATURES_tune-armv7-vpf16} callconvention-hard" +TUNE_FEATURES_tune-armv7thf-d16 ?= "${TUNE_FEATURES_tune_armv7t-d16} callconvention-hard" TUNE_FEATURES_tune-armv7hf-neon ?= "${TUNE_FEATURES_tune-armv7-neon} callconvention-hard" TUNE_FEATURES_tune-armv7thf-neon ?= "${TUNE_FEATURES_tune_armv7t-neon} callconvention-hard" PACKAGE_EXTRA_ARCHS_tune-armv7hf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf} armv7hf-vfp" PACKAGE_EXTRA_ARCHS_tune-armv7thf = "${PACKAGE_EXTRA_ARCHS_tune-armv6thf} armv7hf-vfp armv7t2hf-vfp" +PACKAGE_EXTRA_ARCHS_tune-armv7hf-d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7hf} armv7hf-vfp-d16" +PACKAGE_EXTRA_ARCHS_tune-armv7thf-d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7thf} armv7hf-vfp-d16 armv7at2hf-vfp-d16" PACKAGE_EXTRA_ARCHS_tune-armv7hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7hf} armv7hf-vfp-neon" PACKAGE_EXTRA_ARCHS_tune-armv7thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7thf} armv7hf-vfp-neon armv7at2hf-vfp-neon" # Big Endian -AVAILTUNES += "armv7b armv7tb armv7b-neon armv7tb-neon" +AVAILTUNES += "armv7b armv7tb armv7b-d16 armv7tb-d16 armv7b-neon armv7tb-neon" TUNE_FEATURES_tune-armv7b ?= "${TUNE_FEATURES_tune-armv7} bigendian" TUNE_FEATURES_tune-armv7tb ?= "${TUNE_FEATURES_tune-armv7t} bigendian" +TUNE_FEATURES_tune-armv7b-d16 ?= "${TUNE_FEATURES_tune-armv7-d16} bigendian" +TUNE_FEATURES_tune-armv7tb-d16 ?= "${TUNE_FEATURES_tune-armv7t-d16} bigendian" TUNE_FEATURES_tune-armv7b-neon ?= "${TUNE_FEATURES_tune-armv7-neon} bigendian" TUNE_FEATURES_tune-armv7tb-neon ?= "${TUNE_FEATURES_tune-armv7t-neon} bigendian" PACKAGE_EXTRA_ARCHS_tune-armv7b = "${PACKAGE_EXTRA_ARCHS_tune-armv6} armv7b-vfp" PACKAGE_EXTRA_ARCHS_tune-armv7tb = "${PACKAGE_EXTRA_ARCHS_tune-armv6t} armv7b-vfp armv7t2b-vfp" +PACKAGE_EXTRA_ARCHS_tune-armv7b-d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7b-vfp-d16" +PACKAGE_EXTRA_ARCHS_tune-armv7tb-d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7b-vfp-d16 armv7at2b-vfp-d16" PACKAGE_EXTRA_ARCHS_tune-armv7b-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7b-vfp-neon" PACKAGE_EXTRA_ARCHS_tune-armv7tb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7b-vfp-neon armv7at2b-vfp-neon" # Big Endian + VFP -AVAILTUNES += "armv7hfb armv7thfb armv7hfb-neon armv7thfb-neon" +AVAILTUNES += "armv7hfb armv7thfb armv7hfb-d16 armv7thfb-d16 armv7hfb-neon armv7thfb-neon" TUNE_FEATURES_tune-armv7hfb ?= "${TUNE_FEATURES_tune-armv7b} callconvention-hard" TUNE_FEATURES_tune-armv7thfb ?= "${TUNE_FEATURES_tune-armv7tb} callconvention-hard" +TUNE_FEATURES_tune-armv7hfb-d16 ?= "${TUNE_FEATURES_tune-armv7b-d16} callconvention-hard" +TUNE_FEATURES_tune-armv7thfb-d16 ?= "${TUNE_FEATURES_tune_armv7tb-d16} cal
[OE-core] [PATCH 2/3] feature-arm-d16.inc: add feature for arm cores which do not have a neon unit or no support for it in the kernel
* call it d16 because of the -mfpu=vfpv3-d16 gcc option and avoid naming conflicts with vfp feature Signed-off-by: Henning Heinold --- meta/conf/machine/include/arm/feature-arm-d16.inc |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) create mode 100644 meta/conf/machine/include/arm/feature-arm-d16.inc diff --git a/meta/conf/machine/include/arm/feature-arm-d16.inc b/meta/conf/machine/include/arm/feature-arm-d16.inc new file mode 100644 index 000..1230ee9 --- /dev/null +++ b/meta/conf/machine/include/arm/feature-arm-d16.inc @@ -0,0 +1,3 @@ +TUNEVALID[d16] = "Enable SIMD accelerator unit on cores which don't have neon." +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "d16", "-mfpu=vfpv3-d16", "" ,d)}" +ARMPKGSFX_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "d16", "-d16", "" ,d)}" -- 1.7.6.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] adding cortexa9 tune file and feature for arm socs whithout neon
Hi, the series adding the tune file for cortexa9 which is in pandaboard or tegra2. It also adds a feature for socs like the tegra2 which has no neon unit and enables it for cortexa8 and cortexa9 Bye Henning Henning Heinold (3): tune-cortexa9.inc: add tunefile for cortexa9 socs feature-arm-d16.inc: add feature for arm cores which do not have a neon unit or no support for it in the kernel tune: enable d16 feature for cortexa8 and cortexa9 meta/conf/machine/include/arm/arch-armv7.inc | 25 +++--- meta/conf/machine/include/arm/arch-armv7a.inc | 24 +++--- meta/conf/machine/include/arm/feature-arm-d16.inc |3 ++ meta/conf/machine/include/tune-cortexa8.inc |8 - meta/conf/machine/include/tune-cortexa9.inc | 28 + 5 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 meta/conf/machine/include/arm/feature-arm-d16.inc create mode 100644 meta/conf/machine/include/tune-cortexa9.inc -- 1.7.6.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] feature-arm-d16.inc: add feature for arm cores which do not have a neon unit or no support for it in the kernel
* call it d16 because of the -mfpu=vfpv3-d16 gcc option and avoid naming conflicts with vfp feature Signed-off-by: Henning Heinold --- meta/conf/machine/include/arm/feature-arm-d16.inc |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) create mode 100644 meta/conf/machine/include/arm/feature-arm-d16.inc diff --git a/meta/conf/machine/include/arm/feature-arm-d16.inc b/meta/conf/machine/include/arm/feature-arm-d16.inc new file mode 100644 index 000..1230ee9 --- /dev/null +++ b/meta/conf/machine/include/arm/feature-arm-d16.inc @@ -0,0 +1,3 @@ +TUNEVALID[d16] = "Enable SIMD accelerator unit on cores which don't have neon." +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "d16", "-mfpu=vfpv3-d16", "" ,d)}" +ARMPKGSFX_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "d16", "-d16", "" ,d)}" -- 1.7.6.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] adding cortexa9 tune file and feature for arm socs whithout neon
Hi, the series adding the tune file for cortexa9 which is in pandaboard or tegra2. It also adds a feature for socs like the tegra2 which has no neon unit and enables it for cortexa8 and cortexa9 Bye Henning Henning Heinold (3): tune-cortexa9.inc: add tunefile for cortexa9 socs feature-arm-d16.inc: add feature for arm cores which do not have a neon unit or no support for it in the kernel tune: enable d16 feature for cortexa8 and cortexa9 meta/conf/machine/include/arm/arch-armv7.inc | 25 +++--- meta/conf/machine/include/arm/arch-armv7a.inc | 24 +++--- meta/conf/machine/include/arm/feature-arm-d16.inc |3 ++ meta/conf/machine/include/tune-cortexa8.inc |8 - meta/conf/machine/include/tune-cortexa9.inc | 28 + 5 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 meta/conf/machine/include/arm/feature-arm-d16.inc create mode 100644 meta/conf/machine/include/tune-cortexa9.inc -- 1.7.6.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] tune: enable d16 feature for cortexa8 and cortexa9
Signed-off-by: Henning Heinold --- meta/conf/machine/include/arm/arch-armv7.inc | 25 + meta/conf/machine/include/arm/arch-armv7a.inc | 24 meta/conf/machine/include/tune-cortexa8.inc |8 ++-- meta/conf/machine/include/tune-cortexa9.inc |8 ++-- 4 files changed, 53 insertions(+), 12 deletions(-) diff --git a/meta/conf/machine/include/arm/arch-armv7.inc b/meta/conf/machine/include/arm/arch-armv7.inc index 8bc8d10..0a45726 100644 --- a/meta/conf/machine/include/arm/arch-armv7.inc +++ b/meta/conf/machine/include/arm/arch-armv7.inc @@ -7,49 +7,66 @@ TUNE_CONFLICTS[armv7] = "armv4 armv5 armv6" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7", "-march=armv7", "", d)}" require conf/machine/include/arm/arch-armv6.inc +require conf/machine/include/arm/feature-arm-d16.inc require conf/machine/include/arm/feature-arm-neon.inc # Little Endian base configs -AVAILTUNES += "armv7 armv7t armv7-neon armv7t-neon" +AVAILTUNES += "armv7 armv7t armv7-d16 armv7t-d16 armv7-neon armv7t-neon" TUNE_FEATURES_tune-armv7 ?= "armv7 vfp" TUNE_FEATURES_tune-armv7t ?= "armv7 vfp thumb" +TUNE_FEATURES_tune-armv7-d16 ?= "armv7 vfp d16" +TUNE_FEATURES_tune-armv7t-d16 ?= "armv7 vfp d16 thumb" TUNE_FEATURES_tune-armv7-neon ?= "armv7 vfp neon" TUNE_FEATURES_tune-armv7t-neon ?= "armv7 vfp neon thumb" PACKAGE_EXTRA_ARCHS_tune-armv7 = "${PACKAGE_EXTRA_ARCHS_tune-armv6} armv7-vfp" PACKAGE_EXTRA_ARCHS_tune-armv7t = "${PACKAGE_EXTRA_ARCHS_tune-armv6t} armv7-vfp armv7t2-vfp" +PACKAGE_EXTRA_ARCHS_tune-armv7-d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7-vfp-d16" +PACKAGE_EXTRA_ARCHS_tune-armv7t-d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7-vfp-d16 armv7at2-vfp-d16" PACKAGE_EXTRA_ARCHS_tune-armv7-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7-vfp-neon" PACKAGE_EXTRA_ARCHS_tune-armv7t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7-vfp-neon armv7at2-vfp-neon" # VFP Tunes -AVAILTUNES += "armv7hf armv7thf armv7hf-neon armv7thf-neon +AVAILTUNES += "armv7hf armv7thf armv7hf-d16 armv7thf-d16 armv7hf-neon armv7thf-neon" TUNE_FEATURES_tune-armv7hf ?= "${TUNE_FEATURES_tune-armv7} callconvention-hard" TUNE_FEATURES_tune-armv7thf ?= "${TUNE_FEATURES_tune-armv7t} callconvention-hard" +TUNE_FEATURES_tune-armv7hf-d16 ?= "${TUNE_FEATURES_tune-armv7-vpf16} callconvention-hard" +TUNE_FEATURES_tune-armv7thf-d16 ?= "${TUNE_FEATURES_tune_armv7t-d16} callconvention-hard" TUNE_FEATURES_tune-armv7hf-neon ?= "${TUNE_FEATURES_tune-armv7-neon} callconvention-hard" TUNE_FEATURES_tune-armv7thf-neon ?= "${TUNE_FEATURES_tune_armv7t-neon} callconvention-hard" PACKAGE_EXTRA_ARCHS_tune-armv7hf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf} armv7hf-vfp" PACKAGE_EXTRA_ARCHS_tune-armv7thf = "${PACKAGE_EXTRA_ARCHS_tune-armv6thf} armv7hf-vfp armv7t2hf-vfp" +PACKAGE_EXTRA_ARCHS_tune-armv7hf-d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7hf} armv7hf-vfp-d16" +PACKAGE_EXTRA_ARCHS_tune-armv7thf-d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7thf} armv7hf-vfp-d16 armv7at2hf-vfp-d16" PACKAGE_EXTRA_ARCHS_tune-armv7hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7hf} armv7hf-vfp-neon" PACKAGE_EXTRA_ARCHS_tune-armv7thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7thf} armv7hf-vfp-neon armv7at2hf-vfp-neon" # Big Endian -AVAILTUNES += "armv7b armv7tb armv7b-neon armv7tb-neon" +AVAILTUNES += "armv7b armv7tb armv7b-d16 armv7tb-d16 armv7b-neon armv7tb-neon" TUNE_FEATURES_tune-armv7b ?= "${TUNE_FEATURES_tune-armv7} bigendian" TUNE_FEATURES_tune-armv7tb ?= "${TUNE_FEATURES_tune-armv7t} bigendian" +TUNE_FEATURES_tune-armv7b-d16 ?= "${TUNE_FEATURES_tune-armv7-d16} bigendian" +TUNE_FEATURES_tune-armv7tb-d16 ?= "${TUNE_FEATURES_tune-armv7t-d16} bigendian" TUNE_FEATURES_tune-armv7b-neon ?= "${TUNE_FEATURES_tune-armv7-neon} bigendian" TUNE_FEATURES_tune-armv7tb-neon ?= "${TUNE_FEATURES_tune-armv7t-neon} bigendian" PACKAGE_EXTRA_ARCHS_tune-armv7b = "${PACKAGE_EXTRA_ARCHS_tune-armv6} armv7b-vfp" PACKAGE_EXTRA_ARCHS_tune-armv7tb = "${PACKAGE_EXTRA_ARCHS_tune-armv6t} armv7b-vfp armv7t2b-vfp" +PACKAGE_EXTRA_ARCHS_tune-armv7b-d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7b-vfp-d16" +PACKAGE_EXTRA_ARCHS_tune-armv7tb-d16 = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7b-vfp-d16 armv7at2b-vfp-d16" PACKAGE_EXTRA_ARCHS_tune-armv7b-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7b-vfp-neon" PACKAGE_EXTRA_ARCHS_tune-armv7tb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7b-vfp-neon armv7at2b-vfp-neon" # Big Endian + VFP -AVAILTUNES += "armv7hfb armv7thfb armv7hfb-neon armv7thfb-neon" +AVAILTUNES += "armv7hfb armv7thfb armv7hfb-d16 armv7thfb-d16 armv7hfb-neon armv7thfb-neon" TUNE_FEATURES_tune-armv7hfb ?= "${TUNE_FEATURES_tune-armv7b} callconvention-hard" TUNE_FEATURES_tune-armv7thfb ?= "${TUNE_FEATURES_tune-armv7tb} callconvention-hard" +TUNE_FEATURES_tune-armv7hfb-d16 ?= "${TUNE_FEATURES_tune-armv7b-d16} callconvention-hard" +TUNE_FEATURES_tune-armv7thfb-d16 ?= "${TUNE_FEATURES_tune_armv7tb-d16} cal
[OE-core] [PATCH 1/3] tune-cortexa9.inc: add tunefile for cortexa9 socs
Signed-off-by: Henning Heinold --- meta/conf/machine/include/tune-cortexa9.inc | 24 1 files changed, 24 insertions(+), 0 deletions(-) create mode 100644 meta/conf/machine/include/tune-cortexa9.inc diff --git a/meta/conf/machine/include/tune-cortexa9.inc b/meta/conf/machine/include/tune-cortexa9.inc new file mode 100644 index 000..28049ab --- /dev/null +++ b/meta/conf/machine/include/tune-cortexa9.inc @@ -0,0 +1,24 @@ +DEFAULTTUNE ?= "cortexa9-neon" + +require conf/machine/include/arm/arch-armv7a.inc + +TUNEVALID[cortexa9] = "Enable Cortex-A9 specific processor optimizations" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "cortexa9", "-mtune=cortex-a9", "", d)}" + +# Little Endian base configs +AVAILTUNES += "cortexa9 cortexa9t cortexa9-neon" +TUNE_FEATURES_tune-cortexa9 = "${TUNE_FEATURES_tune-armv7a} cortexa9" +TUNE_FEATURES_tune-cortexa9t = "${TUNE_FEATURES_tune-armv7at} cortexa9" +TUNE_FEATURES_tune-cortexa9-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa9" +PACKAGE_EXTRA_ARCHS_tune-cortexa9 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at}" +PACKAGE_EXTRA_ARCHS_tune-cortexa9t = "${PACKAGE_EXTRA_ARCHS_tune-armv7at}" +PACKAGE_EXTRA_ARCHS_tune-cortexa9-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at-neon}" + +# VFP Tunes +AVAILTUNES += "cortexa9hf cortexa9thf cortexa9hf-neon" +TUNE_FEATURES_tune-cortexa9hf ?= "${TUNE_FEATURES_tune-armv7ahf} cortexa9" +TUNE_FEATURES_tune-cortexa9thf ?= "${TUNE_FEATURES_tune-armv7athf} cortexa9" +TUNE_FEATURES_tune-cortexa9hf-neon ?= "${TUNE_FEATURES_tune-armv7ahf-neon} cortexa9" +PACKAGE_EXTRA_ARCHS_tune-cortexa9hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf}" +PACKAGE_EXTRA_ARCHS_tune-cortexa9thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf}" +PACKAGE_EXTRA_ARCHS_tune-cortexa9hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon}" -- 1.7.6.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 04/10] dbus-glib: include bash-completion stuff
* Otavio Salvador [110925 19:34]: > On Sun, Sep 25, 2011 at 14:20, Richard Purdie > wrote: > > On Fri, 2011-09-23 at 17:09 -0300, Otavio Salvador wrote: > >> On Fri, Sep 23, 2011 at 16:46, Dmitry Eremin-Solenikov > >> wrote: > >> ... > >> > +FILES_${PN} = "${libdir}/lib*.so.* \ > >> > + ${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \ > >> > + ${libexecdir}/dbus-bash-completion-helper" > >> ... > >> I'd prefer to have this in another package. > > Me too, I think this should be packaged separately (with a RRECOMMENDS > > on bash-completion for good measure). > I don't think RRECOMMENDS are good in this case; people were using it > without this for long time and noone has noticed yet so it seems not > that required. I think Richard meant that the new dbus-glib-bash-completion(?) package should have a RRECOMMENDS on bash-completion (as it will be pretty useless on a system without bash-completion). Dbus-glib should definitely not start to RRECOMMEND bash-completion, as noone has requested that for a long time. Cheers, Anders -- Anders Darander ChargeStorm AB / eStorm AB ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 04/10] dbus-glib: include bash-completion stuff
On Sun, 2011-09-25 at 14:34 -0300, Otavio Salvador wrote: > On Sun, Sep 25, 2011 at 14:20, Richard Purdie > wrote: > > On Fri, 2011-09-23 at 17:09 -0300, Otavio Salvador wrote: > >> On Fri, Sep 23, 2011 at 16:46, Dmitry Eremin-Solenikov > >> wrote: > >> ... > >> > +FILES_${PN} = "${libdir}/lib*.so.* \ > >> > + ${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \ > >> > + ${libexecdir}/dbus-bash-completion-helper" > >> ... > >> > >> I'd prefer to have this in another package. > > > > Me too, I think this should be packaged separately (with a RRECOMMENDS > > on bash-completion for good measure). > > I don't think RRECOMMENDS are good in this case; people were using it > without this for long time and noone has noticed yet so it seems not > that required. I mean having dbus-glib-bash-completion RRECOMMENDS bash-completion. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 04/10] dbus-glib: include bash-completion stuff
On Sun, Sep 25, 2011 at 14:20, Richard Purdie wrote: > On Fri, 2011-09-23 at 17:09 -0300, Otavio Salvador wrote: >> On Fri, Sep 23, 2011 at 16:46, Dmitry Eremin-Solenikov >> wrote: >> ... >> > +FILES_${PN} = "${libdir}/lib*.so.* \ >> > + ${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \ >> > + ${libexecdir}/dbus-bash-completion-helper" >> ... >> >> I'd prefer to have this in another package. > > Me too, I think this should be packaged separately (with a RRECOMMENDS > on bash-completion for good measure). I don't think RRECOMMENDS are good in this case; people were using it without this for long time and noone has noticed yet so it seems not that required. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gnome-doc-utils: Prepend PKG_CONFIG_SYSROOT_DIR to the path returned from PKG_CONFIG
On Fri, 2011-09-23 at 22:54 -0700, Khem Raj wrote: > If we build say gnome based image on a build system which does not have > gnome e.g. kubuntu then packages like gedit do not build since it uses > gnome files from host system which are non existent on kubuntu > > Signed-off-by: Khem Raj > --- > .../gnome-doc-utils/sysrooted-pkg-config.patch | 37 > > meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |6 ++- > 2 files changed, 41 insertions(+), 2 deletions(-) > create mode 100644 > meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch > Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 05/10] eglibc: fix packaging of some of nativesdk packages, V2
On Fri, 2011-09-23 at 23:46 +0400, Dmitry Eremin-Solenikov wrote: > eglibc.inc contains packaging rules that depend on PKGSUFFIX expansion. > However that variable wasn't expanded properly in some case. E.g. > > PACKAGES = " ... nscd${PKGSUFFIX} ..." > FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" > > would be expanded to > > PACKAGES = " ... nscd-nativesdk ..." > FILES_nscd = "${sbindir}/nscd*" > > Thus leading to empty -nativesdk packages and missing files. To overcome > that use python code blob to properly define PKGSUFFIX variable. > > As a change from V1, fix the glibc-thread-db related problem by using > ${PN} instead of eglibc-XXX-nativesdk for extra-nss and thread-db > packages. > > Signed-off-by: Dmitry Eremin-Solenikov I've merged the pieces of this patch series that didn't get feedback. I'm still not 100% convinced this patch is right. I'd like to understand more about the errors you're seeing that area leading you to submit it... Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 04/10] dbus-glib: include bash-completion stuff
On Fri, 2011-09-23 at 17:09 -0300, Otavio Salvador wrote: > On Fri, Sep 23, 2011 at 16:46, Dmitry Eremin-Solenikov > wrote: > ... > > +FILES_${PN} = "${libdir}/lib*.so.* \ > > + ${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \ > > + ${libexecdir}/dbus-bash-completion-helper" > ... > > I'd prefer to have this in another package. Me too, I think this should be packaged separately (with a RRECOMMENDS on bash-completion for good measure). Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] intltool: inherit gettext to add missing dependency on gettext
On Sat, 2011-09-24 at 17:11 -0700, Khem Raj wrote: > Fixes the error like below > > | configure: error: GNU gettext tools not found; required for intltool > | + bbfatal 'oe_runconf failed' > | + echo 'ERROR: oe_runconf failed' > | ERROR: oe_runconf failed > > Signed-off-by: Khem Raj > --- > meta/recipes-devtools/intltool/intltool.inc |2 +- > meta/recipes-devtools/intltool/intltool_0.40.6.bb |2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-devtools/intltool/intltool.inc > b/meta/recipes-devtools/intltool/intltool.inc > index 23a1ee9..1e54feb 100644 > --- a/meta/recipes-devtools/intltool/intltool.inc > +++ b/meta/recipes-devtools/intltool/intltool.inc > @@ -12,7 +12,7 @@ DEPENDS_virtclass-native = "libxml-parser-perl-native" > RRECOMMENDS_${PN} = "perl-modules" > RRECOMMENDS_${PN}_virtclass-native = "" > > -inherit autotools pkgconfig perlnative > +inherit autotools pkgconfig perlnative gettext > > export PERL = "${bindir}/env perl" > PERL_virtclass-native = "/usr/bin/env nativeperl" > diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb > b/meta/recipes-devtools/intltool/intltool_0.40.6.bb > index e9871fc..eae2b85 100644 > --- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb > +++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb > @@ -1,7 +1,7 @@ > require intltool.inc > LICENSE="GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" > -PR = "r5" > +PR = "r6" > > SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \ > ${NATIVEPATCHES} \ I investigated this one and intltool requires gettext at runtime, not build time. Which package did you see the above error from as I suspect it wasn't intltool itself but something using it? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] v2 of attr/acl with qemuimage-testlib fix
On Sun, 2011-09-25 at 15:29 +0100, Richard Purdie wrote: > On Sat, 2011-09-24 at 11:56 -0700, Saul Wold wrote: > > Richard, > > > > These 2 patches would be for edison > > > > Sau! > > > > The following changes since commit 368b150416688654e35229a63b87177b52e83d02: > > > > populate_sdk_rpm: add pkgconfig(pkg-config) to the list (2011-09-23 > > 19:55:43 +0100) > > > > are available in the git repository at: > > git://git.yoctoproject.org/poky-contrib sgw/oe-fix > > http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/oe-fix > > > > Saul Wold (2): > > attr/acl: add SSTATEPOSTINSTFUNC > > qemuimage-testlib: set a default geometry for xterm > > I've merged the first of these, thanks. I'm holding off the second until > we see the problem on the autobuilder is fixed, this doesn't have seemed > to have done so :( Just to follow up, we're going to fix this with Xdefaults files on the autobuilder so I'll not take this patch. Saul: Can we document this somewhere (autobuilder repo's README maybe)? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 6/9] libtool: Fix an issue where unnecessary rpaths were being injected
Op 25 sep. 2011, om 17:56 heeft Richard Purdie het volgende geschreven: > libtool was being to aggressive in adding rpath to binaries. This > change stops it adding them if that path the default search path. > > Signed-off-by: Richard Purdie > --- > meta/recipes-devtools/libtool/libtool-cross_2.4.bb |2 +- > .../recipes-devtools/libtool/libtool-native_2.4.bb |2 +- > .../libtool/libtool-nativesdk_2.4.bb |2 +- > meta/recipes-devtools/libtool/libtool.inc |3 +- > meta/recipes-devtools/libtool/libtool/1| 55 + > .../libtool/libtool/fix-rpath.patch| 63 > meta/recipes-devtools/libtool/libtool_2.4.bb |2 +- > 7 files changed, 124 insertions(+), 5 deletions(-) > create mode 100644 meta/recipes-devtools/libtool/libtool/1 > create mode 100644 meta/recipes-devtools/libtool/libtool/fix-rpath.patch > > diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb > b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb > index 25ac580..6d512b1 100644 > --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb > +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb > @@ -1,6 +1,6 @@ > require libtool-${PV}.inc > > -PR = "r2" > +PR = "r4" > PACKAGES = "" > SRC_URI += "file://prefix.patch" > > diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb > b/meta/recipes-devtools/libtool/libtool-native_2.4.bb > index 423622f..3d0998e 100644 > --- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb > +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.bb > @@ -2,7 +2,7 @@ require libtool-${PV}.inc > > DEPENDS = "" > > -PR = "r2" > +PR = "r4" > SRC_URI += "file://prefix.patch" > > inherit native > diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb > b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb > index 4f67fed..a96d1d1 100644 > --- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb > +++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb > @@ -1,6 +1,6 @@ > require libtool-${PV}.inc > > -PR = "r2" > +PR = "r4" > SRC_URI += "file://prefix.patch" > > inherit nativesdk > diff --git a/meta/recipes-devtools/libtool/libtool.inc > b/meta/recipes-devtools/libtool/libtool.inc > index d423e49..ef9095b 100644 > --- a/meta/recipes-devtools/libtool/libtool.inc > +++ b/meta/recipes-devtools/libtool/libtool.inc > @@ -15,7 +15,8 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ >file://resolve-sysroot.patch \ >file://use-sysroot-in-libpath.patch \ >file://fix-final-rpath.patch \ > - file://avoid_absolute_paths_for_general_utils.patch " > + file://avoid_absolute_paths_for_general_utils.patch \ > + file://fix-rpath.patch " > > do_compile_prepend () { > # Sometimes this file doesn't get rebuilt, force the issue > diff --git a/meta/recipes-devtools/libtool/libtool/1 > b/meta/recipes-devtools/libtool/libtool/1 > new file mode 100644 > index 000..b3ee955 > --- /dev/null > +++ b/meta/recipes-devtools/libtool/libtool/1 stray file? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/9] libtool: Fix an issue where unnecessary rpaths were being injected
libtool was being to aggressive in adding rpath to binaries. This change stops it adding them if that path the default search path. Signed-off-by: Richard Purdie --- meta/recipes-devtools/libtool/libtool-cross_2.4.bb |2 +- .../recipes-devtools/libtool/libtool-native_2.4.bb |2 +- .../libtool/libtool-nativesdk_2.4.bb |2 +- meta/recipes-devtools/libtool/libtool.inc |3 +- meta/recipes-devtools/libtool/libtool/1| 55 + .../libtool/libtool/fix-rpath.patch| 63 meta/recipes-devtools/libtool/libtool_2.4.bb |2 +- 7 files changed, 124 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-devtools/libtool/libtool/1 create mode 100644 meta/recipes-devtools/libtool/libtool/fix-rpath.patch diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb index 25ac580..6d512b1 100644 --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb @@ -1,6 +1,6 @@ require libtool-${PV}.inc -PR = "r2" +PR = "r4" PACKAGES = "" SRC_URI += "file://prefix.patch" diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.bb index 423622f..3d0998e 100644 --- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.bb @@ -2,7 +2,7 @@ require libtool-${PV}.inc DEPENDS = "" -PR = "r2" +PR = "r4" SRC_URI += "file://prefix.patch" inherit native diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb index 4f67fed..a96d1d1 100644 --- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb @@ -1,6 +1,6 @@ require libtool-${PV}.inc -PR = "r2" +PR = "r4" SRC_URI += "file://prefix.patch" inherit nativesdk diff --git a/meta/recipes-devtools/libtool/libtool.inc b/meta/recipes-devtools/libtool/libtool.inc index d423e49..ef9095b 100644 --- a/meta/recipes-devtools/libtool/libtool.inc +++ b/meta/recipes-devtools/libtool/libtool.inc @@ -15,7 +15,8 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://resolve-sysroot.patch \ file://use-sysroot-in-libpath.patch \ file://fix-final-rpath.patch \ - file://avoid_absolute_paths_for_general_utils.patch " + file://avoid_absolute_paths_for_general_utils.patch \ + file://fix-rpath.patch " do_compile_prepend () { # Sometimes this file doesn't get rebuilt, force the issue diff --git a/meta/recipes-devtools/libtool/libtool/1 b/meta/recipes-devtools/libtool/libtool/1 new file mode 100644 index 000..b3ee955 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/1 @@ -0,0 +1,55 @@ +Index: libtool-2.4/libltdl/config/ltmain.m4sh +=== +--- libtool-2.4.orig/libltdl/config/ltmain.m4sh2011-09-23 08:38:06.365043626 +0100 libtool-2.4/libltdl/config/ltmain.m4sh 2011-09-23 09:57:05.235003068 +0100 +@@ -7264,8 +7264,14 @@ + esac + fi + else +- eval flag=\"$hardcode_libdir_flag_spec\" +- func_append dep_rpath " $flag" ++# We only want to hardcode in an rpath if it isn't in the ++# default dlsearch path. ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append dep_rpath " $flag" ++ ;; ++ esac + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in +@@ -8001,8 +8007,14 @@ + esac + fi + else +- eval flag=\"$hardcode_libdir_flag_spec\" +- func_append rpath " $flag" ++# We only want to hardcode in an rpath if it isn't in the ++# default dlsearch path. ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) eval flag=\"$hardcode_libdir_flag_spec\" ++ rpath+=" $flag" ++ ;; ++ esac + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in +@@ -8052,8 +8064,14 @@ + esac + fi + else +- eval flag=\"$hardcode_libdir_flag_spec\" +- func_append rpath " $flag" ++# We only want to hardcode in an rpath if it isn't in the ++# default dlsearch path. ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" ++ ;; ++ esac + fi + elif test -n "$runpath_var"; then + case "$fina
[OE-core] [PATCH 0/9] Various misc fixes/cleanups
I've placed various misc fixes/cleanups into the git repository at: git://git.openembedded.org/openembedded-core-contrib rpurdie/master http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rpurdie/master Richard Purdie (9): gnome-desktop: Ensure we're deterministic about startup-notification dependency gtk+: Explicitly disable xinerama since we don't have it as a DEPENDS cairo: Disable bfd symbol loopup since we don't list it in DEPENDS libsndfile1: Disable external codec librbaries since we don't list in DEPENDS neon: Add libproxy to DEPENDS to ensure determinstic builds libtool: Fix an issue where unnecessary rpaths were being injected autotools.bbclass: Set the dynamic linker search path for libtool correctly base.bbclass: Drop legacy code that is no longer useful/used sstate: No need to spew out a debug message per file, summarise instead meta/classes/autotools.bbclass |2 + meta/classes/base.bbclass | 30 - meta/classes/native.bbclass|3 + meta/classes/sstate.bbclass|7 +- meta/recipes-devtools/libtool/libtool-cross_2.4.bb |2 +- .../recipes-devtools/libtool/libtool-native_2.4.bb |2 +- .../libtool/libtool-nativesdk_2.4.bb |2 +- meta/recipes-devtools/libtool/libtool.inc |3 +- meta/recipes-devtools/libtool/libtool/1| 55 + .../libtool/libtool/fix-rpath.patch| 63 meta/recipes-devtools/libtool/libtool_2.4.bb |2 +- meta/recipes-gnome/gnome/gnome-desktop.inc |4 +- meta/recipes-gnome/gtk+/gtk+_2.22.1.bb |4 +- meta/recipes-graphics/cairo/cairo.inc |3 + meta/recipes-graphics/cairo/cairo_1.10.2.bb|2 +- .../libsndfile/libsndfile1_1.0.24.bb |4 +- meta/recipes-support/neon/neon_0.29.5.bb |4 +- 17 files changed, 146 insertions(+), 46 deletions(-) create mode 100644 meta/recipes-devtools/libtool/libtool/1 create mode 100644 meta/recipes-devtools/libtool/libtool/fix-rpath.patch -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 9/9] sstate: No need to spew out a debug message per file, summarise instead
Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 91f209a..eee04ab 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -114,15 +114,16 @@ def sstate_install(ss, d): for state in ss['dirs']: oe.path.copytree(state[1], state[2]) for walkroot, dirs, files in os.walk(state[1]): +bb.debug(2, "Staging files from %s to %s" % (state[1], state[2])) for file in files: srcpath = os.path.join(walkroot, file) dstpath = srcpath.replace(state[1], state[2]) -bb.debug(2, "Staging %s to %s" % (srcpath, dstpath)) +#bb.debug(2, "Staging %s to %s" % (srcpath, dstpath)) sharedfiles.append(dstpath) for dir in dirs: srcdir = os.path.join(walkroot, dir) dstdir = srcdir.replace(state[1], state[2]) -bb.debug(2, "Staging %s to %s" % (srcdir, dstdir)) +#bb.debug(2, "Staging %s to %s" % (srcdir, dstdir)) if not dstdir.endswith("/"): dstdir = dstdir + "/" shareddirs.append(dstdir) @@ -355,12 +356,12 @@ def sstate_package(ss, d): for file in files: srcpath = os.path.join(walkroot, file) dstpath = srcpath.replace(state[1], sstatebuild + state[0]) -bb.debug(2, "Preparing %s for packaging at %s" % (srcpath, dstpath)) make_relative_symlink(srcpath, dstpath, d) for dir in dirs: srcpath = os.path.join(walkroot, dir) dstpath = srcpath.replace(state[1], sstatebuild + state[0]) make_relative_symlink(srcpath, dstpath, d) +bb.debug(2, "Preparing tree %s for packaging at %s" % (state[1], sstatebuild + state[0])) oe.path.copytree(state[1], sstatebuild + state[0]) workdir = bb.data.getVar('WORKDIR', d, True) -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/9] neon: Add libproxy to DEPENDS to ensure determinstic builds
Signed-off-by: Richard Purdie --- meta/recipes-support/neon/neon_0.29.5.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/neon/neon_0.29.5.bb b/meta/recipes-support/neon/neon_0.29.5.bb index 4653a28..8201ffe 100644 --- a/meta/recipes-support/neon/neon_0.29.5.bb +++ b/meta/recipes-support/neon/neon_0.29.5.bb @@ -4,9 +4,9 @@ SECTION = "libs" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037" -DEPENDS = "zlib libxml2 expat time gnutls" +DEPENDS = "zlib libxml2 expat time gnutls libproxy" -PR = "r0" +PR = "r1" SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \ file://pkgconfig.patch" -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/9] gnome-desktop: Ensure we're deterministic about startup-notification dependency
Without this change we may or may not include startup-notification support. We therefore explictly include it in the dependency list. Signed-off-by: Richard Purdie --- meta/recipes-gnome/gnome/gnome-desktop.inc |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc index 1317fff..cfc1c2e 100644 --- a/meta/recipes-gnome/gnome/gnome-desktop.inc +++ b/meta/recipes-gnome/gnome/gnome-desktop.inc @@ -1,7 +1,7 @@ DESCRIPTION = "GNOME library for reading .desktop files" SECTION = "x11/gnome" LICENSE = "GPLv2 & LGPLv2" -DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" +DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification" EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" @@ -11,7 +11,7 @@ do_configure_prepend () { FILES_${PN} += "${datadir}/gnome-about" -PR = "r2" +PR = "r3" inherit gnome pkgconfig -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/9] gtk+: Explicitly disable xinerama since we don't have it as a DEPENDS
Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk+/gtk+_2.22.1.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb index a52250d..ea8a5cb 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" -PR = "r4" +PR = "r5" SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \ file://xsettings.patch \ @@ -31,7 +31,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \ SRC_URI[md5sum] = "fdce46ba354c155230b7d4090b17f7d9" SRC_URI[sha256sum] = "965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07" -EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups" +EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups --disable-xinerama" LIBV = "2.10.0" -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/9] libsndfile1: Disable external codec librbaries since we don't list in DEPENDS
Signed-off-by: Richard Purdie --- .../libsndfile/libsndfile1_1.0.24.bb |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.24.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.24.bb index a547d76..7b8bcae 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.24.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.24.bb @@ -4,7 +4,7 @@ AUTHOR = "Erik de Castro Lopo" DEPENDS = "sqlite3" SECTION = "libs/multimedia" LICENSE = "LGPLv2.1" -PR = "r0" +PR = "r1" SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz"; @@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a" S = "${WORKDIR}/libsndfile-${PV}" +EXTRA_OECONF = "--disable-external-libs" + inherit autotools lib_package pkgconfig do_configure_prepend_arm() { -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/9] cairo: Disable bfd symbol loopup since we don't list it in DEPENDS
Signed-off-by: Richard Purdie --- meta/recipes-graphics/cairo/cairo.inc |3 +++ meta/recipes-graphics/cairo/cairo_1.10.2.bb |2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index c983a89..876acad 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -18,3 +18,6 @@ require cairo-fpu.inc EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" inherit autotools pkgconfig + +# We don't depend on binutils so we need to disable this +export ac_cv_lib_bfd_bfd_openr=no \ No newline at end of file diff --git a/meta/recipes-graphics/cairo/cairo_1.10.2.bb b/meta/recipes-graphics/cairo/cairo_1.10.2.bb index d2cadd2..8202860 100644 --- a/meta/recipes-graphics/cairo/cairo_1.10.2.bb +++ b/meta/recipes-graphics/cairo/cairo_1.10.2.bb @@ -2,7 +2,7 @@ require cairo.inc LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" -PR = "r1" +PR = "r2" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"; -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/9] base.bbclass: Drop legacy code that is no longer useful/used
The code displaying console events has been handled by the bitbake UI since 1.8 so the legacy code path can be removed. If a log event is wanted, there are much better (and more complete) ways to do this so remove the EVENTLOG code too. Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 30 -- 1 files changed, 0 insertions(+), 30 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 918d859..9144f9c 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -205,31 +205,7 @@ python base_eventhandler() { from bb import note, error, data from bb.event import getName - messages = {} - messages["Completed"] = "completed" - messages["Succeeded"] = "completed" - messages["Started"] = "started" - messages["Failed"] = "failed" - name = getName(e) - msg = "" - if name.startswith("Pkg"): - msg += "package %s: " % data.getVar("P", e.data, 1) - msg += messages.get(name[3:]) or name[3:] - elif name.startswith("Task"): - msg += "package %s: task %s: " % (data.getVar("PF", e.data, 1), e.task) - msg += messages.get(name[4:]) or name[4:] - elif name.startswith("Build"): - msg += "build %s: " % e.name - msg += messages.get(name[5:]) or name[5:] - elif name == "UnsatisfiedDep": - msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower()) - - # Only need to output when using 1.8 or lower, the UI code handles it - # otherwise - if (int(bb.__version__.split(".")[0]) <= 1 and int(bb.__version__.split(".")[1]) <= 8): - if msg: - note(msg) if name.startswith("BuildStarted"): bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) @@ -275,12 +251,6 @@ python base_eventhandler() { if not data in e.__dict__: return - - log = data.getVar("EVENTLOG", e.data, 1) - if log: - logfile = file(log, "a") - logfile.write("%s\n" % msg) - logfile.close() } addtask configure after do_unpack do_patch -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/9] autotools.bbclass: Set the dynamic linker search path for libtool correctly
libtool obtains the search path from /etc/ld.so.conf and hardcodes /usr/lib and /lib. This results in host contamination and variable sets of RPATH values ending up in binaries. By exporting the correct values for all autotools recipes we avoid this. Signed-off-by: Richard Purdie --- meta/classes/autotools.bbclass |2 ++ meta/classes/native.bbclass|3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 8f65b70..f213c18 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -31,6 +31,8 @@ export CONFIG_SITE = "${@siteinfo_get_files(d)}" acpaths = "default" EXTRA_AUTORECONF = "--exclude=autopoint" +export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir}" + def autotools_set_crosscompiling(d): if not bb.data.inherits_class('native', d): return " cross_compiling=yes" diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 9a41f19..5e45aed 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -69,6 +69,9 @@ exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" libdir = "${STAGING_DIR_NATIVE}${libdir_native}" +# Libtool's default paths are correct for the native machine +lt_cv_sys_lib_dlsearch_path_spec[unexport] = "1" + NATIVE_PACKAGE_PATH_SUFFIX = "" bindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] qt3 vs qt4 issues
Op 25 sep. 2011, om 13:33 heeft Richard Purdie het volgende geschreven: > I've been looking at the qt3 failures on the autobuilder. It seems there > is some kind of contamination between the qt4 builds and the qt3 builds > and I'm not sure what is or isn't expected to work there. > > We're doing the following in the build: > > a) Build core-image-lsb (includes qt4, builds qt4+qt4-native) > b) Wipe out tmp > c) Add in meta-qt3 layer > d) Enable sstate from build in a) > e) Build core-image-lsb-qt3 which adds in qt3 > f) Bitbake determines it needs to install qt4 for the image but > nothing depends on the native qt4 tools so these are not installed > g) This will build qt3+qt3-native with qt4 in the sysroot but no > qt4-native > h) We see build failures as qt3 seems to want to find bits of qt4-native > > If qt4 and qt4-native are present, qt3 works > If qt4 and qt4-native are not present, qt3 works > If qt4 is present but qt4-native is not, qt3 fails > > How do we fix this? I suspect qt3 is missing bits of the tool renaming we do for qt4 and qt2 (moc, uic, lrelease, etc) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] v2 of attr/acl with qemuimage-testlib fix
On Sat, 2011-09-24 at 11:56 -0700, Saul Wold wrote: > Richard, > > These 2 patches would be for edison > > Sau! > > The following changes since commit 368b150416688654e35229a63b87177b52e83d02: > > populate_sdk_rpm: add pkgconfig(pkg-config) to the list (2011-09-23 > 19:55:43 +0100) > > are available in the git repository at: > git://git.yoctoproject.org/poky-contrib sgw/oe-fix > http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/oe-fix > > Saul Wold (2): > attr/acl: add SSTATEPOSTINSTFUNC > qemuimage-testlib: set a default geometry for xterm I've merged the first of these, thanks. I'm holding off the second until we see the problem on the autobuilder is fixed, this doesn't have seemed to have done so :( Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] qt4-embedded: move qte.sh profile script into own package
We don't want to pull the whole qt suite in our images when only installing a tiny setup which needs the profile script for several configuration issues. This moves the qte.sh profile script into a qt4-embedded-conf package which is automatically installed when an image depends on qt4-embedded. Signed-off-by: Simon Busch --- meta/recipes-qt/qt4/qt4-embedded.inc |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 1ede922..ed872b0 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "LGPLv2.1 | GPLv3" HOMEPAGE = "http://qt.nokia.com"; DEPENDS += "directfb tslib" -INC_PR = "r31" +INC_PR = "r32" QT_BASE_NAME ?= "qt4-embedded" QT_BASE_LIB ?= "libqt-embedded" @@ -27,7 +27,11 @@ do_install_append() { install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/ } -FILES_${PN} += " ${sysconfdir}/profile.d/qte.sh" +# We put the qte profile into it's own package as we don't want to install all qt stuff +# with depending on the global package qt4-embedded +PACKAGES += " ${PN}-conf" +FILES_${PN}-conf += " ${sysconfdir}/profile.d/qte.sh" +RDEPENDS_${PN} += " ${PN}-conf" inherit qt4e -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] meta: qt4: fix postprocessing of pkg-config files
When building qt4-embedded the generated and cleaned pkg-config files for qt are wrong. The Cflags variable contains something like ${includedir}/qtopia/QtCore where ${includedir} is already /usr/include/qtopia/QtCore. This patch reverts the fix up of the Cflags variable implemented in do_install. Signed-off-by: Simon Busch --- meta/recipes-qt/qt4/qt4-embedded.inc |2 +- meta/recipes-qt/qt4/qt4-x11-free.inc |2 +- meta/recipes-qt/qt4/qt4.inc |4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 9914c61..1ede922 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "LGPLv2.1 | GPLv3" HOMEPAGE = "http://qt.nokia.com"; DEPENDS += "directfb tslib" -INC_PR = "r30" +INC_PR = "r31" QT_BASE_NAME ?= "qt4-embedded" QT_BASE_LIB ?= "libqt-embedded" diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 0a714be..a360ec3 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"; SECTION = "x11/libs" DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" -INC_PR = "r27" +INC_PR = "r28" QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 5545be7..7f3e1a4 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -293,7 +293,6 @@ do_install() { -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \ -e s#" -Wl,-rpath-link,${S}/lib"##g \ -e s#" -Wl,-rpath-link,${libdir}"##g \ - -e 's#I/usr/include#Iincludedir}#g' \ -e 's#Iin#I${in#g' \ ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc @@ -310,8 +309,7 @@ do_install() { # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here: for pc in ${D}${libdir}/pkgconfig/*.pc ; do - sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \ - -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \ + sed -i -e "s:prefix}include/${QT_DIR_NAME}/$(basename $pc .pc):prefix}/include:" \ -e 's:IP{:I${:g' $pc done -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Use useradd and update-rc.d classes in the OpenSSH recipe
The current sshd postinst and postrm scripts in the OpenSSH make the package dependant of the adduser/addgroup scripts which may not be available on all systems. This patch replaces the sshd postinst and postrm scripts with proper usage of the useradd and update-rc.d classes. Signed-off-by: Julian Pidancet --- meta/recipes-connectivity/openssh/openssh_5.8p2.bb | 29 +-- 1 files changed, 8 insertions(+), 21 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb index 030a83b..c94ec84 100644 --- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb +++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb @@ -29,6 +29,14 @@ PAM_SRC_URI = "file://sshd" SRC_URI[md5sum] = "0541579adf9d55abb15ef927048d372e" SRC_URI[sha256sum] = "5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314" +inherit useradd update-rc.d + +USERADD_PACKAGES = "${PN}-sshd" +USERADD_PARAM_${PN}-sshd = "-r -M -d /var/run/sshd -s /bin/false -U sshd" +INITSCRIPT_PACKAGES = "${PN}-sshd" +INITSCRIPT_NAME_${PN}-sshd = "sshd" +INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9" + inherit autotools # LFS support: @@ -91,16 +99,6 @@ RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" DEPENDS_${PN}-sshd += "update-rc.d" RDEPENDS_${PN}-sshd += "update-rc.d ${PN}-keygen" -pkg_postinst_${PN}-sshd () { - if [ "x$D" != "x" ]; then - exit 1 - else - addgroup sshd - adduser --system --home /var/run/sshd --no-create-home --disabled-password --ingroup sshd -s /bin/false sshd - update-rc.d sshd defaults 9 - fi -} - pkg_postinst_${PN}-scp () { update-alternatives --install ${bindir}/scp scp scp.${PN} 90 } @@ -117,16 +115,5 @@ pkg_postrm_${PN}-scp () { update-alternatives --remove ${bindir}/scp scp.${PN} } -pkg_postrm_${PN}-sshd () { - if [ "x$D" != "x" ]; then - exit 1 - else - ${sysconfdir}/init.d/sshd stop - deluser sshd - delgroup sshd - update-rc.d -f sshd remove - fi -} - CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] qt3 vs qt4 issues
I've been looking at the qt3 failures on the autobuilder. It seems there is some kind of contamination between the qt4 builds and the qt3 builds and I'm not sure what is or isn't expected to work there. We're doing the following in the build: a) Build core-image-lsb (includes qt4, builds qt4+qt4-native) b) Wipe out tmp c) Add in meta-qt3 layer d) Enable sstate from build in a) e) Build core-image-lsb-qt3 which adds in qt3 f) Bitbake determines it needs to install qt4 for the image but nothing depends on the native qt4 tools so these are not installed g) This will build qt3+qt3-native with qt4 in the sysroot but no qt4-native h) We see build failures as qt3 seems to want to find bits of qt4-native If qt4 and qt4-native are present, qt3 works If qt4 and qt4-native are not present, qt3 works If qt4 is present but qt4-native is not, qt3 fails How do we fix this? An easier reproducer is something like: bitbake qt4-x11-free bitbake qt4-native -c clean bitbake qt-x11-free Beth: As a work around, you can do: bitbake qt-x11-free bitbake core-image-lsb-qt3 as two steps on the autobuilder and the builds will work. This might be what we need to do for this release. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Quick note about one of the autobuilder failures
With the autobuilder now stressing out sstate more, we're seeing some interesting build failures. One example which caught my eye is: http://autobuilder.yoctoproject.org:8010/builders/nightly-arm/builds/100/steps/shell_57/logs/stdio What this is telling us is we actually have some dependency issues in the metadata. I've already established that: libXinerama.so.1 is needed by libgtk-2.0-2.22.1-r4.armv5te means that gtk+ needs to disable xinerama (preferred) or depend on xinerama. I've also seem a local error which showed: neon needs to depend on libproxy (preferred) or to explicitly disable it. Once you understand these messages mean we need to look into the base recipes dependencies, they become easier to dig into and fix. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 03/10] bash-completion: new recipe
On Fri, 2011-09-23 at 23:46 +0400, Dmitry Eremin-Solenikov wrote: > Add a bash-completion recipe. Largely based on the one from oe-dev repo. > Changes: > 1) Version bump to most recent bash-completion upstream tarball > 2) Dropped custom profile.d script in favour of upstream one. > > Signed-off-by: Dmitry Eremin-Solenikov > --- > .../bash-completion/bash-completion_20060301.bb| 28 > > 1 files changed, 28 insertions(+), 0 deletions(-) > create mode 100644 > meta/recipes-extended/bash-completion/bash-completion_20060301.bb > > diff --git > a/meta/recipes-extended/bash-completion/bash-completion_20060301.bb > b/meta/recipes-extended/bash-completion/bash-completion_20060301.bb > new file mode 100644 > index 000..9e8ede2 > --- /dev/null > +++ b/meta/recipes-extended/bash-completion/bash-completion_20060301.bb > @@ -0,0 +1,28 @@ > +DESCRIPTION = "Programmable Completion for Bash" > +SECTION = "console/utils" > +RDEPENDS_${PN} = "bash" > +LICENSE = "GPLv2" > +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" > +PR = "r0" > + > +SRC_URI = "http://www.caliban.org/files/bash/bash-completion-${PV}.tar.gz"; > +S = "${WORKDIR}/bash_completion" > + > +do_configure() { > + : > +} > + > +do_compile() { > + : > +} > + > +do_install() { > + install -d ${D}${sysconfdir}/profile.d > + install -m 0755 bash_completion.sh ${D}${sysconfdir}/profile.d > + install -m 0755 bash_completion ${D}${sysconfdir} > + install -d ${D}${sysconfdir}/bash_completion.d/ > + install -m 0755 contrib/* ${D}${sysconfdir}/bash_completion.d/ > +} > + > +SRC_URI[md5sum] = "9bca1cf97e8f8c73e3ef560cc9dead21" > +SRC_URI[sha256sum] = > "29b78834b975b29810f0bf1f15e5d3a6c003a137cfac7fea671bfaf8f58f5c0d" We might as well put an "inherit allarch" into this recipe... Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core