From 8eee9e56d5f4bfda13c7a65bb67a757bb39cf59f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 30 Sep 2015 10:08:10 +0300 Subject: Update meta repos to latest versions Use latest SHA1s for all meta repos and V2.5 branch for meta-toradex Change-Id: I7ff06d83f1f35437a6501eda38c99998a7a4534e Reviewed-by: Teemu Holappa --- conf/distro/include/colibri-vf.conf | 2 +- conf/distro/include/toradex.inc | 2 +- .../0001-Allow-builds-with-GCC-4.8.patch | 27 ----------------- ...le-Fusion-7-and-10-multi-touch-controller.patch | 25 ---------------- .../recipes/linux/linux-toradex-vf_4.%.bbappend | 34 ---------------------- .../0001-Allow-builds-with-GCC-4.8.patch | 27 +++++++++++++++++ ...le-Fusion-7-and-10-multi-touch-controller.patch | 25 ++++++++++++++++ .../recipes/linux/linux-toradex_4.%.bbappend | 34 ++++++++++++++++++++++ scripts/manifest.xml | 12 ++++---- scripts/manifest_fido.xml | 2 +- 10 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch delete mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch delete mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index d92410c..d413d9f 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -23,7 +23,7 @@ include conf/distro/include/toradex.inc BOOTFS_CONTENT = "\ - u-boot-nand-${MACHINE}.imx:u-boot-nand.imx \ + u-boot-nand.imx:u-boot-nand.imx \ flash_mmc-${MACHINE}.img:flash_mmc.img \ flash_blk-${MACHINE}.img:flash_blk.img \ " diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc index 167f3d4..063244e 100644 --- a/conf/distro/include/toradex.inc +++ b/conf/distro/include/toradex.inc @@ -1,2 +1,2 @@ BBMASK ?= " " -BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer" +BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups" diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch deleted file mode 100644 index 43edec3..0000000 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 30c67656c09f49608bbadb75e365d1d3da36cc70 Mon Sep 17 00:00:00 2001 -From: Andy Nichols -Date: Wed, 18 Feb 2015 14:28:14 +0100 -Subject: [PATCH] Allow builds with GCC 4.8 - ---- - arch/arm/kernel/asm-offsets.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c -index 2d2d608..6f8e79c 100644 ---- a/arch/arm/kernel/asm-offsets.c -+++ b/arch/arm/kernel/asm-offsets.c -@@ -49,10 +49,6 @@ - #error Your compiler is too buggy; it is known to miscompile kernels. - #error Known good compilers: 3.3, 4.x - #endif --#if GCC_VERSION >= 40800 && GCC_VERSION < 40803 --#error Your compiler is too buggy; it is known to miscompile kernels --#error and result in filesystem corruption and oopses. --#endif - #endif - - int main(void) --- -1.9.1 - diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch deleted file mode 100644 index d92ac62..0000000 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d57edef022af184015a8ccd87fa9021024513d55 Mon Sep 17 00:00:00 2001 -From: Andy Nichols -Date: Fri, 6 Mar 2015 10:14:13 +0100 -Subject: [PATCH] Enable Fusion 7 and 10 multi-touch controller - ---- - arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi -index 1f43dbe..9194580 100644 ---- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi -+++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi -@@ -214,7 +214,7 @@ - gpios = <&gpio0 30 GPIO_ACTIVE_HIGH /* SO-DIMM 28, Pen down interrupt */ - &gpio0 23 GPIO_ACTIVE_LOW /* SO-DIMM 30, Reset interrupt */ - >; -- status = "disabled"; -+ status = "okay"; - }; - - /* M41T0M6 real time clock on carrier board */ --- -2.3.1 - diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend deleted file mode 100644 index fd9ad55..0000000 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \ - " - -do_configure_prepend () { - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig - echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig -} diff --git a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch new file mode 100644 index 0000000..43edec3 --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch @@ -0,0 +1,27 @@ +From 30c67656c09f49608bbadb75e365d1d3da36cc70 Mon Sep 17 00:00:00 2001 +From: Andy Nichols +Date: Wed, 18 Feb 2015 14:28:14 +0100 +Subject: [PATCH] Allow builds with GCC 4.8 + +--- + arch/arm/kernel/asm-offsets.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c +index 2d2d608..6f8e79c 100644 +--- a/arch/arm/kernel/asm-offsets.c ++++ b/arch/arm/kernel/asm-offsets.c +@@ -49,10 +49,6 @@ + #error Your compiler is too buggy; it is known to miscompile kernels. + #error Known good compilers: 3.3, 4.x + #endif +-#if GCC_VERSION >= 40800 && GCC_VERSION < 40803 +-#error Your compiler is too buggy; it is known to miscompile kernels +-#error and result in filesystem corruption and oopses. +-#endif + #endif + + int main(void) +-- +1.9.1 + diff --git a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch new file mode 100644 index 0000000..d92ac62 --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch @@ -0,0 +1,25 @@ +From d57edef022af184015a8ccd87fa9021024513d55 Mon Sep 17 00:00:00 2001 +From: Andy Nichols +Date: Fri, 6 Mar 2015 10:14:13 +0100 +Subject: [PATCH] Enable Fusion 7 and 10 multi-touch controller + +--- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi +index 1f43dbe..9194580 100644 +--- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi ++++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi +@@ -214,7 +214,7 @@ + gpios = <&gpio0 30 GPIO_ACTIVE_HIGH /* SO-DIMM 28, Pen down interrupt */ + &gpio0 23 GPIO_ACTIVE_LOW /* SO-DIMM 30, Reset interrupt */ + >; +- status = "disabled"; ++ status = "okay"; + }; + + /* M41T0M6 real time clock on carrier board */ +-- +2.3.1 + diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend new file mode 100644 index 0000000..fd9ad55 --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend @@ -0,0 +1,34 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \ + " + +do_configure_prepend () { + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig + echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig +} diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 1be3fc0..7e0c0f9 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -12,21 +12,21 @@