diff options
-rw-r--r-- | conf/distro/include/colibri-vf.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/toradex.inc | 2 | ||||
-rw-r--r-- | meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch (renamed from meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch) | 0 | ||||
-rw-r--r-- | meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch (renamed from meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch) | 0 | ||||
-rw-r--r-- | meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend (renamed from meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend) | 0 | ||||
-rw-r--r-- | scripts/manifest.xml | 12 | ||||
-rw-r--r-- | scripts/manifest_fido.xml | 2 |
7 files changed, 9 insertions, 9 deletions
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 @@ | |||
23 | include conf/distro/include/toradex.inc | 23 | include conf/distro/include/toradex.inc |
24 | 24 | ||
25 | BOOTFS_CONTENT = "\ | 25 | BOOTFS_CONTENT = "\ |
26 | u-boot-nand-${MACHINE}.imx:u-boot-nand.imx \ | 26 | u-boot-nand.imx:u-boot-nand.imx \ |
27 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | 27 | flash_mmc-${MACHINE}.img:flash_mmc.img \ |
28 | flash_blk-${MACHINE}.img:flash_blk.img \ | 28 | flash_blk-${MACHINE}.img:flash_blk.img \ |
29 | " | 29 | " |
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 @@ | |||
1 | BBMASK ?= " " | 1 | BBMASK ?= " " |
2 | 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" | 2 | 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/0001-Allow-builds-with-GCC-4.8.patch index 43edec3..43edec3 100644 --- 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/0001-Allow-builds-with-GCC-4.8.patch | |||
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/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch index d92ac62..d92ac62 100644 --- 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/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch | |||
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend index fd9ad55..fd9ad55 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend | |||
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 @@ | |||
12 | 12 | ||
13 | <project name="poky" | 13 | <project name="poky" |
14 | remote="yocto" | 14 | remote="yocto" |
15 | revision="08d32590411568e7bf11612ac695a6e9c6df6286" | 15 | revision="57eb677f0efe9a4060c764e8e9dfe2440d4e5eb2" |
16 | path="sources/poky"/> | 16 | path="sources/poky"/> |
17 | <project name="meta-openembedded" | 17 | <project name="meta-openembedded" |
18 | remote="oe" | 18 | remote="oe" |
19 | revision="10d3c8f85280a0bf867a8e4f84bcda81c290d28e" | 19 | revision="214e1801d0efc38d3b6142bdc0d8e58ca593e34c" |
20 | path="sources/meta-openembedded"/> | 20 | path="sources/meta-openembedded"/> |
21 | 21 | ||
22 | <project name="meta-fsl-arm" | 22 | <project name="meta-fsl-arm" |
23 | remote="yocto" | 23 | remote="yocto" |
24 | revision="44a5115b6ece869cfb10714423e6956128dbaef8" | 24 | revision="f30b056c8f1af3f3122f94dbaa4698da5d620a41" |
25 | path="sources/meta-fsl-arm" | 25 | path="sources/meta-fsl-arm" |
26 | groups="notdefault,fsl,toradex,architech"/> | 26 | groups="notdefault,fsl,toradex,architech"/> |
27 | <project name="meta-ti" | 27 | <project name="meta-ti" |
28 | remote="yocto" | 28 | remote="yocto" |
29 | revision="477f7b7f03dd7c803803101240a416e88cf49fcc" | 29 | revision="0a222c70845d19a2213ac36803361e8531768cca" |
30 | path="sources/meta-ti" | 30 | path="sources/meta-ti" |
31 | groups="notdefault,ti,bbb"/> | 31 | groups="notdefault,ti,bbb"/> |
32 | <project name="meta-raspberrypi" | 32 | <project name="meta-raspberrypi" |
@@ -36,7 +36,7 @@ | |||
36 | groups="notdefault,rpi"/> | 36 | groups="notdefault,rpi"/> |
37 | <project name="meta-fsl-arm-extra" | 37 | <project name="meta-fsl-arm-extra" |
38 | remote="freescale" | 38 | remote="freescale" |
39 | revision="436b86e3421736216412bdbb21cd9cb08c758c75" | 39 | revision="c0ff75e85bcbd616362c21e501dc6df187612cf9" |
40 | path="sources/meta-fsl-arm-extra" | 40 | path="sources/meta-fsl-arm-extra" |
41 | groups="notdefault,fsl,toradex,architech"/> | 41 | groups="notdefault,fsl,toradex,architech"/> |
42 | <project name="meta-beagleboard" | 42 | <project name="meta-beagleboard" |
@@ -46,7 +46,7 @@ | |||
46 | groups="notdefault,bbb"/> | 46 | groups="notdefault,bbb"/> |
47 | <project name="meta-toradex" | 47 | <project name="meta-toradex" |
48 | remote="toradex" | 48 | remote="toradex" |
49 | revision="a76e317a2ae638ed62ccf88636aa79d0ae368d78" | 49 | revision="eb0c16acb10257c60ddbfce8ad71448b2e987fb4" |
50 | path="sources/meta-toradex" | 50 | path="sources/meta-toradex" |
51 | groups="notdefault,toradex"/> | 51 | groups="notdefault,toradex"/> |
52 | <project name="meta-tibidabo" | 52 | <project name="meta-tibidabo" |
diff --git a/scripts/manifest_fido.xml b/scripts/manifest_fido.xml index ac62242..1c89e64 100644 --- a/scripts/manifest_fido.xml +++ b/scripts/manifest_fido.xml | |||
@@ -46,7 +46,7 @@ | |||
46 | groups="notdefault,bbb"/> | 46 | groups="notdefault,bbb"/> |
47 | <project name="meta-toradex" | 47 | <project name="meta-toradex" |
48 | remote="toradex" | 48 | remote="toradex" |
49 | revision="V2.4" | 49 | revision="V2.5" |
50 | path="sources/meta-toradex" | 50 | path="sources/meta-toradex" |
51 | groups="notdefault,toradex"/> | 51 | groups="notdefault,toradex"/> |
52 | <project name="meta-tibidabo" | 52 | <project name="meta-tibidabo" |