From 1192172b9fc7b8b7f70370d903ae3385c27c2c87 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 3 Jan 2013 19:06:08 +0100 Subject: [PATCH] meta-digi: update to Yocto 1.3 'Danny' Signed-off-by: Javier Viguera --- meta-digi-arm/conf/layer.conf | 2 + meta-digi-arm/conf/machine/ccxmx51js.conf | 3 +- meta-digi-arm/conf/machine/ccxmx53js.conf | 3 +- meta-digi-del/conf/distro/del.conf | 40 +++++++++++++------ meta-digi-del/conf/layer.conf | 2 + .../images/del-image-minimal-dev.bb | 3 +- 6 files changed, 36 insertions(+), 17 deletions(-) diff --git a/meta-digi-arm/conf/layer.conf b/meta-digi-arm/conf/layer.conf index 8aa8ca314..6b0c7d1b8 100644 --- a/meta-digi-arm/conf/layer.conf +++ b/meta-digi-arm/conf/layer.conf @@ -1,5 +1,7 @@ +# We have a conf and classes directory, add to BBPATH BBPATH := "${BBPATH}:${LAYERDIR}" +# We have a packages directory, add to BBFILES BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" diff --git a/meta-digi-arm/conf/machine/ccxmx51js.conf b/meta-digi-arm/conf/machine/ccxmx51js.conf index e16037047..08ffb33b4 100644 --- a/meta-digi-arm/conf/machine/ccxmx51js.conf +++ b/meta-digi-arm/conf/machine/ccxmx51js.conf @@ -2,11 +2,10 @@ #@NAME: ConnectCore for MX51 JumpStart Kit. #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX51 JSK -include conf/machine/include/soc-family.inc include conf/machine/include/imx-digi-base.inc include conf/machine/include/tune-cortexa8.inc -SOC_FAMILY = "mx5" +SOC_FAMILY = "mx51:mx5" # Digi's kernel does not use device trees. # KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/ccxmx51js.dts" diff --git a/meta-digi-arm/conf/machine/ccxmx53js.conf b/meta-digi-arm/conf/machine/ccxmx53js.conf index 17786aca1..fd5c8e496 100644 --- a/meta-digi-arm/conf/machine/ccxmx53js.conf +++ b/meta-digi-arm/conf/machine/ccxmx53js.conf @@ -2,11 +2,10 @@ #@NAME: ConnectCore for MX53 JumpStart Kit. #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX53 JSK. -include conf/machine/include/soc-family.inc include conf/machine/include/imx-digi-base.inc include conf/machine/include/tune-cortexa8.inc -SOC_FAMILY = "mx5" +SOC_FAMILY = "mx53:mx5" # Digi's kernel does not use device tree. # KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts" diff --git a/meta-digi-del/conf/distro/del.conf b/meta-digi-del/conf/distro/del.conf index 6e34b0329..a4008df2a 100644 --- a/meta-digi-del/conf/distro/del.conf +++ b/meta-digi-del/conf/distro/del.conf @@ -9,6 +9,7 @@ MAINTAINER = "Digi Support " TARGET_VENDOR = "-del" LOCALCONF_VERSION = "1" +LAYER_CONF_VERSION ?= "6" # Comment out features to leave them out DISTRO_FEATURES = "alsa" @@ -22,12 +23,12 @@ DISTRO_FEATURES += "opengl" PREFERRED_PROVIDER_jpeg = "jpeg" -PREFERRED_VERSION_linux-yocto ?= "3.0%" -PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.2%" -PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.2%" -PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.2%" -PREFERRED_VERSION_linux-yocto_qemumips ?= "3.2%" -PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.2%" +PREFERRED_VERSION_linux-yocto ?= "3.4%" +PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.4%" +PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.4%" +PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.4%" +PREFERRED_VERSION_linux-yocto_qemumips ?= "3.4%" +PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.4%" PREFERRED_VERSION_libnl ?= "2.0" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}" @@ -75,25 +76,33 @@ https://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" # The CONNECTIVITY_CHECK_URI's are used to test whether we can succesfully # fetch from the network (and warn you if not). To disable the test set # the variable to be empty. -CONNECTIVITY_CHECK_URIS ?= "git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=HEAD \ - https://eula-downloads.yoctoproject.org/index.php \ - http://bugzilla.yoctoproject.org/report.cgi" +# Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=HEAD + +CONNECTIVITY_CHECK_URIS ?= " \ + https://eula-downloads.yoctoproject.org/index.php \ + http://bugzilla.yoctoproject.org/report.cgi" SANITY_TESTED_DISTROS ?= " \ Yocto (Built by Poky 7.0) 1.2 \n \ + Yocto (Built by Poky 8.0) 1.3 \n \ + Poky 7.0 (Yocto Project 1.2 Reference Distro) 1.2 \n \ + Poky 8.0 (Yocto Project 1.3 Reference Distro) 1.3 \n \ Ubuntu 10.04.4 LTS \n \ Ubuntu 11.10 \n \ Ubuntu 12.04 LTS \n \ Ubuntu 12.04.1 LTS \n \ - Fedora release 15 (Lovelock) \n \ + Ubuntu 12.10 \n \ Fedora release 16 (Verne) \n \ Fedora release 17 (Beefy Miracle) \n \ + Fedora release 18 (Spherical Cow) \n \ CentOS release 5.6 (Final) \n \ CentOS release 5.7 (Final) \n \ - CentOS release 6.2 (Final) \n \ - Debian GNU/Linux 6.0.4 (squeeze) \n \ + CentOS release 5.8 (Final) \n \ + CentOS release 6.3 (Final) \n \ + Debian GNU/Linux 6.0.6 (squeeze) \n \ openSUSE 11.4 \n \ openSUSE 12.1 \n \ + openSUSE 12.2 \n \ " # Default hash policy for distro @@ -106,5 +115,12 @@ BB_SIGNATURE_HANDLER ?= 'OEBasicHash' # OELAYOUT_ABI = "8" +# add poky sanity bbclass +INHERIT += "poky-sanity" + +#WARN_QA = "unsafe-references-in-binaries unsafe-references-in-scripts" +WARN_QA = "" +ERROR_QA = "dev-so debug-deps dev-deps debug-files arch la2 pkgconfig la perms useless-rpaths rpaths staticdev ldflags" + # Mask openembedded core gst-ffmpeg recipe because it adds a dependency on libav (libgl, libx11) BBMASK = "meta-openembedded/meta-oe/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bbappend" diff --git a/meta-digi-del/conf/layer.conf b/meta-digi-del/conf/layer.conf index 9edb378f4..1d6558b5f 100644 --- a/meta-digi-del/conf/layer.conf +++ b/meta-digi-del/conf/layer.conf @@ -1,5 +1,7 @@ +# We have a conf and classes directory, add to BBPATH BBPATH := "${BBPATH}:${LAYERDIR}" +# We have a packages directory, add to BBFILES BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" diff --git a/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb b/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb index f1aca8726..750198a07 100644 --- a/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb +++ b/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb @@ -12,7 +12,8 @@ LICENSE = "MIT" inherit core-image inherit del-image -IMAGE_FEATURES += "core-ssh-dropbear" +# Only common features to remain here. +IMAGE_FEATURES += "ssh-server-dropbear" IMAGE_FEATURES += "dev-pkgs" # Adding debug-tweaks will enable empty password login.