From 3294a0cbd67995f1feaf1e4da7b7e65d4af6c02f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 14 Oct 2013 08:06:18 +0300 Subject: mkcard: do not use kpartx Do not try to use kpartx when discovering partitions. This gave false errors when kpartx was not installed, and failed to create partition when it was installed. Change-Id: Iefe4de0bfef4d0625469e956c5847f759888e29f Reviewed-by: Rainer Keller --- recipes/mkcard/files/mkcard.sh | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/recipes/mkcard/files/mkcard.sh b/recipes/mkcard/files/mkcard.sh index 3e70dbc..e75a176 100755 --- a/recipes/mkcard/files/mkcard.sh +++ b/recipes/mkcard/files/mkcard.sh @@ -32,11 +32,6 @@ echo ,,,- sleep 1 - -if [ -x `which kpartx` ]; then - kpartx -a ${DRIVE} -fi - # handle various device names. # note something like fdisk -l /dev/loop0 | egrep -E '^/dev' | cut -d' ' -f1 # won't work due to https://bugzilla.redhat.com/show_bug.cgi?id=649572 @@ -46,21 +41,10 @@ if [ ! -b ${PARTITION1} ]; then PARTITION1=${DRIVE}p1 fi -DRIVE_NAME=`basename $DRIVE` -DEV_DIR=`dirname $DRIVE` - -if [ ! -b ${PARTITION1} ]; then - PARTITION1=$DEV_DIR/mapper/${DRIVE_NAME}p1 -fi - PARTITION2=${DRIVE}2 if [ ! -b ${PARTITION2} ]; then PARTITION2=${DRIVE}p2 fi -if [ ! -b ${PARTITION2} ]; then - PARTITION2=$DEV_DIR/mapper/${DRIVE_NAME}p2 -fi - # now make partitions. if [ -b ${PARTITION1} ]; then -- cgit v1.2.3-54-g00ecf From b58eb296819caddbcfd3c6482eeda78f556df497 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 14 Oct 2013 08:10:03 +0300 Subject: raspberrypi: build graphic drivers from sources Use userland recipe instead of binary-only vc-graphics. Change-Id: I6d26e61a4caf083ccb2abc9aa969c1db956a6a3c Reviewed-by: Samuli Piippo --- conf/distro/include/raspberrypi.conf | 8 ++++---- recipes/userland/userland_git.bbappend | 1 + recipes/vc-graphics/vc-graphics.bbappend | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 recipes/userland/userland_git.bbappend delete mode 100644 recipes/vc-graphics/vc-graphics.bbappend diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 8eada21..371befe 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -1,12 +1,12 @@ IMAGE_FSTYPES = "tar.gz ext3 rpi-sdimg" -PREFERRED_PROVIDER_virtual/libgles1 = "vc-graphics" -PREFERRED_PROVIDER_virtual/libgl = "vc-graphics" +PREFERRED_PROVIDER_virtual/libgles1 = "userland" +PREFERRED_PROVIDER_virtual/libgl = "userland" MACHINE_EXTRA_INSTALL = "\ - vc-graphics \ + userland \ " MACHINE_EXTRA_INSTALL_SDK = " \ - vc-graphics-dev \ + userland-dev \ " diff --git a/recipes/userland/userland_git.bbappend b/recipes/userland/userland_git.bbappend new file mode 100644 index 0000000..c76f5c4 --- /dev/null +++ b/recipes/userland/userland_git.bbappend @@ -0,0 +1 @@ +PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" diff --git a/recipes/vc-graphics/vc-graphics.bbappend b/recipes/vc-graphics/vc-graphics.bbappend deleted file mode 100644 index c76f5c4..0000000 --- a/recipes/vc-graphics/vc-graphics.bbappend +++ /dev/null @@ -1 +0,0 @@ -PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" -- cgit v1.2.3-54-g00ecf From 22caf5a9fd6cf00ff2b822c0a84f96b53f4b920f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 14 Oct 2013 13:13:47 +0300 Subject: raspberrypi: use adb over ethernet For raspberry pi, we don't need to load ffs modules. Change-Id: I80f86e71031c41a4b664ae2a20754881ed7393e0 Reviewed-by: Samuli Piippo --- recipes/adbd/files/raspberrypi/adb-init | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 recipes/adbd/files/raspberrypi/adb-init diff --git a/recipes/adbd/files/raspberrypi/adb-init b/recipes/adbd/files/raspberrypi/adb-init new file mode 100644 index 0000000..8910e0e --- /dev/null +++ b/recipes/adbd/files/raspberrypi/adb-init @@ -0,0 +1,21 @@ +#!/bin/sh + +DAEMON=/usr/bin/adbd + +case "$1" in +start) + start-stop-daemon --start --quiet --exec $DAEMON & + ;; +stop) + start-stop-daemon --stop --quiet --exec $DAEMON + ;; +restart) + start-stop-daemon --stop --quiet --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet --exec $DAEMON & + ;; +*) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac +exit 0 -- cgit v1.2.3-54-g00ecf From f35bcc5ed220e748241c1e06bcd1ab6a7c99e10d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 24 Oct 2013 11:16:57 +0300 Subject: Fix sound for emulator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Build driver for AC97 and load it at boot time. Change-Id: Ia30487a7f3bb315f83bcba48f6ea6c4b0f3f54fa Reviewed-by: Pasi Petäjäjärvi --- conf/distro/include/emulator.conf | 6 ++++++ recipes/linux/linux-yocto/snd_intel8x0.cfg | 1 + recipes/linux/linux-yocto_3.8.bbappend | 5 +++++ 3 files changed, 12 insertions(+) create mode 100644 recipes/linux/linux-yocto/snd_intel8x0.cfg diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index dfbda91..ab5fb76 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -3,6 +3,12 @@ IMAGE_ROOTFS_ALIGNMENT = "1048576" ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" IMAGE_FSTYPES = "ext3" +MACHINE_EXTRA_RRECOMMENDS += "\ + kernel-module-snd-intel8x0 \ + " + +kernel_autoload_snd-intel8x0 = "snd-intel8x0" + MACHINE_EXTRA_INSTALL = "\ llvm3.2 \ libegl-mesa \ diff --git a/recipes/linux/linux-yocto/snd_intel8x0.cfg b/recipes/linux/linux-yocto/snd_intel8x0.cfg new file mode 100644 index 0000000..6d78f08 --- /dev/null +++ b/recipes/linux/linux-yocto/snd_intel8x0.cfg @@ -0,0 +1 @@ +CONFIG_SND_INTEL8X0=m diff --git a/recipes/linux/linux-yocto_3.8.bbappend b/recipes/linux/linux-yocto_3.8.bbappend index def23ea..51c54e4 100644 --- a/recipes/linux/linux-yocto_3.8.bbappend +++ b/recipes/linux/linux-yocto_3.8.bbappend @@ -1 +1,6 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "\ + file://snd_intel8x0.cfg \ + " + COMPATIBLE_MACHINE += "|emulator" -- cgit v1.2.3-54-g00ecf From 713306041324f18fd546fbf99cd7d15ec1eeb6f2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 22 Oct 2013 14:32:56 +0300 Subject: Sound support for Raspberry Pi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Load appropriate kernel module and setup correct alsa configuration. Sound is routed to HDMI by default, so include amixer util that can be used to switch to analog output: amixer cset numid=3 1 Change-Id: I1a975992a45ea2a11ce44ded8b1649488e676341 Reviewed-by: Pasi Petäjäjärvi --- conf/distro/include/raspberrypi.conf | 2 ++ recipes/alsa/alsa-state.bbappend | 1 + recipes/alsa/alsa-state/raspberrypi/asound.conf | 9 +++++++++ recipes/images/b2qt-embedded-image.bb | 1 + 4 files changed, 13 insertions(+) create mode 100644 recipes/alsa/alsa-state.bbappend create mode 100644 recipes/alsa/alsa-state/raspberrypi/asound.conf diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 371befe..e7e12c3 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -10,3 +10,5 @@ MACHINE_EXTRA_INSTALL = "\ MACHINE_EXTRA_INSTALL_SDK = " \ userland-dev \ " + +module_autoload_snd-bcm2835 = "snd-bcm2835" diff --git a/recipes/alsa/alsa-state.bbappend b/recipes/alsa/alsa-state.bbappend new file mode 100644 index 0000000..72d991c --- /dev/null +++ b/recipes/alsa/alsa-state.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/recipes/alsa/alsa-state/raspberrypi/asound.conf b/recipes/alsa/alsa-state/raspberrypi/asound.conf new file mode 100644 index 0000000..83f7f9a --- /dev/null +++ b/recipes/alsa/alsa-state/raspberrypi/asound.conf @@ -0,0 +1,9 @@ +pcm.!default { + type hw + card 0 +} + +ctl.!default { + type hw + card 0 +} diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index 6dc4f1f..feb1cfd 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -52,6 +52,7 @@ IMAGE_INSTALL += "\ liberation-fonts \ tslib \ tslib-calibrate \ + alsa-utils-amixer \ ${GSTREAMER_EXTRA_INSTALL} \ ${TOOLS_EXTRA_INSTALL} \ ${MACHINE_EXTRA_INSTALL} \ -- cgit v1.2.3-54-g00ecf From 2ddb2aa8fe9ce32c9d52b639cdbf75939c6fb1b9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 7 Nov 2013 15:51:27 +0200 Subject: Move kernel console to ttyS0 for emulator Change-Id: I881e4423d22e70ddd658d29b554c62c1fa4924fb Reviewed-by: Rainer Keller --- classes/image-hdd.bbclass | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index fc76234..25d0a55 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -18,5 +18,21 @@ python do_hddimg() { bb.build.exec_func('create_hdd_image', d) } +python build_syslinux_cfg_append () { + import re + + try: + cfgfile = file(cfile, 'r+') + except OSError: + raise bb.build.funcFailed('Unable to open %s' % (cfile)) + + f_content = cfgfile.read() + f_content = re.sub('tty0', 'ttyS0,115200', f_content) + + cfgfile.seek(0) + cfgfile.write(f_content) + cfgfile.close() +} + addtask hddimg after do_bootdirectdisk before do_build do_hddimg[nostamp] = "1" -- cgit v1.2.3-54-g00ecf From 6817028102b978b16ea7fa04a029fc1cb1660058 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 15 Nov 2013 09:09:00 +0200 Subject: Include lighttpd and wayland for am335x-evm For now, this device is Mitel specific, adding components they have requested. Change-Id: I1230b5415132925c691f9e0e381d501adcf54fe3 Reviewed-by: Samuli Piippo --- conf/distro/include/am335x-evm.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index 65d0ba4..03ccb46 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf @@ -11,8 +11,11 @@ PREFERRED_VERSION_u-boot-am33x = "2013.01.01" MACHINE_EXTRA_INSTALL = "\ libgles-omap3 \ libgles-omap3-rawdemos \ + lighttpd \ + wayland \ " MACHINE_EXTRA_INSTALL_SDK = "\ libgles-omap3-dev \ + wayland-dev \ " -- cgit v1.2.3-54-g00ecf From 1cf4f1255ef5ccd6dc4e1e22d58c7d00f5d2f040 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 22 Nov 2013 15:10:00 +0200 Subject: Add license header to all recipes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I726d154e54a43d2561969d789709895d4c594da9 Reviewed-by: Eirik Aavitsland Reviewed-by: Topi Reiniö --- README | 22 ++++++++++++++++++++++ classes/image-hdd.bbclass | 22 ++++++++++++++++++++++ classes/image_types_sdcard.bbclass | 22 ++++++++++++++++++++++ conf/bblayers.conf.sample | 22 ++++++++++++++++++++++ conf/distro/b2qt.conf | 22 ++++++++++++++++++++++ conf/distro/include/am335x-evm.conf | 22 ++++++++++++++++++++++ conf/distro/include/beagleboard.conf | 22 ++++++++++++++++++++++ conf/distro/include/emulator.conf | 22 ++++++++++++++++++++++ conf/distro/include/imx53qsb.conf | 22 ++++++++++++++++++++++ conf/distro/include/nitrogen6x.conf | 22 ++++++++++++++++++++++ conf/distro/include/raspberrypi.conf | 22 ++++++++++++++++++++++ conf/layer.conf | 22 ++++++++++++++++++++++ conf/local.conf.sample | 22 ++++++++++++++++++++++ conf/machine/emulator.conf | 22 ++++++++++++++++++++++ recipes/adbd/adbd.bb | 22 ++++++++++++++++++++++ recipes/alsa/alsa-state.bbappend | 22 ++++++++++++++++++++++ recipes/alsa/alsa-state/raspberrypi/asound.conf | 22 ++++++++++++++++++++++ .../amd-gpu-x11-bin-mx51_11.09.01.bbappend | 22 ++++++++++++++++++++++ recipes/base-files/base-files_3.0.14.bbappend | 22 ++++++++++++++++++++++ recipes/gdb/gdb-cross-canadian_7.5.1.bbappend | 22 ++++++++++++++++++++++ .../gpu-viv-bin-mx6q_1.1.0.bbappend | 22 ++++++++++++++++++++++ recipes/images/b2qt-embedded-image.bb | 22 ++++++++++++++++++++++ recipes/init-ifupdown/init-ifupdown_1.0.bbappend | 22 ++++++++++++++++++++++ recipes/initscripts/initscripts_1.0.bbappend | 22 ++++++++++++++++++++++ recipes/libgles/libgles-omap3_4.05.00.03.bbappend | 22 ++++++++++++++++++++++ recipes/libgles/libgles-omap3_4.09.00.01.bbappend | 22 ++++++++++++++++++++++ recipes/linux/linux-am335x-psp_3.2.bbappend | 22 ++++++++++++++++++++++ recipes/linux/linux-boundary_3.0.35.bbappend | 22 ++++++++++++++++++++++ recipes/linux/linux-mainline_3.2.bbappend | 22 ++++++++++++++++++++++ recipes/linux/linux-yocto_3.8.bbappend | 22 ++++++++++++++++++++++ recipes/llvm/llvm-common.bb | 22 ++++++++++++++++++++++ recipes/llvm/llvm3.2_3.2.bb | 22 ++++++++++++++++++++++ recipes/mesa/mesa_9.1.3.bb | 22 ++++++++++++++++++++++ recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb | 22 ++++++++++++++++++++++ recipes/mkcard/mkcard_0.5.bb | 22 ++++++++++++++++++++++ recipes/openssh/openssh_6.1p1.bbappend | 22 ++++++++++++++++++++++ ...dk-packagegroup-b2qt-embedded-toolchain-host.bb | 22 ++++++++++++++++++++++ ...-packagegroup-b2qt-embedded-toolchain-target.bb | 22 ++++++++++++++++++++++ recipes/psplash/psplash_git.bbappend | 22 ++++++++++++++++++++++ recipes/u-boot/u-boot-am33x_2013.01.01.bbappend | 22 ++++++++++++++++++++++ recipes/u-boot/u-boot-beagleboard_2011.09.bbappend | 22 ++++++++++++++++++++++ recipes/u-boot/u-boot-script-boundary_git.bbappend | 22 ++++++++++++++++++++++ recipes/udev/udev_182.bbappend | 22 ++++++++++++++++++++++ recipes/userland/userland_git.bbappend | 22 ++++++++++++++++++++++ recipes/v86d/v86d_0.1.10.bbappend | 22 ++++++++++++++++++++++ recipes/virtualbox/mount-vboxsf_4.2.14.bb | 22 ++++++++++++++++++++++ .../virtualbox-guest-additions_4.2.14.bb | 22 ++++++++++++++++++++++ 47 files changed, 1034 insertions(+) diff --git a/README b/README index c642c1c..e0990da 100644 --- a/README +++ b/README @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + OpenEmbedded/Yocto meta layer for B2Qt on embedded Linux ========================================================== diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index 25d0a55..123c417 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + # need to define the dependency and the ROOTFS for directdisk do_bootdirectdisk[depends] += "${PN}:do_rootfs" ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass index 7b11482..221ccd4 100644 --- a/classes/image_types_sdcard.bbclass +++ b/classes/image_types_sdcard.bbclass @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + inherit image_types_fsl IMAGE_ROOTFS_EXTRA_SPACE = "300000" diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index 987a75d..4e3fb71 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly LCONF_VERSION = "6" diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 1af10b5..6dc189f 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + include conf/distro/poky.conf DISTRO = "b2qt" diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index 03ccb46..b653d44 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + IMAGE_FSTYPES = "tar.gz" PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3" diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index 728a3ea..0b6454f 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + IMAGE_CLASSES += "image_types_sdcard" IMAGE_FSTYPES = "tar.gz ext3 sdcard" diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index ab5fb76..ce17052 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + IMAGE_CLASSES += "image-hdd" IMAGE_ROOTFS_ALIGNMENT = "1048576" ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index 0d96d9a..ca8595d 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + IMAGE_FSTYPES = "tar.gz" PREFERRED_PROVIDER_virtual/libgl = "amd-gpu-x11-bin-mx51" diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index cf99d11..dbb9478 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + IMAGE_CLASSES += "image_types_sdcard" IMAGE_FSTYPES = "tar.gz ext3 sdcard" diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index e7e12c3..d167c43 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + IMAGE_FSTYPES = "tar.gz ext3 rpi-sdimg" PREFERRED_PROVIDER_virtual/libgles1 = "userland" diff --git a/conf/layer.conf b/conf/layer.conf index 9e97746..952abcb 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + # We have a conf and classes directory, append to BBPATH BBPATH .= ":${LAYERDIR}" diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 00c9a07..5c298c4 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + # # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf index e118a44..2aac3ab 100644 --- a/conf/machine/emulator.conf +++ b/conf/machine/emulator.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + #@TYPE: Machine #@NAME: virtual box emulator #@DESCRIPTION: Machine configuration for running a common x86 diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb index aa8f5e9..582305b 100644 --- a/recipes/adbd/adbd.bb +++ b/recipes/adbd/adbd.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "Android Debug Bridge Daemon" HOMEPAGE = "http://developer.android.com/tools/help/adb.html" SECTION = "devel" diff --git a/recipes/alsa/alsa-state.bbappend b/recipes/alsa/alsa-state.bbappend index 72d991c..d1017c3 100644 --- a/recipes/alsa/alsa-state.bbappend +++ b/recipes/alsa/alsa-state.bbappend @@ -1 +1,23 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/recipes/alsa/alsa-state/raspberrypi/asound.conf b/recipes/alsa/alsa-state/raspberrypi/asound.conf index 83f7f9a..0d270a5 100644 --- a/recipes/alsa/alsa-state/raspberrypi/asound.conf +++ b/recipes/alsa/alsa-state/raspberrypi/asound.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + pcm.!default { type hw card 0 diff --git a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend index 53a4b1a..3c48097 100644 --- a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend +++ b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + # dependency to x11 only when distro features have it DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend index 81c758c..c276c57 100644 --- a/recipes/base-files/base-files_3.0.14.bbappend +++ b/recipes/base-files/base-files_3.0.14.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + do_install_append() { ln -s /home/root ${D}/root echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname diff --git a/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend b/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend index a13df13..f96bc35 100644 --- a/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend +++ b/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + do_compile_prepend() { cat > ${WORKDIR}/python << EOF #! /bin/sh diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend index 9e260be..ccbbf8f 100644 --- a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend +++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + PROVIDES += "virtual/libgl" FILES_libegl-mx6-dev += "${includedir}/KHR ${includedir}/EGL" diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index feb1cfd..40719eb 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "B2Qt on embedded Linux SDK image" LICENSE = "CLOSED" PR = "r0" diff --git a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend index 31c189d..eb545f7 100644 --- a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_beagleboard = " file://fixed_mac_address" diff --git a/recipes/initscripts/initscripts_1.0.bbappend b/recipes/initscripts/initscripts_1.0.bbappend index 196ac2f..9c159bc 100644 --- a/recipes/initscripts/initscripts_1.0.bbappend +++ b/recipes/initscripts/initscripts_1.0.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + do_configure_append() { sed -i -e "/echo/d" ${WORKDIR}/banner.sh } diff --git a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend index e43ea69..97bb2b3 100644 --- a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend +++ b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" TOOLCHAIN_PATH = "${STAGING_DIR_TARGET}" diff --git a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend index 7770c39..5ef2e29 100644 --- a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" PROVIDES += "virtual/libgl" diff --git a/recipes/linux/linux-am335x-psp_3.2.bbappend b/recipes/linux/linux-am335x-psp_3.2.bbappend index 1fe9d2a..c8f0f68 100644 --- a/recipes/linux/linux-am335x-psp_3.2.bbappend +++ b/recipes/linux/linux-am335x-psp_3.2.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + do_configure_append() { # FunctionFS for adb echo "CONFIG_USB_LIBCOMPOSITE=y" >> ${S}/.config diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.0.35.bbappend index 6d30629..fa0488a 100644 --- a/recipes/linux/linux-boundary_3.0.35.bbappend +++ b/recipes/linux/linux-boundary_3.0.35.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + do_configure_prepend() { # Use multitouch protocol for touchscreen that support it diff --git a/recipes/linux/linux-mainline_3.2.bbappend b/recipes/linux/linux-mainline_3.2.bbappend index 1e979da..6ca8c2e 100644 --- a/recipes/linux/linux-mainline_3.2.bbappend +++ b/recipes/linux/linux-mainline_3.2.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + do_configure_prepend() { # Builtin network driver, so networking is initialized correctly during boot echo "CONFIG_USB_NET_SMSC95XX=y" >> ${WORKDIR}/defconfig diff --git a/recipes/linux/linux-yocto_3.8.bbappend b/recipes/linux/linux-yocto_3.8.bbappend index 51c54e4..fa6d5eb 100644 --- a/recipes/linux/linux-yocto_3.8.bbappend +++ b/recipes/linux/linux-yocto_3.8.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://snd_intel8x0.cfg \ diff --git a/recipes/llvm/llvm-common.bb b/recipes/llvm/llvm-common.bb index 192919e..0e20600 100644 --- a/recipes/llvm/llvm-common.bb +++ b/recipes/llvm/llvm-common.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "Helper script for OE's llvm support" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ diff --git a/recipes/llvm/llvm3.2_3.2.bb b/recipes/llvm/llvm3.2_3.2.bb index 71a53c1..92b62f9 100644 --- a/recipes/llvm/llvm3.2_3.2.bb +++ b/recipes/llvm/llvm3.2_3.2.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "The Low Level Virtual Machine" HOMEPAGE = "http://llvm.org" # 3-clause BSD-like diff --git a/recipes/mesa/mesa_9.1.3.bb b/recipes/mesa/mesa_9.1.3.bb index 26a2154..99c3a38 100644 --- a/recipes/mesa/mesa_9.1.3.bb +++ b/recipes/mesa/mesa_9.1.3.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + SUMMARY = "A free implementation of the OpenGL API" DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \ a system for rendering interactive 3D graphics. \ diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb index 8944c75..b37cad8 100644 --- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb +++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "B2Qt on embedded Linux SDK toolchain" PR = "r0" LICENSE = "CLOSED" diff --git a/recipes/mkcard/mkcard_0.5.bb b/recipes/mkcard/mkcard_0.5.bb index 3671f7a..d1da05a 100644 --- a/recipes/mkcard/mkcard_0.5.bb +++ b/recipes/mkcard/mkcard_0.5.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "mkcard.sh v0.5" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://${COREBASE}/bitbake/COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/recipes/openssh/openssh_6.1p1.bbappend b/recipes/openssh/openssh_6.1p1.bbappend index 949a5a9..7c35cd4 100644 --- a/recipes/openssh/openssh_6.1p1.bbappend +++ b/recipes/openssh/openssh_6.1p1.bbappend @@ -1,2 +1,24 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + export libexecdir="/usr/libexec" diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index 8458ffb..7194f91 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "Host packages for B2Qt on embedded Linux SDK" PR = "r0" ALLOW_EMPTY_${PN} = "1" diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb index 4ff29d0..d56b5be 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "Target packages for B2Qt on embedded Linux SDK" PR = "r0" ALLOW_EMPTY_${PN} = "1" diff --git a/recipes/psplash/psplash_git.bbappend b/recipes/psplash/psplash_git.bbappend index 9a098f4..f9f3a6e 100644 --- a/recipes/psplash/psplash_git.bbappend +++ b/recipes/psplash/psplash_git.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SPLASH_IMAGES = "file://qt.png;outsuffix=default" diff --git a/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend b/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend index 48d7885..bd00147 100644 --- a/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend +++ b/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-am335x-evm-disable-console-cursor-blinking.patch \ diff --git a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend index 787ac42..6d0e105 100644 --- a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend +++ b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-beagle-change-default-kernel-args.patch \ diff --git a/recipes/u-boot/u-boot-script-boundary_git.bbappend b/recipes/u-boot/u-boot-script-boundary_git.bbappend index c845717..3fc3b47 100644 --- a/recipes/u-boot/u-boot-script-boundary_git.bbappend +++ b/recipes/u-boot/u-boot-script-boundary_git.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-nitrogen6x-disable-console-cursor-blinking.patch \ diff --git a/recipes/udev/udev_182.bbappend b/recipes/udev/udev_182.bbappend index 564d9a1..761d792 100644 --- a/recipes/udev/udev_182.bbappend +++ b/recipes/udev/udev_182.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_prepend := "${THISDIR}:" SRC_URI += "file://0001-support-multitouch-screens.patch" diff --git a/recipes/userland/userland_git.bbappend b/recipes/userland/userland_git.bbappend index c76f5c4..0e748cd 100644 --- a/recipes/userland/userland_git.bbappend +++ b/recipes/userland/userland_git.bbappend @@ -1 +1,23 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" diff --git a/recipes/v86d/v86d_0.1.10.bbappend b/recipes/v86d/v86d_0.1.10.bbappend index 7c9a860..e2a9b43 100644 --- a/recipes/v86d/v86d_0.1.10.bbappend +++ b/recipes/v86d/v86d_0.1.10.bbappend @@ -1,2 +1,24 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + COMPATIBLE_MACHINE = "(qemux86|emulator)" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/recipes/virtualbox/mount-vboxsf_4.2.14.bb b/recipes/virtualbox/mount-vboxsf_4.2.14.bb index f529f18..656f379 100644 --- a/recipes/virtualbox/mount-vboxsf_4.2.14.bb +++ b/recipes/virtualbox/mount-vboxsf_4.2.14.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "VirtualBox Guest Additions for Linux: mount" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${WORKDIR}/VirtualBox-${PV}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" diff --git a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb index fe366b1..09358df 100644 --- a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb +++ b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "Kernel drivers for the VirtualBox guest additions" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${WORKDIR}/VirtualBox-${PV}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" -- cgit v1.2.3-54-g00ecf From 43102d40e3d72d8ec26e243a3cf8584dd4336cfe Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 26 Nov 2013 11:18:13 +0200 Subject: Update readme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add raspberrypi meta repository and update correct branch info. Change-Id: Ia206a6608442e8e5ad9c5d104175778bafdc323c Reviewed-by: Pasi Petäjäjärvi --- README | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/README b/README index e0990da..eb529bf 100644 --- a/README +++ b/README @@ -20,34 +20,35 @@ ## ############################################################################# -OpenEmbedded/Yocto meta layer for B2Qt on embedded Linux +OpenEmbedded/Yocto meta layer for Boot to Qt Software Stack ========================================================== -This layer provides B2Qt on embedded Linux recipes for use with +This layer provides B2Qt for embedded Linux recipes for use with OpenEmbedded and Yocto. This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: dylan revision: HEAD URI: git://git.openembedded.org/meta-openembedded layer: meta-oe -branch: master +branch: dylan revision: HEAD URI: git://git.yoctoproject.org/meta-ti -branch: master +branch: dylan revision: HEAD URI: git://git.yoctoproject.org/meta-fsl-arm -branch: master +branch: dylan revision: HEAD -URI: git://git.yoctoproject.org/meta-fsl-arm-extra -branch: master +URI: git://github.com/Freescale/meta-fsl-arm-extra.git +branch: dylan revision: HEAD -Main layer maintainer: Samuli Piippo - +URI: git://git.yoctoproject.org/meta-raspberrypi +branch: dylan +revision: HEAD -- cgit v1.2.3-54-g00ecf From 706fc1ceecaaefe5e6fd80db15bb3e8a98e3561d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 17 Dec 2013 09:23:44 +0200 Subject: Move to yocto 1.5 dora branch Remove recipe appends that are fixed upstream and make changes needed for 1.5 branch. Tested and verified with nitrogen6x. Change-Id: I7b8ca04f2f4523fa5113bbe43767e3e90f243cd9 Reviewed-by: Samuli Piippo --- conf/distro/b2qt.conf | 5 +- recipes/gdb/gdb-cross-canadian_7.5.1.bbappend | 35 ------ .../gpu-viv-bin-mx6q_1.1.0.bbappend | 25 ---- recipes/mesa/mesa_9.1.3.bb | 139 --------------------- recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb | 2 +- recipes/openssh/openssh_6.1p1.bbappend | 24 ---- ...itrogen6x-disable-console-cursor-blinking.patch | 17 +-- 7 files changed, 13 insertions(+), 234 deletions(-) delete mode 100644 recipes/gdb/gdb-cross-canadian_7.5.1.bbappend delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend delete mode 100644 recipes/mesa/mesa_9.1.3.bb delete mode 100644 recipes/openssh/openssh_6.1p1.bbappend diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 6dc189f..6dc96d2 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -24,7 +24,7 @@ include conf/distro/poky.conf DISTRO = "b2qt" DISTRO_NAME = "Boot to Qt for Embedded Linux" -DISTRO_VERSION = "1.4" +DISTRO_VERSION = "1.5" SDK_VERSION := "${DISTRO_VERSION}" MAINTAINER = "B2Qt " @@ -38,7 +38,8 @@ include conf/distro/include/${MACHINE}.conf SYSVINIT_ENABLED_GETTYS = "" -DISTRO_FEATURES ?= "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs nfc ${DISTRO_FEATURES_LIBC}" +DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc" +POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch" DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" diff --git a/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend b/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend deleted file mode 100644 index f96bc35..0000000 --- a/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################# -## -## Copyright (C) 2013 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://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -do_compile_prepend() { -cat > ${WORKDIR}/python << EOF -#! /bin/sh -case "\$2" in - --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}/" ;; - --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;; - --exec-prefix) echo "${exec_prefix}" ;; - *) exit 1 ;; -esac -exit 0 -EOF - chmod +x ${WORKDIR}/python -} diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend deleted file mode 100644 index ccbbf8f..0000000 --- a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################# -## -## Copyright (C) 2013 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://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -PROVIDES += "virtual/libgl" - -FILES_libegl-mx6-dev += "${includedir}/KHR ${includedir}/EGL" diff --git a/recipes/mesa/mesa_9.1.3.bb b/recipes/mesa/mesa_9.1.3.bb deleted file mode 100644 index 99c3a38..0000000 --- a/recipes/mesa/mesa_9.1.3.bb +++ /dev/null @@ -1,139 +0,0 @@ -############################################################################# -## -## Copyright (C) 2013 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://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -SUMMARY = "A free implementation of the OpenGL API" -DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \ -a system for rendering interactive 3D graphics. \ -A variety of device drivers allows Mesa to be used in many different environments \ -ranging from software emulation to complete hardware acceleration for modern GPUs. \ -Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \ -environment." - -HOMEPAGE = "http://mesa3d.org" -BUGTRACKER = "https://bugs.freedesktop.org" -SECTION = "x11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555d" - -INC_PR = "r9" -PE = "2" - -export WANT_LLVM_RELEASE = "3.2" - -DEPENDS = "expat makedepend-native flex-native bison-native llvm${WANT_LLVM_RELEASE}" - -PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" - -inherit autotools pkgconfig pythonnative - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ - file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \ - file://fix-glsl-cross.patch \ - file://0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch \ - file://0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \ - file://0001-fix-xlib-dependency-from-pipe-loader.patch \ - file://glapi.patch \ - " - -SRC_URI[md5sum] = "952ccd03547ed72333b64e1746cf8ada" -SRC_URI[sha256sum] = "8d5dac2202d0355bff5cfd183582ec8167d1d1227b7bb7a669acecbeaa52d766" - -S = "${WORKDIR}/Mesa-${PV}" - -EXTRA_OECONF = " \ - --enable-opengl \ - --enable-gles2 \ - --enable-egl --with-egl-platforms=fbdev \ - --enable-gallium --enable-gallium-llvm --enable-gallium-egl --with-llvm-shared-libs --with-gallium-drivers="swrast" \ - --enable-shared-glapi \ - --disable-glx \ - --enable-dri --with-dri-drivers="" \ - --disable-gles1 \ - --disable-gles3 \ - --disable-openvg \ - " - -# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) -FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" - -# Multiple virtual/gl providers being built breaks staging -EXCLUDE_FROM_WORLD = "1" - -# Remove the mesa dependency on mesa-dev, as mesa is empty -RDEPENDS_${PN}-dev = "" - -PACKAGES =+ "libegl-mesa libegl-mesa-dev \ - libglapi libglapi-dev \ - libgles2-mesa libgles2-mesa-dev \ - libegl-gallium \ - " - -do_install_append () { - # Drivers never need libtool .la files - rm -f ${D}${libdir}/egl/*.la - rm -f ${D}${libdir}/gallium-pipe/*.la -} - -# For the packages that make up the OpenGL interfaces, inject variables so that -# they don't get Debian-renamed (which would remove the -mesa suffix), and -# RPROVIDEs/RCONFLICTs on the generic libgl name. -python __anonymous() { - for p in (("libegl", "libegl1"), ("libgl", "libgl1"), - ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), - ("libgles3",)): - fullp = p[0] + "-mesa" - pkgs = " ".join(p) - d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") - d.appendVar("RREPLACES_" + fullp, pkgs) - d.appendVar("RPROVIDES_" + fullp, pkgs) - d.appendVar("RCONFLICTS_" + fullp, pkgs) - - # For -dev, the first element is both the Debian and original name - fullp += "-dev" - pkgs = p[0] + "-dev" - d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") - d.appendVar("RREPLACES_" + fullp, pkgs) - d.appendVar("RPROVIDES_" + fullp, pkgs) - d.appendVar("RCONFLICTS_" + fullp, pkgs) -} - -python mesa_populate_packages() { - pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe") - do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') -} - -PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " - -PACKAGES_DYNAMIC += "^mesa-driver-.*" - -FILES_libegl-mesa = "${libdir}/libEGL.so.*" -FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*" -FILES_libglapi = "${libdir}/libglapi.so.*" -FILES_libegl-gallium = "${libdir}/egl/egl_gallium.so* ${libdir}/egl/st_GL.so*" - -FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" -FILES_libglapi-dev = "${libdir}/libglapi.*" -FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" - -FILES_${PN}-dbg += "${libdir}/egl/.debug/* ${libdir}/gallium-pipe/.debug" - - diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb index b37cad8..f9cded9 100644 --- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb +++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb @@ -24,7 +24,7 @@ DESCRIPTION = "B2Qt on embedded Linux SDK toolchain" PR = "r0" LICENSE = "CLOSED" -TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-host packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}" +TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-host packagegroup-cross-canadian-${MACHINE}" TOOLCHAIN_TARGET_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-target" require recipes-core/meta/meta-toolchain.bb diff --git a/recipes/openssh/openssh_6.1p1.bbappend b/recipes/openssh/openssh_6.1p1.bbappend deleted file mode 100644 index 7c35cd4..0000000 --- a/recipes/openssh/openssh_6.1p1.bbappend +++ /dev/null @@ -1,24 +0,0 @@ -############################################################################# -## -## Copyright (C) 2013 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://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -export libexecdir="/usr/libexec" - diff --git a/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch b/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch index 3c65a20..9caee44 100644 --- a/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch +++ b/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch @@ -1,6 +1,6 @@ -From 6b894707404a1aeb3072d4b3bfc486ff9ad37ac4 Mon Sep 17 00:00:00 2001 +From d01717f74b5c8d62e93d29d03df0c49b67645d32 Mon Sep 17 00:00:00 2001 From: Samuli Piippo -Date: Tue, 9 Jul 2013 15:31:30 +0300 +Date: Mon, 16 Dec 2013 15:42:45 +0200 Subject: [PATCH] nitrogen6x: disable console cursor blinking --- @@ -8,17 +8,18 @@ Subject: [PATCH] nitrogen6x: disable console cursor blinking 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/boundary/nitrogen6x/6x_bootscript.txt b/board/boundary/nitrogen6x/6x_bootscript.txt -index 1d766ca..80b91ea 100644 +index 9533713..2985af2 100644 --- a/board/boundary/nitrogen6x/6x_bootscript.txt +++ b/board/boundary/nitrogen6x/6x_bootscript.txt -@@ -53,6 +53,6 @@ done +@@ -52,7 +52,7 @@ while test "4" -ne $nextcon ; do + done setenv bootargs $bootargs $fbmem +-setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 rootwait" ++setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 rootwait" --setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p2 rootwait consoleblank=0 ; -+setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p2 rootwait consoleblank=0 vt.global_cursor_default=0 ; - ${fs}load mmc ${disk}:1 10800000 uImage && bootm 10800000 ; echo "Error loading kernel image" - + if itest.s x$bootpart == x ; then + bootpart=1 -- 1.7.10.4 -- cgit v1.2.3-54-g00ecf From 6c8d6e64fc933c0115948ae7293660df2e77649d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 9 Jan 2014 15:31:54 +0200 Subject: toolchain: libudev-dev is no more, using udev-dev Change-Id: I86fbd3c8e6c1f7311b1f1d7e9626239b0e22ea18 Reviewed-by: Samuli Piippo --- .../nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb index d56b5be..809a654 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb @@ -44,7 +44,7 @@ RDEPENDS_${PN} += "\ gst-plugins-base-dev \ icu-dev \ libxslt-dev \ - libudev-dev \ + udev-dev \ tslib-dev \ ${MACHINE_EXTRA_INSTALL_SDK} \ " -- cgit v1.2.3-54-g00ecf From 71ce20d2adfb0a1d363d89e27d60c50e94b99bfb Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 10 Jan 2014 12:59:22 +0200 Subject: nitrogen6x boot script changed Moving cursor blinking option to new file. Change-Id: I9cdddebe66d891571a1f0ce87ccbb727edeb42d7 Reviewed-by: Samuli Piippo --- ...0001-nitrogen6x-disable-console-cursor-blinking.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch b/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch index 9caee44..d97921c 100644 --- a/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch +++ b/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch @@ -1,17 +1,17 @@ -From d01717f74b5c8d62e93d29d03df0c49b67645d32 Mon Sep 17 00:00:00 2001 +From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001 From: Samuli Piippo -Date: Mon, 16 Dec 2013 15:42:45 +0200 +Date: Fri, 10 Jan 2014 12:37:20 +0200 Subject: [PATCH] nitrogen6x: disable console cursor blinking --- - board/boundary/nitrogen6x/6x_bootscript.txt | 2 +- + board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/board/boundary/nitrogen6x/6x_bootscript.txt b/board/boundary/nitrogen6x/6x_bootscript.txt -index 9533713..2985af2 100644 ---- a/board/boundary/nitrogen6x/6x_bootscript.txt -+++ b/board/boundary/nitrogen6x/6x_bootscript.txt -@@ -52,7 +52,7 @@ while test "4" -ne $nextcon ; do +diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt +index d933fa0..2d7c575 100644 +--- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt ++++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt +@@ -56,7 +56,7 @@ while test "4" -ne $nextcon ; do done setenv bootargs $bootargs $fbmem -- cgit v1.2.3-54-g00ecf From f889d20d744d0dc2017d513ce7ea704cd2091046 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Jan 2014 10:32:25 +0200 Subject: RPI: increase GPU memory to 128 Default GPU memory config is 64 MB, which was insufficient for some of the B2Qt demos. Task-number: QTEE-293 Change-Id: I6049c9577d1fea59619f07e9fc0ab4890f06a54b Reviewed-by: Samuli Piippo --- conf/distro/include/raspberrypi.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index d167c43..19b2fdd 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -34,3 +34,6 @@ MACHINE_EXTRA_INSTALL_SDK = " \ " module_autoload_snd-bcm2835 = "snd-bcm2835" + +# additional memory for GPU +GPU_MEM = "128" -- cgit v1.2.3-54-g00ecf From 0e3e98cc86d6256059cdc4353a99823b07dfe80d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 20 Jan 2014 08:55:14 +0200 Subject: Add LinuxMint-16 as a tested platform Change-Id: I2a242af4012e518958f15d1cf7912c097529f344 Reviewed-by: Samuli Piippo --- conf/distro/b2qt.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 6dc96d2..033ae54 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -32,6 +32,7 @@ MAINTAINER = "B2Qt " SANITY_TESTED_DISTROS += " \ Ubuntu 11.04 \n \ LinuxMint-14 \n \ + LinuxMint-16 \n \ " include conf/distro/include/${MACHINE}.conf -- cgit v1.2.3-54-g00ecf From 407bd82e446d121405af9186758aa6d10b907d9f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 22 Jan 2014 11:54:39 +0200 Subject: Install all kernel modules Instead of handpicking required modules, install all that are recommended. Change-Id: I292f9136d5d04d2ffff51737d337e4ccd93fe1db Reviewed-by: Samuli Piippo --- recipes/images/b2qt-embedded-image.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index 40719eb..3d092af 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -61,6 +61,7 @@ TOOLS_EXTRA_INSTALL = "\ " IMAGE_INSTALL += "\ + kernel-modules \ psplash \ openssh-sftp-server \ openssl \ -- cgit v1.2.3-54-g00ecf From 79859333c1414f2a47a9dd4a0687bf6495f53e29 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 22 Jan 2014 12:20:59 +0200 Subject: rpi: disable bbappend from meta-raspberrypi Now using meta-raspberrypi from master branch, but needed to disable bbappend for mesa recipe which does not exist. Change-Id: I8f3eab483ac0376285f056625f946d6b6c39f786 Reviewed-by: Samuli Piippo --- conf/local.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 5c298c4..f64c0b8 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -275,7 +275,7 @@ CONF_VERSION = "1" INHERIT += "rm_work" -BBMASK = "meta-ti/recipes-misc" +BBMASK = "meta-ti/recipes-misc|meta-raspberrypi/recipes-graphics/mesa/mesa_9.2.2.bbappend" ACCEPT_FSL_EULA = "1" LICENSE_FLAGS_WHITELIST = "commercial" -- cgit v1.2.3-54-g00ecf From c3918d45cd6ae9601d99bf695d8672f2fc7f1f1e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 23 Jan 2014 16:00:10 +0200 Subject: gpu-viv-bin-mx6q: remove dependency to mesa Change-Id: I8785150d8fcdf253483b13588e7382d0cd59b78d Reviewed-by: Samuli Piippo --- recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend | 1 + 1 file changed, 1 insertion(+) create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend new file mode 100644 index 0000000..bed361e --- /dev/null +++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend @@ -0,0 +1 @@ +RDEPENDS_libgl-mx6-dev = "" -- cgit v1.2.3-54-g00ecf From 20a3734c0da057a51aadc89e3dba163367611dc5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 23 Jan 2014 13:36:37 +0200 Subject: upgrade emulator components - kernel 3.10 - LLVM 3.3 - mesa 9.1.6 Change-Id: Ib15c6826ab480e39e4efb7a16d42030b55ad6c3b Reviewed-by: Samuli Piippo --- classes/image-hdd.bbclass | 19 +-- conf/distro/include/emulator.conf | 2 +- conf/machine/emulator.conf | 1 - recipes/linux/linux-yocto_3.10.bbappend | 29 ++++ recipes/linux/linux-yocto_3.8.bbappend | 28 ---- recipes/llvm/llvm-common.bb | 44 ------ recipes/llvm/llvm-common/llvm-config | 10 -- recipes/llvm/llvm.inc | 226 ----------------------------- recipes/llvm/llvm3.2/arm_fenv_uclibc.patch | 14 -- recipes/llvm/llvm3.2_3.2.bb | 127 ---------------- recipes/mesa/mesa_9.1.6.bbappend | 6 + 11 files changed, 38 insertions(+), 468 deletions(-) create mode 100644 recipes/linux/linux-yocto_3.10.bbappend delete mode 100644 recipes/linux/linux-yocto_3.8.bbappend delete mode 100644 recipes/llvm/llvm-common.bb delete mode 100644 recipes/llvm/llvm-common/llvm-config delete mode 100644 recipes/llvm/llvm.inc delete mode 100644 recipes/llvm/llvm3.2/arm_fenv_uclibc.patch delete mode 100644 recipes/llvm/llvm3.2_3.2.bb create mode 100644 recipes/mesa/mesa_9.1.6.bbappend diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index 123c417..fb59c20 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -29,32 +29,17 @@ SYSLINUX_PROMPT = "0" SYSLINUX_TIMEOUT = "1" SYSLINUX_LABELS = "boot" LABELS_append = " ${SYSLINUX_LABELS} " +SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200" inherit image_types boot-directdisk create_hdd_image () { - ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd + ln -fs ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd } python do_hddimg() { bb.build.exec_func('create_hdd_image', d) } -python build_syslinux_cfg_append () { - import re - - try: - cfgfile = file(cfile, 'r+') - except OSError: - raise bb.build.funcFailed('Unable to open %s' % (cfile)) - - f_content = cfgfile.read() - f_content = re.sub('tty0', 'ttyS0,115200', f_content) - - cfgfile.seek(0) - cfgfile.write(f_content) - cfgfile.close() -} - addtask hddimg after do_bootdirectdisk before do_build do_hddimg[nostamp] = "1" diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index ce17052..d3d5efd 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -32,7 +32,7 @@ MACHINE_EXTRA_RRECOMMENDS += "\ kernel_autoload_snd-intel8x0 = "snd-intel8x0" MACHINE_EXTRA_INSTALL = "\ - llvm3.2 \ + llvm3.3 \ libegl-mesa \ libegl-gallium \ libgles2-mesa \ diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf index 2aac3ab..f2628d5 100644 --- a/conf/machine/emulator.conf +++ b/conf/machine/emulator.conf @@ -29,7 +29,6 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.8%" require conf/machine/include/tune-i586.inc diff --git a/recipes/linux/linux-yocto_3.10.bbappend b/recipes/linux/linux-yocto_3.10.bbappend new file mode 100644 index 0000000..9cd7e69 --- /dev/null +++ b/recipes/linux/linux-yocto_3.10.bbappend @@ -0,0 +1,29 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "\ + file://snd_intel8x0.cfg \ + " + +KMACHINE_emulator = "qemux86" +COMPATIBLE_MACHINE_emulator = "emulator" diff --git a/recipes/linux/linux-yocto_3.8.bbappend b/recipes/linux/linux-yocto_3.8.bbappend deleted file mode 100644 index fa6d5eb..0000000 --- a/recipes/linux/linux-yocto_3.8.bbappend +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################# -## -## Copyright (C) 2013 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://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "\ - file://snd_intel8x0.cfg \ - " - -COMPATIBLE_MACHINE += "|emulator" diff --git a/recipes/llvm/llvm-common.bb b/recipes/llvm/llvm-common.bb deleted file mode 100644 index 0e20600..0000000 --- a/recipes/llvm/llvm-common.bb +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################# -## -## Copyright (C) 2013 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://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -DESCRIPTION = "Helper script for OE's llvm support" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ -" - -SRC_URI = "file://llvm-config" - -ALLOW_EMPTY_${PN} = "1" -SYSROOT_PREPROCESS_FUNCS_append_class-target = " llvm_common_sysroot_preprocess" - -llvm_common_sysroot_preprocess() { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 0755 ${WORKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ -} - -do_install_virtclass-native() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/llvm-config ${D}${bindir} -} - -BBCLASSEXTEND = "native" diff --git a/recipes/llvm/llvm-common/llvm-config b/recipes/llvm/llvm-common/llvm-config deleted file mode 100644 index a9a416d..0000000 --- a/recipes/llvm/llvm-common/llvm-config +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# Wrapper script for real llvm-config. Simply calls - -if [ $WANT_LLVM_RELEASE ]; then - exec `dirname $0`/${TARGET_PREFIX}llvm-config$WANT_LLVM_RELEASE ${@} -else - echo "The variable WANT_LLVM_RELEASE is not defined and exported" - echo "by your build recipe. Go figure." - exit 1 -fi diff --git a/recipes/llvm/llvm.inc b/recipes/llvm/llvm.inc deleted file mode 100644 index fcd2666..0000000 --- a/recipes/llvm/llvm.inc +++ /dev/null @@ -1,226 +0,0 @@ -# LLVM does not provide ABI stability between different versions. For this -# reason OE makes it possible to build and install different llvm versions -# at the same time. -# -# This is true for the normal recipes as well as the native ones. -# -# All regular installation directories are prefixed with 'llvm${LLVM_RELEASE}' -# e.g. "${STAGING_BINDIR}/llvm2.5" or "${STAGING_INCDIR}/llvm2.5" -# -# For your program or library that makes use of llvm you do should not need to -# modify anything as long as it uses the results of various llvm-config -# invocations. If you need customizations something is wrong and it needs to be -# fixed (report bug). -# -# However the *recipe* for your program/library *must* declare -# export WANT_LLVM_RELEASE = "" -# The version number is picked up by a generic wrapper script which just calls -# the variant of the specified version. - -DESCRIPTION = "The Low Level Virtual Machine" -HOMEPAGE = "http://llvm.org" -# 3-clause BSD-like -LICENSE = "NCSA" -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=0ac5f799a2d89477c75b0a378b221855" - -DEPENDS = "llvm${LLVM_RELEASE}-native llvm-common" -DEPENDS_virtclass-native = "llvm-common-native cmake-native" - -INC_PR = "r2" - -SRC_URI = "http://llvm.org/releases/${PV}/llvm-${PV}.tgz" - -S = "${WORKDIR}/llvm-${PV}" - -inherit cmake perlnative pythonnative - -# Defines the LLVM supported arches. By now we always build either for ${BUILD} -# (native) or ${TARGET}. In the future it may make sense to enable all backends -# for the non-native build. The decision which backends are used is made by -# the 3rd party program or library that uses llvm anyway. -LLVM_ARCH = "${@get_llvm_arch(d)}" - -# This is used for generating the install directory for the llvm libraries, -# binaries and headers. It makes side by side installation of those possible. -LLVM_RELEASE = "${PV}" - -# llvm *must* be built out of tree -OECMAKE_SOURCEPATH = ".." -OECMAKE_BUILDPATH = "build" -EXTRA_OECMAKE = "\ - -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm${LLVM_RELEASE}/tblgen \ - -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \ - -DCMAKE_LINKER:FILEPATH=${LD} \ - -DCMAKE_AR:FILEPATH=${AR} \ - -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \ - -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \ - -DCMAKE_RANLIB:FILEPATH=${RANLIB} \ - -DCMAKE_STRIP:FILEPATH=${STRIP} \ - -DNM_PATH:FILEPATH=${NM} \ - -DLLVM_ENABLE_PIC:BOOL=ON \ - -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \ - -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \ - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_SKIP_BUILD_RPATH:BOOL=ON \ -" -# We need to reset this to avoid breakage as we build out of tree -TOOLCHAIN_OPTIONS = "" - -PACKAGES_DYNAMIC = "llvm-*" - -# the difference to the non-native build is that we do not need -# to declare the location of the tblgen executable. -EXTRA_OECMAKE_virtclass-native = "\ - -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \ - -DCMAKE_LINKER:FILEPATH=${LD} \ - -DCMAKE_AR:FILEPATH=${AR} \ - -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \ - -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \ - -DCMAKE_RANLIB:FILEPATH=${RANLIB} \ - -DCMAKE_STRIP:FILEPATH=${STRIP} \ - -DNM_PATH:FILEPATH=${NM} \ -" - -PACKAGES_virtclass-native = "" - -PACKAGES_DYNAMIC_virtclass-native = "" - -python populate_packages_prepend () { - libllvm_libdir = bb.data.expand('${libdir}/llvm${LLVM_RELEASE}', d) - do_split_packages(d, libllvm_libdir, '^lib(.*)\.so$', 'libllvm-%s', 'Split package for %s', allow_dirs=True) -} - -FILES_${PN} = "" -ALLOW_EMPTY_${PN} = "1" - -FILES_${PN}-dbg += "${libdir}/llvm${LLVM_RELEASE}/.debug ${bindir}/llvm${LLVM_RELEASE}/.debug" - -FILES_${PN}-dev = " \ - ${includedir} \ - ${bindir}/* \ - ${libdir}/llvm${LLVM_RELEASE}/LLVMHello.so \ - ${libdir}/llvm${LLVM_RELEASE}/BugpointPasses.so \ - ${libdir}/llvm${LLVM_RELEASE}/*.a \ -" - -base_do_compile_prepend() { - # Avoid *** No rule to make target `native/bin/tblgen', needed by `include/llvm/Intrinsics.gen.tmp' - oe_runmake tblgen -} - -do_install() { - # Install into a private directory to be able to reorganize the files. - - cd ${OECMAKE_BUILDPATH} - - oe_runmake DESTDIR=${WORKDIR}/llvm-install install - - # Create our custom target directories - install -d ${D}${bindir}/llvm${LLVM_RELEASE} - install -d ${D}${includedir}/llvm${LLVM_RELEASE} - install -d ${D}${libdir}/llvm${LLVM_RELEASE} - - # Move headers into their own directory - cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm \ - ${D}${includedir}/llvm${LLVM_RELEASE}/ - cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \ - ${D}${includedir}/llvm${LLVM_RELEASE}/ - - find ${WORKDIR}/llvm-install/${prefix}/lib -name "*" -maxdepth 1 -exec \ - install {} ${D}${libdir}/llvm${LLVM_RELEASE} \; - - # I dont know another way out. Binaries are installed into a special subdir - find ${WORKDIR}/llvm-install/${prefix}/bin -name "*" -maxdepth 1 -exec \ - install {} ${D}${bindir}/llvm${LLVM_RELEASE} \; - - # LLVM does not install this by default. - install bin/tblgen ${D}${bindir}/llvm${LLVM_RELEASE} - - # we install it here unmodified for native and none native and overwrite it - # later for native case - install -d ${D}${bindir} - install -m 0755 bin/llvm-config ${D}${bindir} -} - -SYSROOT_PREPROCESS_FUNCS_append_class-target = " llvm_sysroot_preprocess" - -llvm_sysroot_preprocess() { - cd ${OECMAKE_BUILDPATH} - - # Fix the paths in the config script to make it find the binaries and - # library files. Doing so allows 3rd party configure scripts working - # unmodified. - sed -e's!my.*ABS_RUN_DIR =.*!my $ABS_RUN_DIR = "${STAGING_DIR_TARGET}";!' \ - -e's!my.*INCLUDEDIR =.*!my $INCLUDEDIR = "${STAGING_INCDIR}/llvm${LLVM_RELEASE}";!' \ - -e's!my.*LIBDIR.*!my $LIBDIR = "${STAGING_LIBDIR}/llvm${LLVM_RELEASE}";!' \ - -e's!my.*BINDIR.*!my $BINDIR = "${STAGING_BINDIR}/llvm${LLVM_RELEASE}";!' \ - bin/llvm-config > bin/llvm-config${LLVM_RELEASE} - - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} - install -m 0755 bin/llvm-config${LLVM_RELEASE} ${SYSROOT_DESTDIR}${bindir_crossscripts} -} - -do_install_virtclass-native() { - # Install into a private directory to be able to reorganize the files. - - cd ${OECMAKE_BUILDPATH} - - oe_runmake DESTDIR=${WORKDIR}/llvm-install install - - # Create our custom target directories - install -d ${D}${bindir}/llvm${LLVM_RELEASE} - install -d ${D}${includedir}/llvm${LLVM_RELEASE} - install -d ${D}${libdir}/llvm${LLVM_RELEASE} - - # Move headers into their own directory - cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm \ - ${D}${includedir}/llvm${LLVM_RELEASE}/ - cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \ - ${D}${includedir}/llvm${LLVM_RELEASE}/ - - find ${WORKDIR}/llvm-install/${prefix}/lib -name "*" -maxdepth 1 -exec \ - install {} ${D}${libdir}/llvm${LLVM_RELEASE} \; - - # I dont know another way out. Binaries are installed into a special subdir - find ${WORKDIR}/llvm-install/${prefix}/bin -name "*" -maxdepth 1 -exec \ - install {} ${D}${bindir}/llvm${LLVM_RELEASE} \; - - # LLVM does not install this by default. - install bin/tblgen ${D}${bindir}/llvm${LLVM_RELEASE} - - # Fix the paths in the config script to make it find the binaries and - # library files. Doing so allows 3rd party configure scripts working - # unmodified. - sed -e's!my.*ABS_RUN_DIR =.*!my $ABS_RUN_DIR = "${STAGING_DIR_TARGET}";!' \ - -e's!my.*INCLUDEDIR =.*!my $INCLUDEDIR = "${STAGING_INCDIR}/llvm${LLVM_RELEASE}";!' \ - -e's!my.*LIBDIR.*!my $LIBDIR = "${STAGING_LIBDIR}/llvm${LLVM_RELEASE}";!' \ - -e's!my.*BINDIR.*!my $BINDIR = "${STAGING_BINDIR}/llvm${LLVM_RELEASE}";!' \ - bin/llvm-config > bin/llvm-config${LLVM_RELEASE} - - install -d ${D}${bindir} - install -m 0755 bin/llvm-config${LLVM_RELEASE} ${D}${bindir} -} - - -# Retrieve the target in a way that is compatible to the arch -# value in llvm (>= 2.5) -def get_llvm_arch(d): - import bb; - - arch = bb.data.getVar('TARGET_ARCH', d, 1) - if arch == "x86_64" or arch == "i486" or arch == "i586" or arch == "i686": - arch = "X86" - elif arch == "arm": - arch = "ARM" - elif arch == "mipsel" or arch == "mips": - arch = "mips" - elif arch == "powerpc" or arch == "powerpc64": - arch = "PowerPC" - else: - bb.warn("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) ); - - return arch - -BBCLASSEXTEND = "native" - diff --git a/recipes/llvm/llvm3.2/arm_fenv_uclibc.patch b/recipes/llvm/llvm3.2/arm_fenv_uclibc.patch deleted file mode 100644 index c3ae494..0000000 --- a/recipes/llvm/llvm3.2/arm_fenv_uclibc.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: llvm-2.9/include/llvm/Support/FEnv.h -=================================================================== ---- llvm-2.9.orig/include/llvm/Support/FEnv.h 2010-11-29 20:44:50.000000000 +0100 -+++ llvm-2.9/include/llvm/Support/FEnv.h 2011-11-18 18:42:22.580161297 +0100 -@@ -17,6 +17,9 @@ - - #include "llvm/Config/config.h" - #include -+ -+#undef HAVE_FENV_H -+ - #ifdef HAVE_FENV_H - #include - #endif diff --git a/recipes/llvm/llvm3.2_3.2.bb b/recipes/llvm/llvm3.2_3.2.bb deleted file mode 100644 index 92b62f9..0000000 --- a/recipes/llvm/llvm3.2_3.2.bb +++ /dev/null @@ -1,127 +0,0 @@ -############################################################################# -## -## Copyright (C) 2013 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://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -DESCRIPTION = "The Low Level Virtual Machine" -HOMEPAGE = "http://llvm.org" -# 3-clause BSD-like -LICENSE = "NCSA" -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=60fdd7739841f04a2ce2171a726be8f3" - -DEPENDS = "libffi libxml2-native llvm-common" - -SRC_URI = "http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.gz" -SRC_URI_append_libc-uclibc = " file://arm_fenv_uclibc.patch " - -SRC_URI[md5sum] = "71610289bbc819e3e15fdd562809a2d7" -SRC_URI[sha256sum] = "125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343" - -S = "${WORKDIR}/llvm-${PV}.src" - -inherit autotools perlnative pythonnative - -LLVM_BUILD_DIR = "${WORKDIR}/llvm-${PV}.build" -LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" -LLVM_DIR = "llvm${PV}" - -EXTRA_OECONF += "--disable-assertions \ - --enable-debug-runtime \ - --disable-expensive-checks \ - --enable-bindings=none \ - --enable-keep-symbols \ - --enable-libffi \ - --enable-optimized \ - --enable-shared \ - --enable-targets=host-only" -EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1" -FILES_${PN} = "${libdir}/lib*.so \ - ${libdir}/${LLVM_DIR}/*" -FILES_${PN}-dbg = "${bindir}/${LLVM_DIR}/.debug \ - ${libdir}/${LLVM_DIR}/.debug \ - ${libdir}/.debug \ - /usr/src/debug" -FILES_${PN}-dev = "${bindir}/${LLVM_DIR} \ - ${includedir}/${LLVM_DIR} \ - ${libdir}/${LLVM_DIR}/BugpointPasses.so \ - ${libdir}/${LLVM_DIR}/LLVMHello.so" -FILES_${PN}-static-dev = "${libdir}/${LLVM_DIR}/*.a" -FILES_SOLIBSDEV = "" -INSANE_SKIP_${PN} = "dev-so" - -do_configure_prepend() { - # Remove RPATHs - sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - - # Drop "svn" suffix from version string - sed -i 's/3\.2svn/3.2/g' configure - - # Fix paths in llvm-config - sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" tools/llvm-config/llvm-config.cpp - sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" tools/llvm-config/llvm-config.cpp - - # Fails to build unless using separate directory from source - mkdir -p ${LLVM_BUILD_DIR} - cd ${LLVM_BUILD_DIR} -} - -do_compile() { - cd ${LLVM_BUILD_DIR} - oe_runmake \ - AR="${BUILD_AR}" \ - CC="${BUILD_CC}" \ - CFLAGS="${BUILD_CFLAGS}" \ - CXX="${BUILD_CXX}" \ - CXXFLAGS="${BUILD_CXXFLAGS}" \ - CPP="${BUILD_CPP}" \ - CPPFLAGS="${BUILD_CPPFLAGS}" \ - NM="${BUILD_NM}" \ - RANLIB="${BUILD_RANLIB}" \ - PATH="${STAGING_BINDIR_NATIVE}:$PATH" \ - cross-compile-build-tools - oe_runmake -} - -do_install() { - cd ${LLVM_BUILD_DIR} - oe_runmake DESTDIR=${LLVM_INSTALL_DIR} install - - mv ${LLVM_INSTALL_DIR}${bindir}/${HOST_SYS}-llvm-config-host ${LLVM_INSTALL_DIR}/llvm-config-host - - install -d ${D}${bindir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${bindir}/* ${D}${bindir}/${LLVM_DIR}/ - - install -d ${D}${includedir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${includedir}/* ${D}${includedir}/${LLVM_DIR}/ - - install -d ${D}${libdir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${libdir}/* ${D}${libdir}/${LLVM_DIR}/ - ln -s ${LLVM_DIR}/libLLVM-${PV}.so ${D}${libdir}/libLLVM-${PV}.so - - install -d ${D}${docdir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${prefix}/docs/llvm/* ${D}${docdir}/${LLVM_DIR} -} - -SYSROOT_PREPROCESS_FUNCS += "llvm_sysroot_preprocess" - -llvm_sysroot_preprocess() { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} - mv ${LLVM_INSTALL_DIR}/llvm-config-host ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV} -} diff --git a/recipes/mesa/mesa_9.1.6.bbappend b/recipes/mesa/mesa_9.1.6.bbappend new file mode 100644 index 0000000..6c11709 --- /dev/null +++ b/recipes/mesa/mesa_9.1.6.bbappend @@ -0,0 +1,6 @@ +EGL_PLATFORMS = "fbdev" +PACKAGECONFIG = "egl gles dri gallium gallium-llvm gallium-egl" +GALLIUMDRIVERS_LLVM = "" +DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915" +DRIDRIVERS_append += "swrast" +EXTRA_OECONF += "--with-dri-drivers=""" -- cgit v1.2.3-54-g00ecf From f9d3810c97a637bea23b36c71aafcd00b01670d6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 23 Jan 2014 13:37:29 +0200 Subject: Recipe for hunspell Add new recipe for hunspell and include it to image and toolchain Change-Id: I724aca8e3da378a0b59e57a0b00f03e9137b48f0 Reviewed-by: Rainer Keller --- recipes/hunspell/hunspell_1.3.2.bb | 51 ++++++++++++++++++++++ recipes/images/b2qt-embedded-image.bb | 1 + ...-packagegroup-b2qt-embedded-toolchain-target.bb | 1 + 3 files changed, 53 insertions(+) create mode 100644 recipes/hunspell/hunspell_1.3.2.bb diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb new file mode 100644 index 0000000..c9d6aba --- /dev/null +++ b/recipes/hunspell/hunspell_1.3.2.bb @@ -0,0 +1,51 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Hunspell" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/hunspell-${PV}/COPYING;md5=ed3a37b3ba6d6be3e08ab45987cf1b88" + +SRC_URI = "http://downloads.sourceforge.net/hunspell/hunspell-${PV}.tar.gz \ + http://ftp.halifax.rwth-aachen.de/gentoo/distfiles/myspell-en_GB-20081002.zip \ + http://downloads.sourceforge.net/project/ayaspell/hunspell-ar/20080110/hunspell-ar_20080110.tar.gz \ + " + +SRC_URI[md5sum] = "69990932920960eb765fd35883640124" +SRC_URI[sha256sum] = "88d9eebbe05de29d17f4420ebaec9249441ce01d61b5d6c7ecba040e250e2d91" + +PR = "r0" + +inherit autotools gettext + +PACKAGES += "${PN}-dicts" +RRECOMMENDS_${PN} += "${PN}-dicts" +FILES_${PN}-dicts = "${datadir}/hunspell" + +do_install_append() { + install -m 0755 -d ${D}${datadir}/hunspell + + install -m 0755 ${WORKDIR}/hunspell-ar_20080110/ar.dic ${D}${datadir}/hunspell/ar_EG.dic + install -m 0755 ${WORKDIR}/hunspell-ar_20080110/ar.aff ${D}${datadir}/hunspell/ar_EG.aff + + install -m 0755 ${WORKDIR}/en_GB.dic ${D}${datadir}/hunspell + install -m 0755 ${WORKDIR}/en_GB.aff ${D}${datadir}/hunspell +} diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index 3d092af..e7811cc 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -76,6 +76,7 @@ IMAGE_INSTALL += "\ tslib \ tslib-calibrate \ alsa-utils-amixer \ + hunspell \ ${GSTREAMER_EXTRA_INSTALL} \ ${TOOLS_EXTRA_INSTALL} \ ${MACHINE_EXTRA_INSTALL} \ diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb index 809a654..58bed38 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb @@ -46,5 +46,6 @@ RDEPENDS_${PN} += "\ libxslt-dev \ udev-dev \ tslib-dev \ + hunspell-dev \ ${MACHINE_EXTRA_INSTALL_SDK} \ " -- cgit v1.2.3-54-g00ecf From 653b6af852fad5b715a11a71a5404505268a6598 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 22 Jan 2014 12:08:51 +0200 Subject: Add support for BeagleBone Black Change-Id: I1f30b93c6e3473a00a0a851f5fceccae90ba2f1b Reviewed-by: Samuli Piippo --- conf/distro/include/beaglebone.conf | 35 ++++++++++++++++ recipes/libgles/libgles-omap3_5.00.00.01.bbappend | 48 ++++++++++++++++++++++ recipes/libgles/libgles-omap3_5.01.00.01.bbappend | 44 ++++++++++++++++++++ recipes/linux/linux-ti-staging_3.12.bbappend | 1 + .../0001-BBB-disable-console-cursor-blinking.patch | 25 +++++++++++ recipes/u-boot/u-boot-ti-staging_2013.10.bbappend | 26 ++++++++++++ 6 files changed, 179 insertions(+) create mode 100644 conf/distro/include/beaglebone.conf create mode 100644 recipes/libgles/libgles-omap3_5.00.00.01.bbappend create mode 100644 recipes/libgles/libgles-omap3_5.01.00.01.bbappend create mode 100644 recipes/linux/linux-ti-staging_3.12.bbappend create mode 100644 recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch create mode 100644 recipes/u-boot/u-boot-ti-staging_2013.10.bbappend diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf new file mode 100644 index 0000000..528b41d --- /dev/null +++ b/conf/distro/include/beaglebone.conf @@ -0,0 +1,35 @@ +############################################################################ +## +## Copyright (C) 2013 Digia Plc +## All rights reserved. +## For any questions to Digia, please use contact form at http://qt.digia.com +## +## This file is part of QtEnterprise Embedded. +## +## Licensees holding valid Qt Enterprise licenses may use this file in +## accordance with the Qt Enterprise License Agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Digia. +## +## If you have questions regarding the use of this file, please use +## contact form at http://qt.digia.com +## +############################################################################ +IMAGE_FSTYPES = "tar.gz" + +PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3" +PREFERRED_VERSION_libgles-omap3 = "5.01.00.01" +PREFERRED_VERSION_omap3-sgx-modules = "5.01.00.01" + +MACHINE_EXTRA_INSTALL = "\ + libgles-omap3 \ + libgles-omap3-rawdemos \ + " + +MACHINE_EXTRA_INSTALL_SDK = "\ + libgles-omap3-dev \ + " + +ADB_PRODUCTID = "0xD002" + +DEFAULTTUNE = "armv7ahf-neon" diff --git a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend new file mode 100644 index 0000000..1398af0 --- /dev/null +++ b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend @@ -0,0 +1,48 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" +BINLOCATION_beaglebone = "${S}/gfx_rel_es8.x" + +PROVIDES += "virtual/libgl" + +LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" + +do_install_append() { + echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini +} + +# Inhibit warnings about files being stripped. +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +pkg_postinst_${PN}_append() { +ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' ) +echo ${ESREV} > $D${sysconfdir}/powervr-esrev +} + +RRECOMMENDS_${PN} = "omap3-sgx-modules" +RRECOMMENDS_${PN}-blitwsegl = "" +RRECOMMENDS_${PN}-flipwsegl = "" +RRECOMMENDS_${PN}-frontwsegl = "" +RRECOMMENDS_${PN}-linuxfbwsegl = "" diff --git a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend new file mode 100644 index 0000000..17666cb --- /dev/null +++ b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend @@ -0,0 +1,44 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" +BINLOCATION_beaglebone = "${S}/gfx_rel_es8.x" + +PROVIDES += "virtual/libgl" + +LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" + +# Inhibit warnings about files being stripped. +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +pkg_postinst_${PN}_append() { +ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' ) +echo ${ESREV} > $D${sysconfdir}/powervr-esrev +} + +RRECOMMENDS_${PN} = "omap3-sgx-modules" +RRECOMMENDS_${PN}-blitwsegl = "" +RRECOMMENDS_${PN}-flipwsegl = "" +RRECOMMENDS_${PN}-frontwsegl = "" +RRECOMMENDS_${PN}-linuxfbwsegl = "" diff --git a/recipes/linux/linux-ti-staging_3.12.bbappend b/recipes/linux/linux-ti-staging_3.12.bbappend new file mode 100644 index 0000000..5bc8967 --- /dev/null +++ b/recipes/linux/linux-ti-staging_3.12.bbappend @@ -0,0 +1 @@ +KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb" diff --git a/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch b/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch new file mode 100644 index 0000000..25dd9e4 --- /dev/null +++ b/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch @@ -0,0 +1,25 @@ +From bde714b9bfeafe46abc1078c09f6efac0e7b6478 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 22 Jan 2014 11:30:59 +0200 +Subject: [PATCH] BBB: disable console cursor blinking + +--- + include/configs/am335x_evm.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h +index d53f17d..1b3d2a4 100644 +--- a/include/configs/am335x_evm.h ++++ b/include/configs/am335x_evm.h +@@ -59,6 +59,8 @@ + "ramrootfstype=ext2\0" \ + "mmcargs=setenv bootargs console=${console} " \ + "${optargs} " \ ++ "consoleblank=0 " \ ++ "vt.global_cursor_default=0 " \ + "root=${mmcroot} " \ + "rootfstype=${mmcrootfstype}\0" \ + "spiroot=/dev/mtdblock4 rw\0" \ +-- +1.8.3.2 + diff --git a/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend b/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend new file mode 100644 index 0000000..8caf0c5 --- /dev/null +++ b/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend @@ -0,0 +1,26 @@ +############################################################################# +## +## Copyright (C) 2013 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://0001-BBB-disable-console-cursor-blinking.patch \ + " -- cgit v1.2.3-54-g00ecf From 1fa91d356dc0108902f9dde52d25f124bfe40e3c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 30 Jan 2014 13:18:44 +0200 Subject: udev: disable udev-cache on beaglebone With udev-cache enabled, usb kernel modules were not loaded. Change-Id: I11e5bec4a5b7aa1be30ecb016911a86ab1431dbb Reviewed-by: Samuli Piippo --- recipes/udev/0001-support-multitouch-screens.patch | 28 ---------------------- .../udev/0001-support-multitouch-screens.patch | 28 ++++++++++++++++++++++ recipes/udev/udev/beaglebone/udev-cache.default | 4 ++++ recipes/udev/udev_182.bbappend | 2 +- 4 files changed, 33 insertions(+), 29 deletions(-) delete mode 100644 recipes/udev/0001-support-multitouch-screens.patch create mode 100644 recipes/udev/udev/0001-support-multitouch-screens.patch create mode 100644 recipes/udev/udev/beaglebone/udev-cache.default diff --git a/recipes/udev/0001-support-multitouch-screens.patch b/recipes/udev/0001-support-multitouch-screens.patch deleted file mode 100644 index aacb8e0..0000000 --- a/recipes/udev/0001-support-multitouch-screens.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 51a9f15b10357a4ad1d8b2e50ec14031f68c0d48 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 12 Apr 2013 09:41:41 +0300 -Subject: [PATCH] support multitouch screens - ---- - src/udev-builtin-input_id.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/udev-builtin-input_id.c b/src/udev-builtin-input_id.c -index a062ef7..0c5358e 100644 ---- a/src/udev-builtin-input_id.c -+++ b/src/udev-builtin-input_id.c -@@ -108,8 +108,9 @@ static void test_pointers (struct udev_device *dev, - return; - } - -- if (test_bit (EV_ABS, bitmask_ev) && -- test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) { -+ if (test_bit (EV_ABS, bitmask_ev) && ( -+ (test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) || -+ (test_bit (ABS_MT_POSITION_X, bitmask_abs) && test_bit (ABS_MT_POSITION_Y, bitmask_abs)))) { - if (test_bit (BTN_STYLUS, bitmask_key) || test_bit (BTN_TOOL_PEN, bitmask_key)) - udev_builtin_add_property(dev, test, "ID_INPUT_TABLET", "1"); - else if (test_bit (BTN_TOOL_FINGER, bitmask_key) && !test_bit (BTN_TOOL_PEN, bitmask_key)) --- -1.7.10.4 - diff --git a/recipes/udev/udev/0001-support-multitouch-screens.patch b/recipes/udev/udev/0001-support-multitouch-screens.patch new file mode 100644 index 0000000..aacb8e0 --- /dev/null +++ b/recipes/udev/udev/0001-support-multitouch-screens.patch @@ -0,0 +1,28 @@ +From 51a9f15b10357a4ad1d8b2e50ec14031f68c0d48 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 12 Apr 2013 09:41:41 +0300 +Subject: [PATCH] support multitouch screens + +--- + src/udev-builtin-input_id.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/udev-builtin-input_id.c b/src/udev-builtin-input_id.c +index a062ef7..0c5358e 100644 +--- a/src/udev-builtin-input_id.c ++++ b/src/udev-builtin-input_id.c +@@ -108,8 +108,9 @@ static void test_pointers (struct udev_device *dev, + return; + } + +- if (test_bit (EV_ABS, bitmask_ev) && +- test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) { ++ if (test_bit (EV_ABS, bitmask_ev) && ( ++ (test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) || ++ (test_bit (ABS_MT_POSITION_X, bitmask_abs) && test_bit (ABS_MT_POSITION_Y, bitmask_abs)))) { + if (test_bit (BTN_STYLUS, bitmask_key) || test_bit (BTN_TOOL_PEN, bitmask_key)) + udev_builtin_add_property(dev, test, "ID_INPUT_TABLET", "1"); + else if (test_bit (BTN_TOOL_FINGER, bitmask_key) && !test_bit (BTN_TOOL_PEN, bitmask_key)) +-- +1.7.10.4 + diff --git a/recipes/udev/udev/beaglebone/udev-cache.default b/recipes/udev/udev/beaglebone/udev-cache.default new file mode 100644 index 0000000..d0050b8 --- /dev/null +++ b/recipes/udev/udev/beaglebone/udev-cache.default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev_182.bbappend b/recipes/udev/udev_182.bbappend index 761d792..970f8fb 100644 --- a/recipes/udev/udev_182.bbappend +++ b/recipes/udev/udev_182.bbappend @@ -20,7 +20,7 @@ ## ############################################################################# -FILESEXTRAPATHS_prepend := "${THISDIR}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-support-multitouch-screens.patch" -- cgit v1.2.3-54-g00ecf From 4caaf27fd9b82092b0e4f378806be348b9aa61fe Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 22 Jan 2014 11:53:17 +0200 Subject: adb: use modprobe to load dependency modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I311b4945aff87b0851bc2da719025e03ff8e1114 Reviewed-by: Pasi Petäjäjärvi --- recipes/adbd/files/adb-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/adbd/files/adb-init b/recipes/adbd/files/adb-init index e88df23..6faed60 100755 --- a/recipes/adbd/files/adb-init +++ b/recipes/adbd/files/adb-init @@ -8,7 +8,7 @@ SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address) case "$1" in start) - insmod $(busybox find /lib/modules/$(uname -r) -name "g_ffs.ko") idVendor=${VENDOR} idProduct=${PRODUCT} iSerialNumber=${SERIAL} + modprobe g_ffs idVendor=${VENDOR} idProduct=${PRODUCT} iSerialNumber=${SERIAL} mkdir -p /dev/usb-ffs chmod 770 /dev/usb-ffs mkdir -p /dev/usb-ffs/adb -- cgit v1.2.3-54-g00ecf From 3fc81eb57eb65dd10aae9145ef7e431623617601 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 4 Feb 2014 13:54:58 +0200 Subject: Update copyright year to 2014 Change-Id: Ic3045b02350916c686cb1b011550c299ca082f06 Reviewed-by: Kalle Viironen --- README | 2 +- classes/image-hdd.bbclass | 2 +- classes/image_types_sdcard.bbclass | 2 +- conf/bblayers.conf.sample | 2 +- conf/distro/b2qt.conf | 2 +- conf/distro/include/am335x-evm.conf | 2 +- conf/distro/include/beagleboard.conf | 2 +- conf/distro/include/beaglebone.conf | 2 +- conf/distro/include/emulator.conf | 2 +- conf/distro/include/imx53qsb.conf | 2 +- conf/distro/include/nitrogen6x.conf | 2 +- conf/distro/include/raspberrypi.conf | 2 +- conf/layer.conf | 2 +- conf/local.conf.sample | 2 +- conf/machine/emulator.conf | 2 +- recipes/adbd/adbd.bb | 2 +- recipes/alsa/alsa-state.bbappend | 2 +- recipes/alsa/alsa-state/raspberrypi/asound.conf | 2 +- recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend | 2 +- recipes/base-files/base-files_3.0.14.bbappend | 2 +- recipes/hunspell/hunspell_1.3.2.bb | 2 +- recipes/images/b2qt-embedded-image.bb | 2 +- recipes/init-ifupdown/init-ifupdown_1.0.bbappend | 2 +- recipes/initscripts/initscripts_1.0.bbappend | 2 +- recipes/libgles/libgles-omap3_4.05.00.03.bbappend | 2 +- recipes/libgles/libgles-omap3_4.09.00.01.bbappend | 2 +- recipes/libgles/libgles-omap3_5.00.00.01.bbappend | 2 +- recipes/libgles/libgles-omap3_5.01.00.01.bbappend | 2 +- recipes/linux/linux-am335x-psp_3.2.bbappend | 2 +- recipes/linux/linux-boundary_3.0.35.bbappend | 2 +- recipes/linux/linux-mainline_3.2.bbappend | 2 +- recipes/linux/linux-yocto_3.10.bbappend | 2 +- recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb | 2 +- recipes/mkcard/mkcard_0.5.bb | 2 +- .../packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | 2 +- .../nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb | 2 +- recipes/psplash/psplash_git.bbappend | 2 +- recipes/u-boot/u-boot-am33x_2013.01.01.bbappend | 2 +- recipes/u-boot/u-boot-beagleboard_2011.09.bbappend | 2 +- recipes/u-boot/u-boot-script-boundary_git.bbappend | 2 +- recipes/u-boot/u-boot-ti-staging_2013.10.bbappend | 2 +- recipes/udev/udev_182.bbappend | 2 +- recipes/userland/userland_git.bbappend | 2 +- recipes/v86d/v86d_0.1.10.bbappend | 2 +- recipes/virtualbox/mount-vboxsf_4.2.14.bb | 2 +- recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/README b/README index eb529bf..ea8d774 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index fb59c20..8dac725 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass index 221ccd4..e562530 100644 --- a/classes/image_types_sdcard.bbclass +++ b/classes/image_types_sdcard.bbclass @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index 4e3fb71..5a95ec2 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 033ae54..cde0b02 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index b653d44..36f28d0 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index 0b6454f..a48ad21 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf index 528b41d..243532b 100644 --- a/conf/distro/include/beaglebone.conf +++ b/conf/distro/include/beaglebone.conf @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2013 Digia Plc +## Copyright (C) 2014 Digia Plc ## All rights reserved. ## For any questions to Digia, please use contact form at http://qt.digia.com ## diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index d3d5efd..b8a0c57 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index ca8595d..346f8c4 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index dbb9478..b761ddd 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 19b2fdd..8a72f7e 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/layer.conf b/conf/layer.conf index 952abcb..9a74df6 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/local.conf.sample b/conf/local.conf.sample index f64c0b8..a9e1b34 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf index f2628d5..14cce96 100644 --- a/conf/machine/emulator.conf +++ b/conf/machine/emulator.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb index 582305b..1feb7c3 100644 --- a/recipes/adbd/adbd.bb +++ b/recipes/adbd/adbd.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/alsa/alsa-state.bbappend b/recipes/alsa/alsa-state.bbappend index d1017c3..c9fba43 100644 --- a/recipes/alsa/alsa-state.bbappend +++ b/recipes/alsa/alsa-state.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/alsa/alsa-state/raspberrypi/asound.conf b/recipes/alsa/alsa-state/raspberrypi/asound.conf index 0d270a5..ef44416 100644 --- a/recipes/alsa/alsa-state/raspberrypi/asound.conf +++ b/recipes/alsa/alsa-state/raspberrypi/asound.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend index 3c48097..9950930 100644 --- a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend +++ b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend index c276c57..4b8908a 100644 --- a/recipes/base-files/base-files_3.0.14.bbappend +++ b/recipes/base-files/base-files_3.0.14.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb index c9d6aba..6c7f400 100644 --- a/recipes/hunspell/hunspell_1.3.2.bb +++ b/recipes/hunspell/hunspell_1.3.2.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index e7811cc..a9ec3bf 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend index eb545f7..fee5390 100644 --- a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/initscripts/initscripts_1.0.bbappend b/recipes/initscripts/initscripts_1.0.bbappend index 9c159bc..8473b89 100644 --- a/recipes/initscripts/initscripts_1.0.bbappend +++ b/recipes/initscripts/initscripts_1.0.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend index 97bb2b3..2c689f1 100644 --- a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend +++ b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend index 5ef2e29..8ab3608 100644 --- a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend index 1398af0..efdfeca 100644 --- a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend index 17666cb..7edb38f 100644 --- a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/linux/linux-am335x-psp_3.2.bbappend b/recipes/linux/linux-am335x-psp_3.2.bbappend index c8f0f68..313111b 100644 --- a/recipes/linux/linux-am335x-psp_3.2.bbappend +++ b/recipes/linux/linux-am335x-psp_3.2.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.0.35.bbappend index fa0488a..610dc4d 100644 --- a/recipes/linux/linux-boundary_3.0.35.bbappend +++ b/recipes/linux/linux-boundary_3.0.35.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/linux/linux-mainline_3.2.bbappend b/recipes/linux/linux-mainline_3.2.bbappend index 6ca8c2e..4c2cb59 100644 --- a/recipes/linux/linux-mainline_3.2.bbappend +++ b/recipes/linux/linux-mainline_3.2.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/linux/linux-yocto_3.10.bbappend b/recipes/linux/linux-yocto_3.10.bbappend index 9cd7e69..2645cbc 100644 --- a/recipes/linux/linux-yocto_3.10.bbappend +++ b/recipes/linux/linux-yocto_3.10.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb index f9cded9..c0afb90 100644 --- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb +++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/mkcard/mkcard_0.5.bb b/recipes/mkcard/mkcard_0.5.bb index d1da05a..8d71f81 100644 --- a/recipes/mkcard/mkcard_0.5.bb +++ b/recipes/mkcard/mkcard_0.5.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index 7194f91..f32bac4 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb index 58bed38..4cdd404 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/psplash/psplash_git.bbappend b/recipes/psplash/psplash_git.bbappend index f9f3a6e..a5017cc 100644 --- a/recipes/psplash/psplash_git.bbappend +++ b/recipes/psplash/psplash_git.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend b/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend index bd00147..2b1c656 100644 --- a/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend +++ b/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend index 6d0e105..f6fbde1 100644 --- a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend +++ b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/u-boot/u-boot-script-boundary_git.bbappend b/recipes/u-boot/u-boot-script-boundary_git.bbappend index 3fc3b47..083b2fd 100644 --- a/recipes/u-boot/u-boot-script-boundary_git.bbappend +++ b/recipes/u-boot/u-boot-script-boundary_git.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend b/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend index 8caf0c5..bad928b 100644 --- a/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend +++ b/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/udev/udev_182.bbappend b/recipes/udev/udev_182.bbappend index 970f8fb..4cee6a2 100644 --- a/recipes/udev/udev_182.bbappend +++ b/recipes/udev/udev_182.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/userland/userland_git.bbappend b/recipes/userland/userland_git.bbappend index 0e748cd..c13c3a9 100644 --- a/recipes/userland/userland_git.bbappend +++ b/recipes/userland/userland_git.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/v86d/v86d_0.1.10.bbappend b/recipes/v86d/v86d_0.1.10.bbappend index e2a9b43..d551a9f 100644 --- a/recipes/v86d/v86d_0.1.10.bbappend +++ b/recipes/v86d/v86d_0.1.10.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/virtualbox/mount-vboxsf_4.2.14.bb b/recipes/virtualbox/mount-vboxsf_4.2.14.bb index 656f379..4026d3a 100644 --- a/recipes/virtualbox/mount-vboxsf_4.2.14.bb +++ b/recipes/virtualbox/mount-vboxsf_4.2.14.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb index 09358df..128cad0 100644 --- a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb +++ b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. -- cgit v1.2.3-54-g00ecf From 65f7102c2fd3b2f8299809577a885b6860303f97 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 7 Feb 2014 09:49:12 +0200 Subject: Add missing copyright headers Change-Id: Id1816c93ae2f3271a923432c19e713d2985f27dd Reviewed-by: Eirik Aavitsland Reviewed-by: Kalle Viironen --- recipes/linux/linux-ti-staging_3.12.bbappend | 22 ++++++++++++++++++++++ recipes/mesa/mesa_9.1.6.bbappend | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/recipes/linux/linux-ti-staging_3.12.bbappend b/recipes/linux/linux-ti-staging_3.12.bbappend index 5bc8967..fe2bdd2 100644 --- a/recipes/linux/linux-ti-staging_3.12.bbappend +++ b/recipes/linux/linux-ti-staging_3.12.bbappend @@ -1 +1,23 @@ +############################################################################# +## +## 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb" diff --git a/recipes/mesa/mesa_9.1.6.bbappend b/recipes/mesa/mesa_9.1.6.bbappend index 6c11709..7f212cf 100644 --- a/recipes/mesa/mesa_9.1.6.bbappend +++ b/recipes/mesa/mesa_9.1.6.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + EGL_PLATFORMS = "fbdev" PACKAGECONFIG = "egl gles dri gallium gallium-llvm gallium-egl" GALLIUMDRIVERS_LLVM = "" -- cgit v1.2.3-54-g00ecf From 1d951aca19b0c65c79ee6239a95d28dbf467198a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 5 Feb 2014 10:19:14 +0200 Subject: Add script to initialize yocto build env Clone all necessary repos and symlink meta-b2qt in correct place. Change-Id: I09c21e0bb07d67901b4456194e365f93541b5842 Reviewed-by: Eirik Aavitsland --- scripts/b2qt-init-build-env | 76 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100755 scripts/b2qt-init-build-env diff --git a/scripts/b2qt-init-build-env b/scripts/b2qt-init-build-env new file mode 100755 index 0000000..43229e1 --- /dev/null +++ b/scripts/b2qt-init-build-env @@ -0,0 +1,76 @@ +#!/bin/sh +############################################################################# +## +## 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -e + +if [ $# -ne 1 ]; then + echo "Usage: $0 " + exit 1 +fi + +mkdir -p ${1} + +DIR=$(readlink -f $(dirname $0)/..) +BUILDDIR=$(readlink -f $1) + +if [ ! -d ${BUILDDIR}/poky ]; then + git clone git://git.yoctoproject.org/poky ${BUILDDIR}/poky -b dora +fi + +if [ ! -d ${BUILDDIR}/poky/meta-openembedded ]; then + git clone git://git.openembedded.org/meta-openembedded ${BUILDDIR}/poky/meta-openembedded -b dora +fi + +if [ ! -d ${BUILDDIR}/poky/meta-ti ]; then + git clone git://git.yoctoproject.org/meta-ti ${BUILDDIR}/poky/meta-ti -b master +fi + +if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm ]; then + git clone git://git.yoctoproject.org/meta-fsl-arm ${BUILDDIR}/poky/meta-fsl-arm -b dora +fi + +if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm-extra ]; then + git clone git://github.com/Freescale/meta-fsl-arm-extra.git ${BUILDDIR}/poky/meta-fsl-arm-extra -b dora +fi + +if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then + git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b master +fi + +if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then + ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt +fi + +echo +echo "Yocto build system is ready" +echo "next initialize the build env for your target machine, for example:" +echo +echo "cd ${BUILDDIR}/poky" +echo "export TEMPLATECONF=${DIR}/conf" +echo "export MACHINE=raspberrypi" +echo ". ./oe-init-build-env" +echo +echo "and build B2Qt image with:" +echo +echo "bitbake b2qt-embedded-image" +echo -- cgit v1.2.3-54-g00ecf From d0f0c374e07f0d748f3ad20b8350863394ae8283 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 11 Feb 2014 10:18:30 +0200 Subject: Changes to init script - Move to root folder - meta-ti and meta-raspberrypi now have dora branch Change-Id: I1b88ead9c44b67243d9c69fd6a5a8a59c8232b97 Reviewed-by: Eirik Aavitsland --- b2qt-init-build-env | 76 +++++++++++++++++++++++++++++++++++++++++++++ scripts/b2qt-init-build-env | 76 --------------------------------------------- 2 files changed, 76 insertions(+), 76 deletions(-) create mode 100755 b2qt-init-build-env delete mode 100755 scripts/b2qt-init-build-env diff --git a/b2qt-init-build-env b/b2qt-init-build-env new file mode 100755 index 0000000..8c4da01 --- /dev/null +++ b/b2qt-init-build-env @@ -0,0 +1,76 @@ +#!/bin/sh +############################################################################# +## +## 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -e + +if [ $# -ne 1 ]; then + echo "Usage: $0 " + exit 1 +fi + +mkdir -p ${1} + +DIR=$(readlink -f $(dirname $0)) +BUILDDIR=$(readlink -f $1) + +if [ ! -d ${BUILDDIR}/poky ]; then + git clone git://git.yoctoproject.org/poky ${BUILDDIR}/poky -b dora +fi + +if [ ! -d ${BUILDDIR}/poky/meta-openembedded ]; then + git clone git://git.openembedded.org/meta-openembedded ${BUILDDIR}/poky/meta-openembedded -b dora +fi + +if [ ! -d ${BUILDDIR}/poky/meta-ti ]; then + git clone git://git.yoctoproject.org/meta-ti ${BUILDDIR}/poky/meta-ti -b dora +fi + +if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm ]; then + git clone git://git.yoctoproject.org/meta-fsl-arm ${BUILDDIR}/poky/meta-fsl-arm -b dora +fi + +if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm-extra ]; then + git clone git://github.com/Freescale/meta-fsl-arm-extra.git ${BUILDDIR}/poky/meta-fsl-arm-extra -b dora +fi + +if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then + git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b dora +fi + +if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then + ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt +fi + +echo +echo "Yocto build system is ready" +echo "next initialize the build env for your target machine, for example:" +echo +echo "cd ${BUILDDIR}" +echo "export TEMPLATECONF=meta-b2qt/conf" +echo "export MACHINE=raspberrypi" +echo ". ./poky/oe-init-build-env build-raspberrypi" +echo +echo "and build B2Qt image with:" +echo +echo "bitbake b2qt-embedded-image" +echo diff --git a/scripts/b2qt-init-build-env b/scripts/b2qt-init-build-env deleted file mode 100755 index 43229e1..0000000 --- a/scripts/b2qt-init-build-env +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -############################################################################# -## -## 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://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -e - -if [ $# -ne 1 ]; then - echo "Usage: $0 " - exit 1 -fi - -mkdir -p ${1} - -DIR=$(readlink -f $(dirname $0)/..) -BUILDDIR=$(readlink -f $1) - -if [ ! -d ${BUILDDIR}/poky ]; then - git clone git://git.yoctoproject.org/poky ${BUILDDIR}/poky -b dora -fi - -if [ ! -d ${BUILDDIR}/poky/meta-openembedded ]; then - git clone git://git.openembedded.org/meta-openembedded ${BUILDDIR}/poky/meta-openembedded -b dora -fi - -if [ ! -d ${BUILDDIR}/poky/meta-ti ]; then - git clone git://git.yoctoproject.org/meta-ti ${BUILDDIR}/poky/meta-ti -b master -fi - -if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm ]; then - git clone git://git.yoctoproject.org/meta-fsl-arm ${BUILDDIR}/poky/meta-fsl-arm -b dora -fi - -if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm-extra ]; then - git clone git://github.com/Freescale/meta-fsl-arm-extra.git ${BUILDDIR}/poky/meta-fsl-arm-extra -b dora -fi - -if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then - git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b master -fi - -if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then - ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt -fi - -echo -echo "Yocto build system is ready" -echo "next initialize the build env for your target machine, for example:" -echo -echo "cd ${BUILDDIR}/poky" -echo "export TEMPLATECONF=${DIR}/conf" -echo "export MACHINE=raspberrypi" -echo ". ./oe-init-build-env" -echo -echo "and build B2Qt image with:" -echo -echo "bitbake b2qt-embedded-image" -echo -- cgit v1.2.3-54-g00ecf From 93ad74eece184830c0f76e17ae7308a7da863be7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 10 Feb 2014 16:02:03 +0200 Subject: hunspell: use multple checksums for hunspell srcs Each package needs to have its own checksum. Change-Id: I837a6aa2a3b0f73db53f37d15e54a6e9a80403f3 Reviewed-by: Samuli Piippo --- recipes/hunspell/hunspell_1.3.2.bb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb index 6c7f400..beb071d 100644 --- a/recipes/hunspell/hunspell_1.3.2.bb +++ b/recipes/hunspell/hunspell_1.3.2.bb @@ -24,13 +24,17 @@ DESCRIPTION = "Hunspell" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://${WORKDIR}/hunspell-${PV}/COPYING;md5=ed3a37b3ba6d6be3e08ab45987cf1b88" -SRC_URI = "http://downloads.sourceforge.net/hunspell/hunspell-${PV}.tar.gz \ - http://ftp.halifax.rwth-aachen.de/gentoo/distfiles/myspell-en_GB-20081002.zip \ - http://downloads.sourceforge.net/project/ayaspell/hunspell-ar/20080110/hunspell-ar_20080110.tar.gz \ +SRC_URI = "http://downloads.sourceforge.net/hunspell/hunspell-${PV}.tar.gz;name=hunspell \ + http://ftp.halifax.rwth-aachen.de/gentoo/distfiles/myspell-en_GB-20081002.zip;name=dict-en \ + http://downloads.sourceforge.net/project/ayaspell/hunspell-ar/20080110/hunspell-ar_20080110.tar.gz;name=dict-ar \ " -SRC_URI[md5sum] = "69990932920960eb765fd35883640124" -SRC_URI[sha256sum] = "88d9eebbe05de29d17f4420ebaec9249441ce01d61b5d6c7ecba040e250e2d91" +SRC_URI[hunspell.md5sum] = "3121aaf3e13e5d88dfff13fb4a5f1ab8" +SRC_URI[hunspell.sha256sum] = "b4edd4a4ee944cb9f485b35473e46b729ed768e9d24da8e78e4c4c6ca56addbd" +SRC_URI[dict-en.md5sum] = "6fb885d57899c3e6aa2b27f3510deb37" +SRC_URI[dict-en.sha256sum] = "f4b43083923e2998298fd270a8a9f9ed570f4fbebeaa46ce5f1788b76920308b" +SRC_URI[dict-ar.md5sum] = "69990932920960eb765fd35883640124" +SRC_URI[dict-ar.sha256sum] = "88d9eebbe05de29d17f4420ebaec9249441ce01d61b5d6c7ecba040e250e2d91" PR = "r0" -- cgit v1.2.3-54-g00ecf From d698db24eddd962b9fecd4f63d97ac7b5ce508d5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 12 Feb 2014 15:54:06 +0200 Subject: emulator: alsa config to allow multiple source to play audio Enable dmix plugin for also on emulator to allow playing audio from multiple sources at the same time. Remove copyright header from raspberrypi config file. Task-number: QTEE-362 Change-Id: I4073ac0dae1f7af9a307eb3a455e9277181fb9a1 Reviewed-by: Rainer Keller --- recipes/alsa/alsa-state/emulator/asound.conf | 4 ++++ recipes/alsa/alsa-state/raspberrypi/asound.conf | 22 ---------------------- 2 files changed, 4 insertions(+), 22 deletions(-) create mode 100644 recipes/alsa/alsa-state/emulator/asound.conf diff --git a/recipes/alsa/alsa-state/emulator/asound.conf b/recipes/alsa/alsa-state/emulator/asound.conf new file mode 100644 index 0000000..edd2e82 --- /dev/null +++ b/recipes/alsa/alsa-state/emulator/asound.conf @@ -0,0 +1,4 @@ +pcm.!default { + type plug + slave.pcm "dmix" +} diff --git a/recipes/alsa/alsa-state/raspberrypi/asound.conf b/recipes/alsa/alsa-state/raspberrypi/asound.conf index ef44416..83f7f9a 100644 --- a/recipes/alsa/alsa-state/raspberrypi/asound.conf +++ b/recipes/alsa/alsa-state/raspberrypi/asound.conf @@ -1,25 +1,3 @@ -############################################################################# -## -## 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://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - pcm.!default { type hw card 0 -- cgit v1.2.3-54-g00ecf From fd4b7ea9473e18060e61cff670f3cabfd074eae9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 12 Feb 2014 17:08:56 +0200 Subject: Fix emulator hdd image building Remove nostamp so that symbolic link is not updated, when boot-directdisk has not been updated. Otherwise we ended up with broken link. Change-Id: I27a51047e74861f034fbf3f15f9cf29fd20b142b Reviewed-by: Samuli Piippo --- classes/image-hdd.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index 8dac725..46146b7 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -34,7 +34,9 @@ SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200" inherit image_types boot-directdisk create_hdd_image () { - ln -fs ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd + cd ${DEPLOY_DIR_IMAGE} + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd + ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd } python do_hddimg() { @@ -42,4 +44,3 @@ python do_hddimg() { } addtask hddimg after do_bootdirectdisk before do_build -do_hddimg[nostamp] = "1" -- cgit v1.2.3-54-g00ecf From 731303c451c216bd5cb58e939be0d082f2950a90 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 13 Feb 2014 08:23:17 +0200 Subject: emulator: don't build mesa with llvm anymore Change-Id: Id8be2ac9c87748e6365b3f3bdb28833f7d528ede Reviewed-by: Kalle Viironen --- conf/distro/include/emulator.conf | 2 -- recipes/mesa/mesa_9.1.6.bbappend | 2 -- 2 files changed, 4 deletions(-) diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index b8a0c57..dee1df3 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -32,9 +32,7 @@ MACHINE_EXTRA_RRECOMMENDS += "\ kernel_autoload_snd-intel8x0 = "snd-intel8x0" MACHINE_EXTRA_INSTALL = "\ - llvm3.3 \ libegl-mesa \ - libegl-gallium \ libgles2-mesa \ mount-vboxsf \ " diff --git a/recipes/mesa/mesa_9.1.6.bbappend b/recipes/mesa/mesa_9.1.6.bbappend index 7f212cf..627f70b 100644 --- a/recipes/mesa/mesa_9.1.6.bbappend +++ b/recipes/mesa/mesa_9.1.6.bbappend @@ -21,8 +21,6 @@ ############################################################################# EGL_PLATFORMS = "fbdev" -PACKAGECONFIG = "egl gles dri gallium gallium-llvm gallium-egl" -GALLIUMDRIVERS_LLVM = "" DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915" DRIDRIVERS_append += "swrast" EXTRA_OECONF += "--with-dri-drivers=""" -- cgit v1.2.3-54-g00ecf From 8bf3f5edf5b426146974d6af655846d671119013 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 17 Feb 2014 17:04:09 +0200 Subject: imx53: change to correct GPU driver package Change-Id: I9d6b4343d3d53aae64353854f890a52444e5dc0f Reviewed-by: Samuli Piippo --- conf/distro/include/imx53qsb.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index 346f8c4..261bc29 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf @@ -25,7 +25,7 @@ IMAGE_FSTYPES = "tar.gz" PREFERRED_PROVIDER_virtual/libgl = "amd-gpu-x11-bin-mx51" MACHINE_EXTRA_INSTALL = "\ - amd-gpu-x11-bin-mx51 \ + amd-gpu-bin-mx51 \ " MACHINE_EXTRA_INSTALL_SDK = " \ -- cgit v1.2.3-54-g00ecf From 4708304a67b074efc30dcc59e45eddf078192975 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 17 Feb 2014 16:59:11 +0200 Subject: Move libgl workaround to libsdl libsdl tries to pull in mesa, so workaround was added to machines configs to prevent that. Now remove dependency to libgl from libsdl that was causing that. Change-Id: I425aa45cdc32842d573354eaaab7ed67ee5bb7b5 Reviewed-by: Samuli Piippo --- conf/distro/include/am335x-evm.conf | 1 - conf/distro/include/beagleboard.conf | 1 - conf/distro/include/beaglebone.conf | 1 - conf/distro/include/imx53qsb.conf | 2 -- conf/distro/include/raspberrypi.conf | 1 - .../amd-gpu-x11-bin-mx51_11.09.01.bbappend | 2 -- recipes/libgles/libgles-omap3_4.05.00.03.bbappend | 2 -- recipes/libgles/libgles-omap3_4.09.00.01.bbappend | 2 -- recipes/libgles/libgles-omap3_5.00.00.01.bbappend | 2 -- recipes/libgles/libgles-omap3_5.01.00.01.bbappend | 2 -- recipes/libsdl/libsdl_1.2.15.bbappend | 1 + recipes/userland/userland_git.bbappend | 23 ---------------------- 12 files changed, 1 insertion(+), 39 deletions(-) create mode 100644 recipes/libsdl/libsdl_1.2.15.bbappend delete mode 100644 recipes/userland/userland_git.bbappend diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index 36f28d0..5799db7 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf @@ -22,7 +22,6 @@ IMAGE_FSTYPES = "tar.gz" -PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3" PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index a48ad21..dab0c5a 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf @@ -30,7 +30,6 @@ BOOT_SCRIPTS = "\ SDCARD_GENERATION_COMMAND = "generate_imx_sdcard" UBOOT_SUFFIX = "img" -PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3" PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf index 243532b..ba13aaa 100644 --- a/conf/distro/include/beaglebone.conf +++ b/conf/distro/include/beaglebone.conf @@ -17,7 +17,6 @@ ############################################################################ IMAGE_FSTYPES = "tar.gz" -PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3" PREFERRED_VERSION_libgles-omap3 = "5.01.00.01" PREFERRED_VERSION_omap3-sgx-modules = "5.01.00.01" diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index 261bc29..d83f6b4 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf @@ -22,8 +22,6 @@ IMAGE_FSTYPES = "tar.gz" -PREFERRED_PROVIDER_virtual/libgl = "amd-gpu-x11-bin-mx51" - MACHINE_EXTRA_INSTALL = "\ amd-gpu-bin-mx51 \ " diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 8a72f7e..97513a8 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -23,7 +23,6 @@ IMAGE_FSTYPES = "tar.gz ext3 rpi-sdimg" PREFERRED_PROVIDER_virtual/libgles1 = "userland" -PREFERRED_PROVIDER_virtual/libgl = "userland" MACHINE_EXTRA_INSTALL = "\ userland \ diff --git a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend index 9950930..40075c0 100644 --- a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend +++ b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend @@ -22,5 +22,3 @@ # dependency to x11 only when distro features have it DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" - -PROVIDES += "virtual/libgl" diff --git a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend index 2c689f1..73a2408 100644 --- a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend +++ b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend @@ -27,8 +27,6 @@ TOOLCHAIN_PATH = "${STAGING_DIR_TARGET}" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " file://0001-Add-GLchar-typedef.patch" -PROVIDES += "virtual/libgl" - LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" do_install_append() { diff --git a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend index 8ab3608..6a37c89 100644 --- a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend @@ -22,8 +22,6 @@ BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" -PROVIDES += "virtual/libgl" - LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" do_install_append() { diff --git a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend index efdfeca..5446ffa 100644 --- a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend @@ -25,8 +25,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" BINLOCATION_beaglebone = "${S}/gfx_rel_es8.x" -PROVIDES += "virtual/libgl" - LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" do_install_append() { diff --git a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend index 7edb38f..82bfdb2 100644 --- a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend @@ -25,8 +25,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" BINLOCATION_beaglebone = "${S}/gfx_rel_es8.x" -PROVIDES += "virtual/libgl" - LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" # Inhibit warnings about files being stripped. diff --git a/recipes/libsdl/libsdl_1.2.15.bbappend b/recipes/libsdl/libsdl_1.2.15.bbappend new file mode 100644 index 0000000..36424fd --- /dev/null +++ b/recipes/libsdl/libsdl_1.2.15.bbappend @@ -0,0 +1 @@ +DEPENDS_remove = "virtual/libgl" diff --git a/recipes/userland/userland_git.bbappend b/recipes/userland/userland_git.bbappend deleted file mode 100644 index c13c3a9..0000000 --- a/recipes/userland/userland_git.bbappend +++ /dev/null @@ -1,23 +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://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" -- cgit v1.2.3-54-g00ecf From 4e1270121148155d60f1037676717682fd8cdd8f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 17 Feb 2014 17:01:19 +0200 Subject: busybox: use ifplugd to enable hotplug networking Compile busybox with ifplugd support and start it up at boot time. Change-Id: I8ccf791929c9acd3ba37c4169582b2d4dd5fc5a7 Reviewed-by: Rainer Keller --- recipes/busybox/busybox/busybox-ifplugd.sh | 32 +++++++++++++++++++++ recipes/busybox/busybox/ifplugd.action | 6 ++++ recipes/busybox/busybox/network.cfg | 1 + recipes/busybox/busybox_1.21.1.bbappend | 46 ++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+) create mode 100755 recipes/busybox/busybox/busybox-ifplugd.sh create mode 100755 recipes/busybox/busybox/ifplugd.action create mode 100644 recipes/busybox/busybox/network.cfg create mode 100644 recipes/busybox/busybox_1.21.1.bbappend diff --git a/recipes/busybox/busybox/busybox-ifplugd.sh b/recipes/busybox/busybox/busybox-ifplugd.sh new file mode 100755 index 0000000..9ea40a8 --- /dev/null +++ b/recipes/busybox/busybox/busybox-ifplugd.sh @@ -0,0 +1,32 @@ +#!/bin/sh +DAEMON=/usr/sbin/ifplugd +NAME=ifplugd +DESC="Busybox IFPLUG Server" +ARGS="-i eth0" + +test -f $DAEMON || exit 1 + +set -e + +case "$1" in + start) + echo -n "starting $DESC: $NAME... " + /sbin/start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS + echo "done." + ;; + stop) + echo -n "stopping $DESC: $NAME... " + /sbin/start-stop-daemon -K -n $NAME + echo "done." + ;; + restart) + echo "restarting $DESC: $NAME... " + $0 stop + $0 start + echo "done." + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac diff --git a/recipes/busybox/busybox/ifplugd.action b/recipes/busybox/busybox/ifplugd.action new file mode 100755 index 0000000..44fe040 --- /dev/null +++ b/recipes/busybox/busybox/ifplugd.action @@ -0,0 +1,6 @@ +#/bin/sh +if [ "${2}" == "up" ]; then + ifup ${1} +else + ifdown ${1} +fi diff --git a/recipes/busybox/busybox/network.cfg b/recipes/busybox/busybox/network.cfg new file mode 100644 index 0000000..f858907 --- /dev/null +++ b/recipes/busybox/busybox/network.cfg @@ -0,0 +1 @@ +CONFIG_IFPLUGD=y diff --git a/recipes/busybox/busybox_1.21.1.bbappend b/recipes/busybox/busybox_1.21.1.bbappend new file mode 100644 index 0000000..fe5d5ea --- /dev/null +++ b/recipes/busybox/busybox_1.21.1.bbappend @@ -0,0 +1,46 @@ +############################################################################# +## +## 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://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "\ + file://network.cfg \ + file://busybox-ifplugd.sh \ + file://ifplugd.action \ + " + +PACKAGES =+ "${PN}-ifplugd" +FILES_${PN}-ifplugd = "\ + ${sysconfdir}/init.d/busybox-ifplugd.sh \ + ${sysconfdir}/etc/ifplugd/ifplugd.action \ + " + +INITSCRIPT_PACKAGES += "${PN}-ifplugd" +INITSCRIPT_NAME_${PN}-ifplugd = "busybox-ifplugd.sh" + +RRECOMMENDS_${PN} += "${PN}-ifplugd" + +do_install_append () { + install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/ + + install -d ${D}${sysconfdir}/ifplugd + install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/ +} -- cgit v1.2.3-54-g00ecf From ee2541cf756ddada9bd008b148267e2836d42450 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 19 Feb 2014 13:32:49 +0200 Subject: udev: disable udev-cache also for beagleboard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Necessary kernel modules were not loaded because of udev-cache. Task-Number: QTEE-401 Change-Id: I9fb86efdefac12fb6b348839c9f7f7e01f6837d1 Reviewed-by: Pasi Petäjäjärvi --- recipes/udev/udev/beagleboard/udev-cache.default | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 recipes/udev/udev/beagleboard/udev-cache.default diff --git a/recipes/udev/udev/beagleboard/udev-cache.default b/recipes/udev/udev/beagleboard/udev-cache.default new file mode 100644 index 0000000..d0050b8 --- /dev/null +++ b/recipes/udev/udev/beagleboard/udev-cache.default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" -- cgit v1.2.3-54-g00ecf