diff options
author | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:08:34 +0200 |
---|---|---|
committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:08:39 +0200 |
commit | a68e1ea9b2904f7c69330e534da877cf19376219 (patch) | |
tree | b3b6b17eea9ae44206226cc7d47f42841883020f | |
parent | 48f7d2b6ef3939417a1bf291a82fa36660b213e6 (diff) | |
parent | ee2541cf756ddada9bd008b148267e2836d42450 (diff) |
Merge branch 'stable' into releaseQtEE_v2.0.0
* stable: (34 commits)
udev: disable udev-cache also for beagleboard
busybox: use ifplugd to enable hotplug networking
Move libgl workaround to libsdl
imx53: change to correct GPU driver package
emulator: don't build mesa with llvm anymore
Fix emulator hdd image building
emulator: alsa config to allow multiple source to play audio
hunspell: use multple checksums for hunspell srcs
Changes to init script
Add script to initialize yocto build env
Add missing copyright headers
Update copyright year to 2014
adb: use modprobe to load dependency modules
udev: disable udev-cache on beaglebone
Add support for BeagleBone Black
Recipe for hunspell
upgrade emulator components
gpu-viv-bin-mx6q: remove dependency to mesa
rpi: disable bbappend from meta-raspberrypi
Install all kernel modules
...
Change-Id: I7adca9894ee35092d546babb1926edbf06300feb
75 files changed, 1407 insertions, 578 deletions
@@ -1,31 +1,54 @@ -OpenEmbedded/Yocto meta layer for B2Qt on embedded Linux +############################################################################# +## +## 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$ +## +############################################################################# + +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 <samuli.piippo@digia.com> - +URI: git://git.yoctoproject.org/meta-raspberrypi +branch: dylan +revision: HEAD diff --git a/b2qt-init-build-env b/b2qt-init-build-env new file mode 100755 index 00000000..8c4da01b --- /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 <yocto build directory>" + 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/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index fc762340..46146b71 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -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$ +## +############################################################################# + # need to define the dependency and the ROOTFS for directdisk do_bootdirectdisk[depends] += "${PN}:do_rootfs" ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" @@ -7,10 +29,13 @@ 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 () { + 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 } @@ -19,4 +44,3 @@ python do_hddimg() { } addtask hddimg after do_bootdirectdisk before do_build -do_hddimg[nostamp] = "1" diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass index 7b11482f..e5625303 100644 --- a/classes/image_types_sdcard.bbclass +++ b/classes/image_types_sdcard.bbclass @@ -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$ +## +############################################################################# + inherit image_types_fsl IMAGE_ROOTFS_EXTRA_SPACE = "300000" diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index 987a75d8..5a95ec22 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample @@ -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$ +## +############################################################################# + # 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 1af10b5f..cde0b02a 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -1,8 +1,30 @@ +############################################################################# +## +## 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$ +## +############################################################################# + 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 <B2Qt@digia.com>" @@ -10,13 +32,15 @@ MAINTAINER = "B2Qt <B2Qt@digia.com>" SANITY_TESTED_DISTROS += " \ Ubuntu 11.04 \n \ LinuxMint-14 \n \ + LinuxMint-16 \n \ " 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/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index 65d0ba46..5799db71 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf @@ -1,6 +1,27 @@ +############################################################################# +## +## 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$ +## +############################################################################# + 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" @@ -11,8 +32,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 \ " diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index 728a3ea4..dab0c5a1 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf @@ -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$ +## +############################################################################# + IMAGE_CLASSES += "image_types_sdcard" IMAGE_FSTYPES = "tar.gz ext3 sdcard" @@ -8,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 new file mode 100644 index 00000000..ba13aaad --- /dev/null +++ b/conf/distro/include/beaglebone.conf @@ -0,0 +1,34 @@ +############################################################################ +## +## Copyright (C) 2014 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_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/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index dfbda911..dee1df35 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -1,12 +1,38 @@ +############################################################################# +## +## 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$ +## +############################################################################# + IMAGE_CLASSES += "image-hdd" 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 \ - libegl-gallium \ libgles2-mesa \ mount-vboxsf \ " diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index 0d96d9a7..d83f6b46 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf @@ -1,9 +1,29 @@ -IMAGE_FSTYPES = "tar.gz" +############################################################################# +## +## 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$ +## +############################################################################# -PREFERRED_PROVIDER_virtual/libgl = "amd-gpu-x11-bin-mx51" +IMAGE_FSTYPES = "tar.gz" MACHINE_EXTRA_INSTALL = "\ - amd-gpu-x11-bin-mx51 \ + amd-gpu-bin-mx51 \ " MACHINE_EXTRA_INSTALL_SDK = " \ diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index cf99d111..b761ddd2 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -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$ +## +############################################################################# + 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 8eada215..97513a82 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -1,12 +1,38 @@ +############################################################################# +## +## 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$ +## +############################################################################# + IMAGE_FSTYPES = "tar.gz ext3 rpi-sdimg" -PREFERRED_PROVIDER_virtual/libgles1 = "vc-graphics" -PREFERRED_PROVIDER_virtual/libgl = "vc-graphics" +PREFERRED_PROVIDER_virtual/libgles1 = "userland" MACHINE_EXTRA_INSTALL = "\ - vc-graphics \ + userland \ " MACHINE_EXTRA_INSTALL_SDK = " \ - vc-graphics-dev \ + userland-dev \ " + +module_autoload_snd-bcm2835 = "snd-bcm2835" + +# additional memory for GPU +GPU_MEM = "128" diff --git a/conf/layer.conf b/conf/layer.conf index 9e97746a..9a74df67 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -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$ +## +############################################################################# + # 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 00c9a07e..a9e1b342 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -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$ +## +############################################################################# + # # 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 @@ -253,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" diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf index e118a443..14cce965 100644 --- a/conf/machine/emulator.conf +++ b/conf/machine/emulator.conf @@ -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$ +## +############################################################################# + #@TYPE: Machine #@NAME: virtual box emulator #@DESCRIPTION: Machine configuration for running a common x86 @@ -7,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/adbd/adbd.bb b/recipes/adbd/adbd.bb index aa8f5e92..1feb7c34 100644 --- a/recipes/adbd/adbd.bb +++ b/recipes/adbd/adbd.bb @@ -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$ +## +############################################################################# + DESCRIPTION = "Android Debug Bridge Daemon" HOMEPAGE = "http://developer.android.com/tools/help/adb.html" SECTION = "devel" diff --git a/recipes/adbd/files/adb-init b/recipes/adbd/files/adb-init index e88df23a..6faed600 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 diff --git a/recipes/adbd/files/raspberrypi/adb-init b/recipes/adbd/files/raspberrypi/adb-init new file mode 100644 index 00000000..8910e0e4 --- /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 diff --git a/recipes/alsa/alsa-state.bbappend b/recipes/alsa/alsa-state.bbappend new file mode 100644 index 00000000..c9fba435 --- /dev/null +++ b/recipes/alsa/alsa-state.bbappend @@ -0,0 +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$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/recipes/alsa/alsa-state/emulator/asound.conf b/recipes/alsa/alsa-state/emulator/asound.conf new file mode 100644 index 00000000..edd2e82a --- /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 new file mode 100644 index 00000000..83f7f9a3 --- /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/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 53a4b1a2..40075c0a 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,4 +1,24 @@ +############################################################################# +## +## 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$ +## +############################################################################# + # 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/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend index 81c758ca..4b8908a3 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) 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$ +## +############################################################################# + do_install_append() { ln -s /home/root ${D}/root echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname diff --git a/recipes/busybox/busybox/busybox-ifplugd.sh b/recipes/busybox/busybox/busybox-ifplugd.sh new file mode 100755 index 00000000..9ea40a88 --- /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 00000000..44fe0405 --- /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 00000000..f858907a --- /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 00000000..fe5d5eaa --- /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/ +} 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 a13df13b..00000000 --- a/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -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 9e260be0..00000000 --- a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -PROVIDES += "virtual/libgl" - -FILES_libegl-mx6-dev += "${includedir}/KHR ${includedir}/EGL" 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 00000000..bed361ef --- /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 = "" diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb new file mode 100644 index 00000000..beb071d7 --- /dev/null +++ b/recipes/hunspell/hunspell_1.3.2.bb @@ -0,0 +1,55 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +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;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[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" + +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 6dc4f1f8..a9ec3bf5 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -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$ +## +############################################################################# + DESCRIPTION = "B2Qt on embedded Linux SDK image" LICENSE = "CLOSED" PR = "r0" @@ -39,6 +61,7 @@ TOOLS_EXTRA_INSTALL = "\ " IMAGE_INSTALL += "\ + kernel-modules \ psplash \ openssh-sftp-server \ openssl \ @@ -52,6 +75,8 @@ IMAGE_INSTALL += "\ liberation-fonts \ tslib \ tslib-calibrate \ + alsa-utils-amixer \ + hunspell \ ${GSTREAMER_EXTRA_INSTALL} \ ${TOOLS_EXTRA_INSTALL} \ ${MACHINE_EXTRA_INSTALL} \ diff --git a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend index 31c189d2..fee53907 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) 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_append_beagleboard = " file://fixed_mac_address" diff --git a/recipes/initscripts/initscripts_1.0.bbappend b/recipes/initscripts/initscripts_1.0.bbappend index 196ac2f6..8473b89a 100644 --- a/recipes/initscripts/initscripts_1.0.bbappend +++ b/recipes/initscripts/initscripts_1.0.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$ +## +############################################################################# + 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 e43ea694..73a24088 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) 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$ +## +############################################################################# + BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" TOOLCHAIN_PATH = "${STAGING_DIR_TARGET}" @@ -5,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 7770c39a..6a37c89b 100644 --- a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend @@ -1,6 +1,26 @@ -BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" +############################################################################# +## +## 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" +BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" 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 00000000..5446ffad --- /dev/null +++ b/recipes/libgles/libgles-omap3_5.00.00.01.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}:" + +BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" +BINLOCATION_beaglebone = "${S}/gfx_rel_es8.x" + +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 00000000..82bfdb23 --- /dev/null +++ b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend @@ -0,0 +1,42 @@ +############################################################################# +## +## 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}:" + +BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" +BINLOCATION_beaglebone = "${S}/gfx_rel_es8.x" + +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/libsdl/libsdl_1.2.15.bbappend b/recipes/libsdl/libsdl_1.2.15.bbappend new file mode 100644 index 00000000..36424fd0 --- /dev/null +++ b/recipes/libsdl/libsdl_1.2.15.bbappend @@ -0,0 +1 @@ +DEPENDS_remove = "virtual/libgl" diff --git a/recipes/linux/linux-am335x-psp_3.2.bbappend b/recipes/linux/linux-am335x-psp_3.2.bbappend index 1fe9d2a9..313111b3 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) 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$ +## +############################################################################# + 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 6d306299..610dc4d1 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) 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$ +## +############################################################################# + 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 1e979da4..4c2cb591 100644 --- a/recipes/linux/linux-mainline_3.2.bbappend +++ b/recipes/linux/linux-mainline_3.2.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$ +## +############################################################################# + 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-ti-staging_3.12.bbappend b/recipes/linux/linux-ti-staging_3.12.bbappend new file mode 100644 index 00000000..fe2bdd27 --- /dev/null +++ b/recipes/linux/linux-ti-staging_3.12.bbappend @@ -0,0 +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/linux/linux-yocto/snd_intel8x0.cfg b/recipes/linux/linux-yocto/snd_intel8x0.cfg new file mode 100644 index 00000000..6d78f08e --- /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.10.bbappend b/recipes/linux/linux-yocto_3.10.bbappend new file mode 100644 index 00000000..2645cbc5 --- /dev/null +++ b/recipes/linux/linux-yocto_3.10.bbappend @@ -0,0 +1,29 @@ +############################################################################# +## +## 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://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 def23ea7..00000000 --- a/recipes/linux/linux-yocto_3.8.bbappend +++ /dev/null @@ -1 +0,0 @@ -COMPATIBLE_MACHINE += "|emulator" diff --git a/recipes/llvm/llvm-common.bb b/recipes/llvm/llvm-common.bb deleted file mode 100644 index 192919ee..00000000 --- a/recipes/llvm/llvm-common.bb +++ /dev/null @@ -1,22 +0,0 @@ -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 a9a416d9..00000000 --- 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 fcd26668..00000000 --- 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 = "<valid version number>" -# 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 c3ae4946..00000000 --- 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 <cerrno> -+ -+#undef HAVE_FENV_H -+ - #ifdef HAVE_FENV_H - #include <fenv.h> - #endif diff --git a/recipes/llvm/llvm3.2_3.2.bb b/recipes/llvm/llvm3.2_3.2.bb deleted file mode 100644 index 71a53c1f..00000000 --- a/recipes/llvm/llvm3.2_3.2.bb +++ /dev/null @@ -1,105 +0,0 @@ -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.3.bb b/recipes/mesa/mesa_9.1.3.bb deleted file mode 100644 index 26a2154d..00000000 --- a/recipes/mesa/mesa_9.1.3.bb +++ /dev/null @@ -1,117 +0,0 @@ -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/mesa/mesa_9.1.6.bbappend b/recipes/mesa/mesa_9.1.6.bbappend new file mode 100644 index 00000000..627f70b3 --- /dev/null +++ b/recipes/mesa/mesa_9.1.6.bbappend @@ -0,0 +1,26 @@ +############################################################################# +## +## 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" +DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915" +DRIDRIVERS_append += "swrast" +EXTRA_OECONF += "--with-dri-drivers=""" diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb index 8944c752..c0afb90a 100644 --- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb +++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb @@ -1,8 +1,30 @@ +############################################################################# +## +## 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$ +## +############################################################################# + 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/mkcard/files/mkcard.sh b/recipes/mkcard/files/mkcard.sh index 3e70dbcf..e75a1767 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 diff --git a/recipes/mkcard/mkcard_0.5.bb b/recipes/mkcard/mkcard_0.5.bb index 3671f7a7..8d71f81b 100644 --- a/recipes/mkcard/mkcard_0.5.bb +++ b/recipes/mkcard/mkcard_0.5.bb @@ -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$ +## +############################################################################# + 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 deleted file mode 100644 index 949a5a9e..00000000 --- a/recipes/openssh/openssh_6.1p1.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -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 8458ffb9..f32bac4c 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) 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$ +## +############################################################################# + 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 4ff29d0a..4cdd4047 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) 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$ +## +############################################################################# + DESCRIPTION = "Target packages for B2Qt on embedded Linux SDK" PR = "r0" ALLOW_EMPTY_${PN} = "1" @@ -22,7 +44,8 @@ RDEPENDS_${PN} += "\ gst-plugins-base-dev \ icu-dev \ libxslt-dev \ - libudev-dev \ + udev-dev \ tslib-dev \ + hunspell-dev \ ${MACHINE_EXTRA_INSTALL_SDK} \ " diff --git a/recipes/psplash/psplash_git.bbappend b/recipes/psplash/psplash_git.bbappend index 9a098f4c..a5017cc1 100644 --- a/recipes/psplash/psplash_git.bbappend +++ b/recipes/psplash/psplash_git.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$ +## +############################################################################# + 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 48d78851..2b1c6564 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) 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_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 787ac426..f6fbde1b 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) 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://0001-beagle-change-default-kernel-args.patch \ 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 3c65a20f..d97921c3 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,24 +1,25 @@ -From 6b894707404a1aeb3072d4b3bfc486ff9ad37ac4 Mon Sep 17 00:00:00 2001 +From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@digia.com> -Date: Tue, 9 Jul 2013 15:31:30 +0300 +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 1d766ca..80b91ea 100644 ---- a/board/boundary/nitrogen6x/6x_bootscript.txt -+++ b/board/boundary/nitrogen6x/6x_bootscript.txt -@@ -53,6 +53,6 @@ done +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 +-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 diff --git a/recipes/u-boot/u-boot-script-boundary_git.bbappend b/recipes/u-boot/u-boot-script-boundary_git.bbappend index c8457178..083b2fd8 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) 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_append := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-nitrogen6x-disable-console-cursor-blinking.patch \ 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 00000000..25dd9e44 --- /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 <samuli.piippo@digia.com> +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 00000000..bad928bb --- /dev/null +++ b/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend @@ -0,0 +1,26 @@ +############################################################################# +## +## 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://0001-BBB-disable-console-cursor-blinking.patch \ + " diff --git a/recipes/udev/0001-support-multitouch-screens.patch b/recipes/udev/udev/0001-support-multitouch-screens.patch index aacb8e03..aacb8e03 100644 --- a/recipes/udev/0001-support-multitouch-screens.patch +++ b/recipes/udev/udev/0001-support-multitouch-screens.patch diff --git a/recipes/udev/udev/beagleboard/udev-cache.default b/recipes/udev/udev/beagleboard/udev-cache.default new file mode 100644 index 00000000..d0050b87 --- /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" diff --git a/recipes/udev/udev/beaglebone/udev-cache.default b/recipes/udev/udev/beaglebone/udev-cache.default new file mode 100644 index 00000000..d0050b87 --- /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 564d9a14..4cee6a2c 100644 --- a/recipes/udev/udev_182.bbappend +++ b/recipes/udev/udev_182.bbappend @@ -1,4 +1,26 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}:" +############################################################################# +## +## 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://0001-support-multitouch-screens.patch" diff --git a/recipes/v86d/v86d_0.1.10.bbappend b/recipes/v86d/v86d_0.1.10.bbappend index 7c9a8602..d551a9fe 100644 --- a/recipes/v86d/v86d_0.1.10.bbappend +++ b/recipes/v86d/v86d_0.1.10.bbappend @@ -1,2 +1,24 @@ +############################################################################# +## +## 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$ +## +############################################################################# + COMPATIBLE_MACHINE = "(qemux86|emulator)" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/recipes/vc-graphics/vc-graphics.bbappend b/recipes/vc-graphics/vc-graphics.bbappend deleted file mode 100644 index c76f5c4a..00000000 --- a/recipes/vc-graphics/vc-graphics.bbappend +++ /dev/null @@ -1 +0,0 @@ -PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" diff --git a/recipes/virtualbox/mount-vboxsf_4.2.14.bb b/recipes/virtualbox/mount-vboxsf_4.2.14.bb index f529f189..4026d3aa 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) 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$ +## +############################################################################# + 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 fe366b13..128cad0d 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) 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$ +## +############################################################################# + DESCRIPTION = "Kernel drivers for the VirtualBox guest additions" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${WORKDIR}/VirtualBox-${PV}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" |