Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 6568DE00965; Fri, 27 Mar 2015 06:13:06 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider * (max.oss.09[at]gmail.com) * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's * domain * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [74.125.82.43 listed in list.dnswl.org] Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 0D2A8E00777 for ; Fri, 27 Mar 2015 06:12:57 -0700 (PDT) Received: by wgdm6 with SMTP id m6so98992885wgd.2 for ; Fri, 27 Mar 2015 06:12:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=R6VRZEjnNRRWktJI8ISDJfgQLVRoWIgddWBnwXLh2q0=; b=Tz5WilmiCUt7UbaSkcu5tSpPWjOUzogK61HkiD+fP2KSCd4RZ1REm3o+o0ayn6vKDm SlWXG00mmu1/bSw43VGUJwhTkF2Ozc4ViVGSKvA7tfG98ajKUewyaFouFdrn+VJvaIrp u9gAmu6qSu8WlWCE2hUaaeE7pfGEXLUPVFRwD4+7oNZoSsj1MwSftlpzr2tujXc2VwU1 H0CTyMTod8T7j9dRaBb5IF6WzBAlB4lTTsskRZxJlySRZGUXUE1KYWPsmAeiDfqr+HHO klXVvH3cdHuwR+drb6ow718fWVwxax9ZPvFUmPGXPvF9fqg2Vd6o6j2W/j5svtg3osZ8 wCWQ== X-Received: by 10.194.156.133 with SMTP id we5mr38455758wjb.37.1427461976767; Fri, 27 Mar 2015 06:12:56 -0700 (PDT) Received: from Saturn.local.all (212-41-106-40.adsl.solnet.ch. [212.41.106.40]) by mx.google.com with ESMTPSA id v8sm7252381wib.0.2015.03.27.06.12.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Mar 2015 06:12:56 -0700 (PDT) From: Max Krummenacher To: meta-freescale@yoctoproject.org Date: Fri, 27 Mar 2015 14:12:29 +0100 Message-Id: <1427461949-11759-1-git-send-email-max.oss.09@gmail.com> X-Mailer: git-send-email 1.8.4.5 Cc: otavio@ossystems.com.br, Max Krummenacher Subject: [meta-fsl-arm][PATCH v3] fsl-dynamic-packagearch: on thumb builds, add MACHINE_SOCARCH arm feed X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2015 13:13:06 -0000 This ensures that all MACHINE_SOCARCH feeds are part of PACKAGE_EXTRA_ARCHS. oe-core now puts packages into an arm feed dir when a recipe forces the ARM instruction set on a build configured to default to thumb. http://cgit.openembedded.org/openembedded-core/commit/?id=3e760031f91fb87c3e2f62b77a117eb41164f259 This is true also for packages in MACHINE_SOCARCH, i.e. we get in deploy/ipk for an angstrom based build: armv7ahf-vfp-neon-mx6qdl armv7at2hf-vfp-neon-mx6qdl so we must put both into PACKAGE_EXTRA_ARCHS. In theorie, but less likely, the opposite is also true. If a recipe explicitely sets thumb in a build configured for arm the resulting packages end up in a thumb feed. Signed-off-by: Max Krummenacher --- v2: - moved the functionality from imx-base.inc to fsl-dynamic-packagearch.bbclass - implements the'vice versa' recipe with thumb on default arm configuration - reads the datastore to construct the feed name rather than relying on "t2" v3: - removed PACKAGE_EXTRA_ARCHS from mxs-base.inc also. Minimal Use Case to reproduce the issue: - fsl-community-bsp setup, master - default to thumb instruction set and add a SOCARCH package which forces arm: local.conf: ARM_INSTRUCTION_SET ?= "thumb" DEFAULTTUNE_mx6 = "cortexa9thf-neon" CORE_IMAGE_EXTRA_INSTALL += "libasound" - build core-image-minimal Unpatched sources will fail in do_rootfs: > MACHINE=imx6qsabresd bitbake core-image-minimal WARNING: Host distribution "openSUSE-project-13.1" has not been validated with this version of the build system; you may possibly experience unexpected failures. It is recommended that you use a tested distribution. Loading cache: 100% |########################################################################################################################################| ETA: 00:00:00 Loaded 2084 entries from dependency cache. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "1.27.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "openSUSE-project-13.1" TARGET_SYS = "arm-poky-linux-gnueabi" MACHINE = "imx6qsabresd" DISTRO = "poky" DISTRO_VERSION = "1.8+snapshot-20150327" TUNE_FEATURES = "arm armv7a vfp thumb neon callconvention-hard cortexa9" TARGET_FPU = "vfp-neon" meta meta-yocto = "(detachedfrom5c76ceb):5c76cebc24675edb3dff473fce9b67cedff615db" meta-oe meta-multimedia = "(detachedfromdf6c7b1):df6c7b1279790d27ebfd58fbdfbac89bde5782ec" meta-fsl-arm = "(detachedfrom115aace):115aaced72fddc23024f8838f0eeb8ad5e37d048" meta-fsl-arm-extra = "(detachedfrom22f6672):22f6672c3ef58bf5070d0c6894a459fada66f55e" meta-fsl-demos = "(detachedfromdb7ca84):db7ca84b4a81167edc507b68241d78adb346268a" NOTE: Preparing RunQueue NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks ERROR: libasound2 not found in the base feeds (imx6qsabresd cortexa9t2hf-vfp-neon-mx6qdl cortexa9t2hf-vfp-neon cortexa9t2hf-vfp cortexa9hf-vfp-neon cortexa9hf-vfp armv7at2hf-vfp-neon armv7ahf-vfp-neon armv7at2hf-vfp armv7ahf-vfp armv6thf-vfp armv6hf-vfp armv5tehf-vfp armv5ehf-vfp armv5thf-vfp armv5hf-vfp noarch any all). ... Analyzing the following helped in putting together the patch: MACHINE=imx6qsabresd bitbake alsa-lib -e > libasound.txt MACHINE=imx6qsabresd bitbake core-image-minimal -e > image.txt classes/fsl-dynamic-packagearch.bbclass | 16 +++++++++++++++- conf/machine/include/imx-base.inc | 1 - conf/machine/include/mxs-base.inc | 1 - 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/classes/fsl-dynamic-packagearch.bbclass b/classes/fsl-dynamic-packagearch.bbclass index 40eae6c..32930d0 100644 --- a/classes/fsl-dynamic-packagearch.bbclass +++ b/classes/fsl-dynamic-packagearch.bbclass @@ -29,6 +29,7 @@ python __anonymous () { machine_arch_filter = set((d.getVar("MACHINE_ARCH_FILTER", True) or "").split()) machine_socarch_filter = set((d.getVar("MACHINE_SOCARCH_FILTER", True) or "").split()) if machine_socarch_filter or machine_arch_filter: + socarch = d.getVar('MACHINE_SOCARCH', True) provides = set((d.getVar("PROVIDES", True) or "").split()) depends = set((d.getVar("DEPENDS", True) or "").split()) PN = d.getVar("PN", True) @@ -37,11 +38,24 @@ python __anonymous () { if list(machine_arch_filter & (provides | depends)): package_arch = d.getVar("MACHINE_ARCH", True) elif list(machine_socarch_filter & (provides | depends)): - package_arch = d.getVar("MACHINE_SOCARCH", True) + package_arch = socarch if not package_arch: bb.parse.SkipPackage("You must set MACHINE_SOCARCH as MACHINE_SOCARCH_FILTER is set for this SoC.") if package_arch: bb.debug(1, "Use '%s' as package archictecture for '%s'" % (package_arch, PN)) d.setVar("PACKAGE_ARCH", package_arch) + + suffix = socarch[len(d.getVar("TUNE_PKGARCH", True)):] + # If TUNE_PKGARCH is set for thumb allow also arm for package extra archs and vice versa + if d.getVar("ARM_INSTRUCTION_SET", True) == "thumb": + extrasocarch = d.getVar("ARMPKGARCH", True) + \ + d.getVar("ARMPKGSFX_DSP", True) + d.getVar("ARMPKGSFX_EABI", True) + \ + d.getVar("ARMPKGSFX_ENDIAN", True) + d.getVar("ARMPKGSFX_FPU", True) + suffix + else: + extrasocarch = d.getVar("ARMPKGARCH", True) + \ + d.getVar("ARM_THUMB_SUFFIX", True) + \ + d.getVar("ARMPKGSFX_DSP", True) + d.getVar("ARMPKGSFX_EABI", True) + \ + d.getVar("ARMPKGSFX_ENDIAN", True) + d.getVar("ARMPKGSFX_FPU", True) + suffix + d.appendVar("PACKAGE_EXTRA_ARCHS", " " + socarch + " " + extrasocarch) } diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index bb5539c..40b6f87 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -46,7 +46,6 @@ MACHINE_SOCARCH_mx6sx = "${TUNE_PKGARCH}-mx6sx" MACHINE_SOCARCH_mx6sl = "${TUNE_PKGARCH}-mx6sl" MACHINE_SOCARCH_vf60 = "${TUNE_PKGARCH}-vf60" MACHINE_SOCARCH_vf50 = "${TUNE_PKGARCH}-vf50" -PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}" MACHINE_ARCH_FILTER = "virtual/kernel" MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser gst-fsl-plugins" diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc index 0314952..2bd2697 100644 --- a/conf/machine/include/mxs-base.inc +++ b/conf/machine/include/mxs-base.inc @@ -27,7 +27,6 @@ MACHINE_GSTREAMER_PLUGIN_mx28 ?= "gst-fsl-plugin" MACHINE_SOCARCH ?= "" MACHINE_SOCARCH_mx23 = "${TUNE_PKGARCH}-mx23" MACHINE_SOCARCH_mx28 = "${TUNE_PKGARCH}-mx28" -PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}" MACHINE_ARCH_FILTER = "virtual/kernel" MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser gst-fsl-plugins" -- 1.8.4.5