From 2ddb2aa8fe9ce32c9d52b639cdbf75939c6fb1b9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 7 Nov 2013 15:51:27 +0200 Subject: Move kernel console to ttyS0 for emulator Change-Id: I881e4423d22e70ddd658d29b554c62c1fa4924fb Reviewed-by: Rainer Keller --- classes/image-hdd.bbclass | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'classes/image-hdd.bbclass') diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index fc76234..25d0a55 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -18,5 +18,21 @@ python do_hddimg() { bb.build.exec_func('create_hdd_image', d) } +python build_syslinux_cfg_append () { + import re + + try: + cfgfile = file(cfile, 'r+') + except OSError: + raise bb.build.funcFailed('Unable to open %s' % (cfile)) + + f_content = cfgfile.read() + f_content = re.sub('tty0', 'ttyS0,115200', f_content) + + cfgfile.seek(0) + cfgfile.write(f_content) + cfgfile.close() +} + addtask hddimg after do_bootdirectdisk before do_build do_hddimg[nostamp] = "1" -- cgit v1.2.3-54-g00ecf From 1cf4f1255ef5ccd6dc4e1e22d58c7d00f5d2f040 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 22 Nov 2013 15:10:00 +0200 Subject: Add license header to all recipes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I726d154e54a43d2561969d789709895d4c594da9 Reviewed-by: Eirik Aavitsland Reviewed-by: Topi Reiniö --- README | 22 ++++++++++++++++++++++ classes/image-hdd.bbclass | 22 ++++++++++++++++++++++ classes/image_types_sdcard.bbclass | 22 ++++++++++++++++++++++ conf/bblayers.conf.sample | 22 ++++++++++++++++++++++ conf/distro/b2qt.conf | 22 ++++++++++++++++++++++ conf/distro/include/am335x-evm.conf | 22 ++++++++++++++++++++++ conf/distro/include/beagleboard.conf | 22 ++++++++++++++++++++++ conf/distro/include/emulator.conf | 22 ++++++++++++++++++++++ conf/distro/include/imx53qsb.conf | 22 ++++++++++++++++++++++ conf/distro/include/nitrogen6x.conf | 22 ++++++++++++++++++++++ conf/distro/include/raspberrypi.conf | 22 ++++++++++++++++++++++ conf/layer.conf | 22 ++++++++++++++++++++++ conf/local.conf.sample | 22 ++++++++++++++++++++++ conf/machine/emulator.conf | 22 ++++++++++++++++++++++ recipes/adbd/adbd.bb | 22 ++++++++++++++++++++++ recipes/alsa/alsa-state.bbappend | 22 ++++++++++++++++++++++ recipes/alsa/alsa-state/raspberrypi/asound.conf | 22 ++++++++++++++++++++++ .../amd-gpu-x11-bin-mx51_11.09.01.bbappend | 22 ++++++++++++++++++++++ recipes/base-files/base-files_3.0.14.bbappend | 22 ++++++++++++++++++++++ recipes/gdb/gdb-cross-canadian_7.5.1.bbappend | 22 ++++++++++++++++++++++ .../gpu-viv-bin-mx6q_1.1.0.bbappend | 22 ++++++++++++++++++++++ recipes/images/b2qt-embedded-image.bb | 22 ++++++++++++++++++++++ recipes/init-ifupdown/init-ifupdown_1.0.bbappend | 22 ++++++++++++++++++++++ recipes/initscripts/initscripts_1.0.bbappend | 22 ++++++++++++++++++++++ recipes/libgles/libgles-omap3_4.05.00.03.bbappend | 22 ++++++++++++++++++++++ recipes/libgles/libgles-omap3_4.09.00.01.bbappend | 22 ++++++++++++++++++++++ recipes/linux/linux-am335x-psp_3.2.bbappend | 22 ++++++++++++++++++++++ recipes/linux/linux-boundary_3.0.35.bbappend | 22 ++++++++++++++++++++++ recipes/linux/linux-mainline_3.2.bbappend | 22 ++++++++++++++++++++++ recipes/linux/linux-yocto_3.8.bbappend | 22 ++++++++++++++++++++++ recipes/llvm/llvm-common.bb | 22 ++++++++++++++++++++++ recipes/llvm/llvm3.2_3.2.bb | 22 ++++++++++++++++++++++ recipes/mesa/mesa_9.1.3.bb | 22 ++++++++++++++++++++++ recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb | 22 ++++++++++++++++++++++ recipes/mkcard/mkcard_0.5.bb | 22 ++++++++++++++++++++++ recipes/openssh/openssh_6.1p1.bbappend | 22 ++++++++++++++++++++++ ...dk-packagegroup-b2qt-embedded-toolchain-host.bb | 22 ++++++++++++++++++++++ ...-packagegroup-b2qt-embedded-toolchain-target.bb | 22 ++++++++++++++++++++++ recipes/psplash/psplash_git.bbappend | 22 ++++++++++++++++++++++ recipes/u-boot/u-boot-am33x_2013.01.01.bbappend | 22 ++++++++++++++++++++++ recipes/u-boot/u-boot-beagleboard_2011.09.bbappend | 22 ++++++++++++++++++++++ recipes/u-boot/u-boot-script-boundary_git.bbappend | 22 ++++++++++++++++++++++ recipes/udev/udev_182.bbappend | 22 ++++++++++++++++++++++ recipes/userland/userland_git.bbappend | 22 ++++++++++++++++++++++ recipes/v86d/v86d_0.1.10.bbappend | 22 ++++++++++++++++++++++ recipes/virtualbox/mount-vboxsf_4.2.14.bb | 22 ++++++++++++++++++++++ .../virtualbox-guest-additions_4.2.14.bb | 22 ++++++++++++++++++++++ 47 files changed, 1034 insertions(+) (limited to 'classes/image-hdd.bbclass') diff --git a/README b/README index c642c1c..e0990da 100644 --- a/README +++ b/README @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + OpenEmbedded/Yocto meta layer for B2Qt on embedded Linux ========================================================== diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index 25d0a55..123c417 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + # need to define the dependency and the ROOTFS for directdisk do_bootdirectdisk[depends] += "${PN}:do_rootfs" ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass index 7b11482..221ccd4 100644 --- a/classes/image_types_sdcard.bbclass +++ b/classes/image_types_sdcard.bbclass @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + inherit image_types_fsl IMAGE_ROOTFS_EXTRA_SPACE = "300000" diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index 987a75d..4e3fb71 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly LCONF_VERSION = "6" diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 1af10b5..6dc189f 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + include conf/distro/poky.conf DISTRO = "b2qt" diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index 03ccb46..b653d44 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + IMAGE_FSTYPES = "tar.gz" PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3" diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index 728a3ea..0b6454f 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + IMAGE_CLASSES += "image_types_sdcard" IMAGE_FSTYPES = "tar.gz ext3 sdcard" diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index ab5fb76..ce17052 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + IMAGE_CLASSES += "image-hdd" IMAGE_ROOTFS_ALIGNMENT = "1048576" ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index 0d96d9a..ca8595d 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + IMAGE_FSTYPES = "tar.gz" PREFERRED_PROVIDER_virtual/libgl = "amd-gpu-x11-bin-mx51" diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index cf99d11..dbb9478 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + IMAGE_CLASSES += "image_types_sdcard" IMAGE_FSTYPES = "tar.gz ext3 sdcard" diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index e7e12c3..d167c43 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + IMAGE_FSTYPES = "tar.gz ext3 rpi-sdimg" PREFERRED_PROVIDER_virtual/libgles1 = "userland" diff --git a/conf/layer.conf b/conf/layer.conf index 9e97746..952abcb 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + # We have a conf and classes directory, append to BBPATH BBPATH .= ":${LAYERDIR}" diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 00c9a07..5c298c4 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + # # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf index e118a44..2aac3ab 100644 --- a/conf/machine/emulator.conf +++ b/conf/machine/emulator.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + #@TYPE: Machine #@NAME: virtual box emulator #@DESCRIPTION: Machine configuration for running a common x86 diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb index aa8f5e9..582305b 100644 --- a/recipes/adbd/adbd.bb +++ b/recipes/adbd/adbd.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "Android Debug Bridge Daemon" HOMEPAGE = "http://developer.android.com/tools/help/adb.html" SECTION = "devel" diff --git a/recipes/alsa/alsa-state.bbappend b/recipes/alsa/alsa-state.bbappend index 72d991c..d1017c3 100644 --- a/recipes/alsa/alsa-state.bbappend +++ b/recipes/alsa/alsa-state.bbappend @@ -1 +1,23 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/recipes/alsa/alsa-state/raspberrypi/asound.conf b/recipes/alsa/alsa-state/raspberrypi/asound.conf index 83f7f9a..0d270a5 100644 --- a/recipes/alsa/alsa-state/raspberrypi/asound.conf +++ b/recipes/alsa/alsa-state/raspberrypi/asound.conf @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + pcm.!default { type hw card 0 diff --git a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend index 53a4b1a..3c48097 100644 --- a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend +++ b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + # dependency to x11 only when distro features have it DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend index 81c758c..c276c57 100644 --- a/recipes/base-files/base-files_3.0.14.bbappend +++ b/recipes/base-files/base-files_3.0.14.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + do_install_append() { ln -s /home/root ${D}/root echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname diff --git a/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend b/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend index a13df13..f96bc35 100644 --- a/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend +++ b/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + do_compile_prepend() { cat > ${WORKDIR}/python << EOF #! /bin/sh diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend index 9e260be..ccbbf8f 100644 --- a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend +++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + PROVIDES += "virtual/libgl" FILES_libegl-mx6-dev += "${includedir}/KHR ${includedir}/EGL" diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index feb1cfd..40719eb 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "B2Qt on embedded Linux SDK image" LICENSE = "CLOSED" PR = "r0" diff --git a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend index 31c189d..eb545f7 100644 --- a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_beagleboard = " file://fixed_mac_address" diff --git a/recipes/initscripts/initscripts_1.0.bbappend b/recipes/initscripts/initscripts_1.0.bbappend index 196ac2f..9c159bc 100644 --- a/recipes/initscripts/initscripts_1.0.bbappend +++ b/recipes/initscripts/initscripts_1.0.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + do_configure_append() { sed -i -e "/echo/d" ${WORKDIR}/banner.sh } diff --git a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend index e43ea69..97bb2b3 100644 --- a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend +++ b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" TOOLCHAIN_PATH = "${STAGING_DIR_TARGET}" diff --git a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend index 7770c39..5ef2e29 100644 --- a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" PROVIDES += "virtual/libgl" diff --git a/recipes/linux/linux-am335x-psp_3.2.bbappend b/recipes/linux/linux-am335x-psp_3.2.bbappend index 1fe9d2a..c8f0f68 100644 --- a/recipes/linux/linux-am335x-psp_3.2.bbappend +++ b/recipes/linux/linux-am335x-psp_3.2.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + do_configure_append() { # FunctionFS for adb echo "CONFIG_USB_LIBCOMPOSITE=y" >> ${S}/.config diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.0.35.bbappend index 6d30629..fa0488a 100644 --- a/recipes/linux/linux-boundary_3.0.35.bbappend +++ b/recipes/linux/linux-boundary_3.0.35.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + do_configure_prepend() { # Use multitouch protocol for touchscreen that support it diff --git a/recipes/linux/linux-mainline_3.2.bbappend b/recipes/linux/linux-mainline_3.2.bbappend index 1e979da..6ca8c2e 100644 --- a/recipes/linux/linux-mainline_3.2.bbappend +++ b/recipes/linux/linux-mainline_3.2.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + do_configure_prepend() { # Builtin network driver, so networking is initialized correctly during boot echo "CONFIG_USB_NET_SMSC95XX=y" >> ${WORKDIR}/defconfig diff --git a/recipes/linux/linux-yocto_3.8.bbappend b/recipes/linux/linux-yocto_3.8.bbappend index 51c54e4..fa6d5eb 100644 --- a/recipes/linux/linux-yocto_3.8.bbappend +++ b/recipes/linux/linux-yocto_3.8.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://snd_intel8x0.cfg \ diff --git a/recipes/llvm/llvm-common.bb b/recipes/llvm/llvm-common.bb index 192919e..0e20600 100644 --- a/recipes/llvm/llvm-common.bb +++ b/recipes/llvm/llvm-common.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "Helper script for OE's llvm support" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ diff --git a/recipes/llvm/llvm3.2_3.2.bb b/recipes/llvm/llvm3.2_3.2.bb index 71a53c1..92b62f9 100644 --- a/recipes/llvm/llvm3.2_3.2.bb +++ b/recipes/llvm/llvm3.2_3.2.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "The Low Level Virtual Machine" HOMEPAGE = "http://llvm.org" # 3-clause BSD-like diff --git a/recipes/mesa/mesa_9.1.3.bb b/recipes/mesa/mesa_9.1.3.bb index 26a2154..99c3a38 100644 --- a/recipes/mesa/mesa_9.1.3.bb +++ b/recipes/mesa/mesa_9.1.3.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + SUMMARY = "A free implementation of the OpenGL API" DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \ a system for rendering interactive 3D graphics. \ diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb index 8944c75..b37cad8 100644 --- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb +++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "B2Qt on embedded Linux SDK toolchain" PR = "r0" LICENSE = "CLOSED" diff --git a/recipes/mkcard/mkcard_0.5.bb b/recipes/mkcard/mkcard_0.5.bb index 3671f7a..d1da05a 100644 --- a/recipes/mkcard/mkcard_0.5.bb +++ b/recipes/mkcard/mkcard_0.5.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "mkcard.sh v0.5" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://${COREBASE}/bitbake/COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/recipes/openssh/openssh_6.1p1.bbappend b/recipes/openssh/openssh_6.1p1.bbappend index 949a5a9..7c35cd4 100644 --- a/recipes/openssh/openssh_6.1p1.bbappend +++ b/recipes/openssh/openssh_6.1p1.bbappend @@ -1,2 +1,24 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + export libexecdir="/usr/libexec" diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index 8458ffb..7194f91 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "Host packages for B2Qt on embedded Linux SDK" PR = "r0" ALLOW_EMPTY_${PN} = "1" diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb index 4ff29d0..d56b5be 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "Target packages for B2Qt on embedded Linux SDK" PR = "r0" ALLOW_EMPTY_${PN} = "1" diff --git a/recipes/psplash/psplash_git.bbappend b/recipes/psplash/psplash_git.bbappend index 9a098f4..f9f3a6e 100644 --- a/recipes/psplash/psplash_git.bbappend +++ b/recipes/psplash/psplash_git.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SPLASH_IMAGES = "file://qt.png;outsuffix=default" diff --git a/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend b/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend index 48d7885..bd00147 100644 --- a/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend +++ b/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-am335x-evm-disable-console-cursor-blinking.patch \ diff --git a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend index 787ac42..6d0e105 100644 --- a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend +++ b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-beagle-change-default-kernel-args.patch \ diff --git a/recipes/u-boot/u-boot-script-boundary_git.bbappend b/recipes/u-boot/u-boot-script-boundary_git.bbappend index c845717..3fc3b47 100644 --- a/recipes/u-boot/u-boot-script-boundary_git.bbappend +++ b/recipes/u-boot/u-boot-script-boundary_git.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-nitrogen6x-disable-console-cursor-blinking.patch \ diff --git a/recipes/udev/udev_182.bbappend b/recipes/udev/udev_182.bbappend index 564d9a1..761d792 100644 --- a/recipes/udev/udev_182.bbappend +++ b/recipes/udev/udev_182.bbappend @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + FILESEXTRAPATHS_prepend := "${THISDIR}:" SRC_URI += "file://0001-support-multitouch-screens.patch" diff --git a/recipes/userland/userland_git.bbappend b/recipes/userland/userland_git.bbappend index c76f5c4..0e748cd 100644 --- a/recipes/userland/userland_git.bbappend +++ b/recipes/userland/userland_git.bbappend @@ -1 +1,23 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" diff --git a/recipes/v86d/v86d_0.1.10.bbappend b/recipes/v86d/v86d_0.1.10.bbappend index 7c9a860..e2a9b43 100644 --- a/recipes/v86d/v86d_0.1.10.bbappend +++ b/recipes/v86d/v86d_0.1.10.bbappend @@ -1,2 +1,24 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + COMPATIBLE_MACHINE = "(qemux86|emulator)" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/recipes/virtualbox/mount-vboxsf_4.2.14.bb b/recipes/virtualbox/mount-vboxsf_4.2.14.bb index f529f18..656f379 100644 --- a/recipes/virtualbox/mount-vboxsf_4.2.14.bb +++ b/recipes/virtualbox/mount-vboxsf_4.2.14.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "VirtualBox Guest Additions for Linux: mount" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${WORKDIR}/VirtualBox-${PV}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" diff --git a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb index fe366b1..09358df 100644 --- a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb +++ b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb @@ -1,3 +1,25 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + DESCRIPTION = "Kernel drivers for the VirtualBox guest additions" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${WORKDIR}/VirtualBox-${PV}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" -- cgit v1.2.3-54-g00ecf From 20a3734c0da057a51aadc89e3dba163367611dc5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 23 Jan 2014 13:36:37 +0200 Subject: upgrade emulator components - kernel 3.10 - LLVM 3.3 - mesa 9.1.6 Change-Id: Ib15c6826ab480e39e4efb7a16d42030b55ad6c3b Reviewed-by: Samuli Piippo --- classes/image-hdd.bbclass | 19 +-- conf/distro/include/emulator.conf | 2 +- conf/machine/emulator.conf | 1 - recipes/linux/linux-yocto_3.10.bbappend | 29 ++++ recipes/linux/linux-yocto_3.8.bbappend | 28 ---- recipes/llvm/llvm-common.bb | 44 ------ recipes/llvm/llvm-common/llvm-config | 10 -- recipes/llvm/llvm.inc | 226 ----------------------------- recipes/llvm/llvm3.2/arm_fenv_uclibc.patch | 14 -- recipes/llvm/llvm3.2_3.2.bb | 127 ---------------- recipes/mesa/mesa_9.1.6.bbappend | 6 + 11 files changed, 38 insertions(+), 468 deletions(-) create mode 100644 recipes/linux/linux-yocto_3.10.bbappend delete mode 100644 recipes/linux/linux-yocto_3.8.bbappend delete mode 100644 recipes/llvm/llvm-common.bb delete mode 100644 recipes/llvm/llvm-common/llvm-config delete mode 100644 recipes/llvm/llvm.inc delete mode 100644 recipes/llvm/llvm3.2/arm_fenv_uclibc.patch delete mode 100644 recipes/llvm/llvm3.2_3.2.bb create mode 100644 recipes/mesa/mesa_9.1.6.bbappend (limited to 'classes/image-hdd.bbclass') diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index 123c417..fb59c20 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -29,32 +29,17 @@ SYSLINUX_PROMPT = "0" SYSLINUX_TIMEOUT = "1" SYSLINUX_LABELS = "boot" LABELS_append = " ${SYSLINUX_LABELS} " +SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200" inherit image_types boot-directdisk create_hdd_image () { - ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd + ln -fs ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd } python do_hddimg() { bb.build.exec_func('create_hdd_image', d) } -python build_syslinux_cfg_append () { - import re - - try: - cfgfile = file(cfile, 'r+') - except OSError: - raise bb.build.funcFailed('Unable to open %s' % (cfile)) - - f_content = cfgfile.read() - f_content = re.sub('tty0', 'ttyS0,115200', f_content) - - cfgfile.seek(0) - cfgfile.write(f_content) - cfgfile.close() -} - addtask hddimg after do_bootdirectdisk before do_build do_hddimg[nostamp] = "1" diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index ce17052..d3d5efd 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -32,7 +32,7 @@ MACHINE_EXTRA_RRECOMMENDS += "\ kernel_autoload_snd-intel8x0 = "snd-intel8x0" MACHINE_EXTRA_INSTALL = "\ - llvm3.2 \ + llvm3.3 \ libegl-mesa \ libegl-gallium \ libgles2-mesa \ diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf index 2aac3ab..f2628d5 100644 --- a/conf/machine/emulator.conf +++ b/conf/machine/emulator.conf @@ -29,7 +29,6 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.8%" require conf/machine/include/tune-i586.inc diff --git a/recipes/linux/linux-yocto_3.10.bbappend b/recipes/linux/linux-yocto_3.10.bbappend new file mode 100644 index 0000000..9cd7e69 --- /dev/null +++ b/recipes/linux/linux-yocto_3.10.bbappend @@ -0,0 +1,29 @@ +############################################################################# +## +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "\ + file://snd_intel8x0.cfg \ + " + +KMACHINE_emulator = "qemux86" +COMPATIBLE_MACHINE_emulator = "emulator" diff --git a/recipes/linux/linux-yocto_3.8.bbappend b/recipes/linux/linux-yocto_3.8.bbappend deleted file mode 100644 index fa6d5eb..0000000 --- a/recipes/linux/linux-yocto_3.8.bbappend +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################# -## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "\ - file://snd_intel8x0.cfg \ - " - -COMPATIBLE_MACHINE += "|emulator" diff --git a/recipes/llvm/llvm-common.bb b/recipes/llvm/llvm-common.bb deleted file mode 100644 index 0e20600..0000000 --- a/recipes/llvm/llvm-common.bb +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################# -## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -DESCRIPTION = "Helper script for OE's llvm support" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ -" - -SRC_URI = "file://llvm-config" - -ALLOW_EMPTY_${PN} = "1" -SYSROOT_PREPROCESS_FUNCS_append_class-target = " llvm_common_sysroot_preprocess" - -llvm_common_sysroot_preprocess() { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 0755 ${WORKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ -} - -do_install_virtclass-native() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/llvm-config ${D}${bindir} -} - -BBCLASSEXTEND = "native" diff --git a/recipes/llvm/llvm-common/llvm-config b/recipes/llvm/llvm-common/llvm-config deleted file mode 100644 index a9a416d..0000000 --- a/recipes/llvm/llvm-common/llvm-config +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# Wrapper script for real llvm-config. Simply calls - -if [ $WANT_LLVM_RELEASE ]; then - exec `dirname $0`/${TARGET_PREFIX}llvm-config$WANT_LLVM_RELEASE ${@} -else - echo "The variable WANT_LLVM_RELEASE is not defined and exported" - echo "by your build recipe. Go figure." - exit 1 -fi diff --git a/recipes/llvm/llvm.inc b/recipes/llvm/llvm.inc deleted file mode 100644 index fcd2666..0000000 --- a/recipes/llvm/llvm.inc +++ /dev/null @@ -1,226 +0,0 @@ -# LLVM does not provide ABI stability between different versions. For this -# reason OE makes it possible to build and install different llvm versions -# at the same time. -# -# This is true for the normal recipes as well as the native ones. -# -# All regular installation directories are prefixed with 'llvm${LLVM_RELEASE}' -# e.g. "${STAGING_BINDIR}/llvm2.5" or "${STAGING_INCDIR}/llvm2.5" -# -# For your program or library that makes use of llvm you do should not need to -# modify anything as long as it uses the results of various llvm-config -# invocations. If you need customizations something is wrong and it needs to be -# fixed (report bug). -# -# However the *recipe* for your program/library *must* declare -# export WANT_LLVM_RELEASE = "" -# The version number is picked up by a generic wrapper script which just calls -# the variant of the specified version. - -DESCRIPTION = "The Low Level Virtual Machine" -HOMEPAGE = "http://llvm.org" -# 3-clause BSD-like -LICENSE = "NCSA" -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=0ac5f799a2d89477c75b0a378b221855" - -DEPENDS = "llvm${LLVM_RELEASE}-native llvm-common" -DEPENDS_virtclass-native = "llvm-common-native cmake-native" - -INC_PR = "r2" - -SRC_URI = "http://llvm.org/releases/${PV}/llvm-${PV}.tgz" - -S = "${WORKDIR}/llvm-${PV}" - -inherit cmake perlnative pythonnative - -# Defines the LLVM supported arches. By now we always build either for ${BUILD} -# (native) or ${TARGET}. In the future it may make sense to enable all backends -# for the non-native build. The decision which backends are used is made by -# the 3rd party program or library that uses llvm anyway. -LLVM_ARCH = "${@get_llvm_arch(d)}" - -# This is used for generating the install directory for the llvm libraries, -# binaries and headers. It makes side by side installation of those possible. -LLVM_RELEASE = "${PV}" - -# llvm *must* be built out of tree -OECMAKE_SOURCEPATH = ".." -OECMAKE_BUILDPATH = "build" -EXTRA_OECMAKE = "\ - -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm${LLVM_RELEASE}/tblgen \ - -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \ - -DCMAKE_LINKER:FILEPATH=${LD} \ - -DCMAKE_AR:FILEPATH=${AR} \ - -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \ - -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \ - -DCMAKE_RANLIB:FILEPATH=${RANLIB} \ - -DCMAKE_STRIP:FILEPATH=${STRIP} \ - -DNM_PATH:FILEPATH=${NM} \ - -DLLVM_ENABLE_PIC:BOOL=ON \ - -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \ - -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \ - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_SKIP_BUILD_RPATH:BOOL=ON \ -" -# We need to reset this to avoid breakage as we build out of tree -TOOLCHAIN_OPTIONS = "" - -PACKAGES_DYNAMIC = "llvm-*" - -# the difference to the non-native build is that we do not need -# to declare the location of the tblgen executable. -EXTRA_OECMAKE_virtclass-native = "\ - -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \ - -DCMAKE_LINKER:FILEPATH=${LD} \ - -DCMAKE_AR:FILEPATH=${AR} \ - -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \ - -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \ - -DCMAKE_RANLIB:FILEPATH=${RANLIB} \ - -DCMAKE_STRIP:FILEPATH=${STRIP} \ - -DNM_PATH:FILEPATH=${NM} \ -" - -PACKAGES_virtclass-native = "" - -PACKAGES_DYNAMIC_virtclass-native = "" - -python populate_packages_prepend () { - libllvm_libdir = bb.data.expand('${libdir}/llvm${LLVM_RELEASE}', d) - do_split_packages(d, libllvm_libdir, '^lib(.*)\.so$', 'libllvm-%s', 'Split package for %s', allow_dirs=True) -} - -FILES_${PN} = "" -ALLOW_EMPTY_${PN} = "1" - -FILES_${PN}-dbg += "${libdir}/llvm${LLVM_RELEASE}/.debug ${bindir}/llvm${LLVM_RELEASE}/.debug" - -FILES_${PN}-dev = " \ - ${includedir} \ - ${bindir}/* \ - ${libdir}/llvm${LLVM_RELEASE}/LLVMHello.so \ - ${libdir}/llvm${LLVM_RELEASE}/BugpointPasses.so \ - ${libdir}/llvm${LLVM_RELEASE}/*.a \ -" - -base_do_compile_prepend() { - # Avoid *** No rule to make target `native/bin/tblgen', needed by `include/llvm/Intrinsics.gen.tmp' - oe_runmake tblgen -} - -do_install() { - # Install into a private directory to be able to reorganize the files. - - cd ${OECMAKE_BUILDPATH} - - oe_runmake DESTDIR=${WORKDIR}/llvm-install install - - # Create our custom target directories - install -d ${D}${bindir}/llvm${LLVM_RELEASE} - install -d ${D}${includedir}/llvm${LLVM_RELEASE} - install -d ${D}${libdir}/llvm${LLVM_RELEASE} - - # Move headers into their own directory - cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm \ - ${D}${includedir}/llvm${LLVM_RELEASE}/ - cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \ - ${D}${includedir}/llvm${LLVM_RELEASE}/ - - find ${WORKDIR}/llvm-install/${prefix}/lib -name "*" -maxdepth 1 -exec \ - install {} ${D}${libdir}/llvm${LLVM_RELEASE} \; - - # I dont know another way out. Binaries are installed into a special subdir - find ${WORKDIR}/llvm-install/${prefix}/bin -name "*" -maxdepth 1 -exec \ - install {} ${D}${bindir}/llvm${LLVM_RELEASE} \; - - # LLVM does not install this by default. - install bin/tblgen ${D}${bindir}/llvm${LLVM_RELEASE} - - # we install it here unmodified for native and none native and overwrite it - # later for native case - install -d ${D}${bindir} - install -m 0755 bin/llvm-config ${D}${bindir} -} - -SYSROOT_PREPROCESS_FUNCS_append_class-target = " llvm_sysroot_preprocess" - -llvm_sysroot_preprocess() { - cd ${OECMAKE_BUILDPATH} - - # Fix the paths in the config script to make it find the binaries and - # library files. Doing so allows 3rd party configure scripts working - # unmodified. - sed -e's!my.*ABS_RUN_DIR =.*!my $ABS_RUN_DIR = "${STAGING_DIR_TARGET}";!' \ - -e's!my.*INCLUDEDIR =.*!my $INCLUDEDIR = "${STAGING_INCDIR}/llvm${LLVM_RELEASE}";!' \ - -e's!my.*LIBDIR.*!my $LIBDIR = "${STAGING_LIBDIR}/llvm${LLVM_RELEASE}";!' \ - -e's!my.*BINDIR.*!my $BINDIR = "${STAGING_BINDIR}/llvm${LLVM_RELEASE}";!' \ - bin/llvm-config > bin/llvm-config${LLVM_RELEASE} - - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} - install -m 0755 bin/llvm-config${LLVM_RELEASE} ${SYSROOT_DESTDIR}${bindir_crossscripts} -} - -do_install_virtclass-native() { - # Install into a private directory to be able to reorganize the files. - - cd ${OECMAKE_BUILDPATH} - - oe_runmake DESTDIR=${WORKDIR}/llvm-install install - - # Create our custom target directories - install -d ${D}${bindir}/llvm${LLVM_RELEASE} - install -d ${D}${includedir}/llvm${LLVM_RELEASE} - install -d ${D}${libdir}/llvm${LLVM_RELEASE} - - # Move headers into their own directory - cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm \ - ${D}${includedir}/llvm${LLVM_RELEASE}/ - cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \ - ${D}${includedir}/llvm${LLVM_RELEASE}/ - - find ${WORKDIR}/llvm-install/${prefix}/lib -name "*" -maxdepth 1 -exec \ - install {} ${D}${libdir}/llvm${LLVM_RELEASE} \; - - # I dont know another way out. Binaries are installed into a special subdir - find ${WORKDIR}/llvm-install/${prefix}/bin -name "*" -maxdepth 1 -exec \ - install {} ${D}${bindir}/llvm${LLVM_RELEASE} \; - - # LLVM does not install this by default. - install bin/tblgen ${D}${bindir}/llvm${LLVM_RELEASE} - - # Fix the paths in the config script to make it find the binaries and - # library files. Doing so allows 3rd party configure scripts working - # unmodified. - sed -e's!my.*ABS_RUN_DIR =.*!my $ABS_RUN_DIR = "${STAGING_DIR_TARGET}";!' \ - -e's!my.*INCLUDEDIR =.*!my $INCLUDEDIR = "${STAGING_INCDIR}/llvm${LLVM_RELEASE}";!' \ - -e's!my.*LIBDIR.*!my $LIBDIR = "${STAGING_LIBDIR}/llvm${LLVM_RELEASE}";!' \ - -e's!my.*BINDIR.*!my $BINDIR = "${STAGING_BINDIR}/llvm${LLVM_RELEASE}";!' \ - bin/llvm-config > bin/llvm-config${LLVM_RELEASE} - - install -d ${D}${bindir} - install -m 0755 bin/llvm-config${LLVM_RELEASE} ${D}${bindir} -} - - -# Retrieve the target in a way that is compatible to the arch -# value in llvm (>= 2.5) -def get_llvm_arch(d): - import bb; - - arch = bb.data.getVar('TARGET_ARCH', d, 1) - if arch == "x86_64" or arch == "i486" or arch == "i586" or arch == "i686": - arch = "X86" - elif arch == "arm": - arch = "ARM" - elif arch == "mipsel" or arch == "mips": - arch = "mips" - elif arch == "powerpc" or arch == "powerpc64": - arch = "PowerPC" - else: - bb.warn("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) ); - - return arch - -BBCLASSEXTEND = "native" - diff --git a/recipes/llvm/llvm3.2/arm_fenv_uclibc.patch b/recipes/llvm/llvm3.2/arm_fenv_uclibc.patch deleted file mode 100644 index c3ae494..0000000 --- a/recipes/llvm/llvm3.2/arm_fenv_uclibc.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: llvm-2.9/include/llvm/Support/FEnv.h -=================================================================== ---- llvm-2.9.orig/include/llvm/Support/FEnv.h 2010-11-29 20:44:50.000000000 +0100 -+++ llvm-2.9/include/llvm/Support/FEnv.h 2011-11-18 18:42:22.580161297 +0100 -@@ -17,6 +17,9 @@ - - #include "llvm/Config/config.h" - #include -+ -+#undef HAVE_FENV_H -+ - #ifdef HAVE_FENV_H - #include - #endif diff --git a/recipes/llvm/llvm3.2_3.2.bb b/recipes/llvm/llvm3.2_3.2.bb deleted file mode 100644 index 92b62f9..0000000 --- a/recipes/llvm/llvm3.2_3.2.bb +++ /dev/null @@ -1,127 +0,0 @@ -############################################################################# -## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -DESCRIPTION = "The Low Level Virtual Machine" -HOMEPAGE = "http://llvm.org" -# 3-clause BSD-like -LICENSE = "NCSA" -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=60fdd7739841f04a2ce2171a726be8f3" - -DEPENDS = "libffi libxml2-native llvm-common" - -SRC_URI = "http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.gz" -SRC_URI_append_libc-uclibc = " file://arm_fenv_uclibc.patch " - -SRC_URI[md5sum] = "71610289bbc819e3e15fdd562809a2d7" -SRC_URI[sha256sum] = "125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343" - -S = "${WORKDIR}/llvm-${PV}.src" - -inherit autotools perlnative pythonnative - -LLVM_BUILD_DIR = "${WORKDIR}/llvm-${PV}.build" -LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" -LLVM_DIR = "llvm${PV}" - -EXTRA_OECONF += "--disable-assertions \ - --enable-debug-runtime \ - --disable-expensive-checks \ - --enable-bindings=none \ - --enable-keep-symbols \ - --enable-libffi \ - --enable-optimized \ - --enable-shared \ - --enable-targets=host-only" -EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1" -FILES_${PN} = "${libdir}/lib*.so \ - ${libdir}/${LLVM_DIR}/*" -FILES_${PN}-dbg = "${bindir}/${LLVM_DIR}/.debug \ - ${libdir}/${LLVM_DIR}/.debug \ - ${libdir}/.debug \ - /usr/src/debug" -FILES_${PN}-dev = "${bindir}/${LLVM_DIR} \ - ${includedir}/${LLVM_DIR} \ - ${libdir}/${LLVM_DIR}/BugpointPasses.so \ - ${libdir}/${LLVM_DIR}/LLVMHello.so" -FILES_${PN}-static-dev = "${libdir}/${LLVM_DIR}/*.a" -FILES_SOLIBSDEV = "" -INSANE_SKIP_${PN} = "dev-so" - -do_configure_prepend() { - # Remove RPATHs - sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - - # Drop "svn" suffix from version string - sed -i 's/3\.2svn/3.2/g' configure - - # Fix paths in llvm-config - sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" tools/llvm-config/llvm-config.cpp - sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" tools/llvm-config/llvm-config.cpp - - # Fails to build unless using separate directory from source - mkdir -p ${LLVM_BUILD_DIR} - cd ${LLVM_BUILD_DIR} -} - -do_compile() { - cd ${LLVM_BUILD_DIR} - oe_runmake \ - AR="${BUILD_AR}" \ - CC="${BUILD_CC}" \ - CFLAGS="${BUILD_CFLAGS}" \ - CXX="${BUILD_CXX}" \ - CXXFLAGS="${BUILD_CXXFLAGS}" \ - CPP="${BUILD_CPP}" \ - CPPFLAGS="${BUILD_CPPFLAGS}" \ - NM="${BUILD_NM}" \ - RANLIB="${BUILD_RANLIB}" \ - PATH="${STAGING_BINDIR_NATIVE}:$PATH" \ - cross-compile-build-tools - oe_runmake -} - -do_install() { - cd ${LLVM_BUILD_DIR} - oe_runmake DESTDIR=${LLVM_INSTALL_DIR} install - - mv ${LLVM_INSTALL_DIR}${bindir}/${HOST_SYS}-llvm-config-host ${LLVM_INSTALL_DIR}/llvm-config-host - - install -d ${D}${bindir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${bindir}/* ${D}${bindir}/${LLVM_DIR}/ - - install -d ${D}${includedir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${includedir}/* ${D}${includedir}/${LLVM_DIR}/ - - install -d ${D}${libdir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${libdir}/* ${D}${libdir}/${LLVM_DIR}/ - ln -s ${LLVM_DIR}/libLLVM-${PV}.so ${D}${libdir}/libLLVM-${PV}.so - - install -d ${D}${docdir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${prefix}/docs/llvm/* ${D}${docdir}/${LLVM_DIR} -} - -SYSROOT_PREPROCESS_FUNCS += "llvm_sysroot_preprocess" - -llvm_sysroot_preprocess() { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} - mv ${LLVM_INSTALL_DIR}/llvm-config-host ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV} -} diff --git a/recipes/mesa/mesa_9.1.6.bbappend b/recipes/mesa/mesa_9.1.6.bbappend new file mode 100644 index 0000000..6c11709 --- /dev/null +++ b/recipes/mesa/mesa_9.1.6.bbappend @@ -0,0 +1,6 @@ +EGL_PLATFORMS = "fbdev" +PACKAGECONFIG = "egl gles dri gallium gallium-llvm gallium-egl" +GALLIUMDRIVERS_LLVM = "" +DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915" +DRIDRIVERS_append += "swrast" +EXTRA_OECONF += "--with-dri-drivers=""" -- cgit v1.2.3-54-g00ecf From 3fc81eb57eb65dd10aae9145ef7e431623617601 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 4 Feb 2014 13:54:58 +0200 Subject: Update copyright year to 2014 Change-Id: Ic3045b02350916c686cb1b011550c299ca082f06 Reviewed-by: Kalle Viironen --- README | 2 +- classes/image-hdd.bbclass | 2 +- classes/image_types_sdcard.bbclass | 2 +- conf/bblayers.conf.sample | 2 +- conf/distro/b2qt.conf | 2 +- conf/distro/include/am335x-evm.conf | 2 +- conf/distro/include/beagleboard.conf | 2 +- conf/distro/include/beaglebone.conf | 2 +- conf/distro/include/emulator.conf | 2 +- conf/distro/include/imx53qsb.conf | 2 +- conf/distro/include/nitrogen6x.conf | 2 +- conf/distro/include/raspberrypi.conf | 2 +- conf/layer.conf | 2 +- conf/local.conf.sample | 2 +- conf/machine/emulator.conf | 2 +- recipes/adbd/adbd.bb | 2 +- recipes/alsa/alsa-state.bbappend | 2 +- recipes/alsa/alsa-state/raspberrypi/asound.conf | 2 +- recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend | 2 +- recipes/base-files/base-files_3.0.14.bbappend | 2 +- recipes/hunspell/hunspell_1.3.2.bb | 2 +- recipes/images/b2qt-embedded-image.bb | 2 +- recipes/init-ifupdown/init-ifupdown_1.0.bbappend | 2 +- recipes/initscripts/initscripts_1.0.bbappend | 2 +- recipes/libgles/libgles-omap3_4.05.00.03.bbappend | 2 +- recipes/libgles/libgles-omap3_4.09.00.01.bbappend | 2 +- recipes/libgles/libgles-omap3_5.00.00.01.bbappend | 2 +- recipes/libgles/libgles-omap3_5.01.00.01.bbappend | 2 +- recipes/linux/linux-am335x-psp_3.2.bbappend | 2 +- recipes/linux/linux-boundary_3.0.35.bbappend | 2 +- recipes/linux/linux-mainline_3.2.bbappend | 2 +- recipes/linux/linux-yocto_3.10.bbappend | 2 +- recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb | 2 +- recipes/mkcard/mkcard_0.5.bb | 2 +- .../packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | 2 +- .../nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb | 2 +- recipes/psplash/psplash_git.bbappend | 2 +- recipes/u-boot/u-boot-am33x_2013.01.01.bbappend | 2 +- recipes/u-boot/u-boot-beagleboard_2011.09.bbappend | 2 +- recipes/u-boot/u-boot-script-boundary_git.bbappend | 2 +- recipes/u-boot/u-boot-ti-staging_2013.10.bbappend | 2 +- recipes/udev/udev_182.bbappend | 2 +- recipes/userland/userland_git.bbappend | 2 +- recipes/v86d/v86d_0.1.10.bbappend | 2 +- recipes/virtualbox/mount-vboxsf_4.2.14.bb | 2 +- recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) (limited to 'classes/image-hdd.bbclass') diff --git a/README b/README index eb529bf..ea8d774 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index fb59c20..8dac725 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass index 221ccd4..e562530 100644 --- a/classes/image_types_sdcard.bbclass +++ b/classes/image_types_sdcard.bbclass @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index 4e3fb71..5a95ec2 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 033ae54..cde0b02 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index b653d44..36f28d0 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index 0b6454f..a48ad21 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf index 528b41d..243532b 100644 --- a/conf/distro/include/beaglebone.conf +++ b/conf/distro/include/beaglebone.conf @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2013 Digia Plc +## Copyright (C) 2014 Digia Plc ## All rights reserved. ## For any questions to Digia, please use contact form at http://qt.digia.com ## diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index d3d5efd..b8a0c57 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index ca8595d..346f8c4 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index dbb9478..b761ddd 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 19b2fdd..8a72f7e 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/layer.conf b/conf/layer.conf index 952abcb..9a74df6 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/local.conf.sample b/conf/local.conf.sample index f64c0b8..a9e1b34 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf index f2628d5..14cce96 100644 --- a/conf/machine/emulator.conf +++ b/conf/machine/emulator.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb index 582305b..1feb7c3 100644 --- a/recipes/adbd/adbd.bb +++ b/recipes/adbd/adbd.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/alsa/alsa-state.bbappend b/recipes/alsa/alsa-state.bbappend index d1017c3..c9fba43 100644 --- a/recipes/alsa/alsa-state.bbappend +++ b/recipes/alsa/alsa-state.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/alsa/alsa-state/raspberrypi/asound.conf b/recipes/alsa/alsa-state/raspberrypi/asound.conf index 0d270a5..ef44416 100644 --- a/recipes/alsa/alsa-state/raspberrypi/asound.conf +++ b/recipes/alsa/alsa-state/raspberrypi/asound.conf @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend index 3c48097..9950930 100644 --- a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend +++ b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend index c276c57..4b8908a 100644 --- a/recipes/base-files/base-files_3.0.14.bbappend +++ b/recipes/base-files/base-files_3.0.14.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb index c9d6aba..6c7f400 100644 --- a/recipes/hunspell/hunspell_1.3.2.bb +++ b/recipes/hunspell/hunspell_1.3.2.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index e7811cc..a9ec3bf 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend index eb545f7..fee5390 100644 --- a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/initscripts/initscripts_1.0.bbappend b/recipes/initscripts/initscripts_1.0.bbappend index 9c159bc..8473b89 100644 --- a/recipes/initscripts/initscripts_1.0.bbappend +++ b/recipes/initscripts/initscripts_1.0.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend index 97bb2b3..2c689f1 100644 --- a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend +++ b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend index 5ef2e29..8ab3608 100644 --- a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend index 1398af0..efdfeca 100644 --- a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend index 17666cb..7edb38f 100644 --- a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/linux/linux-am335x-psp_3.2.bbappend b/recipes/linux/linux-am335x-psp_3.2.bbappend index c8f0f68..313111b 100644 --- a/recipes/linux/linux-am335x-psp_3.2.bbappend +++ b/recipes/linux/linux-am335x-psp_3.2.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.0.35.bbappend index fa0488a..610dc4d 100644 --- a/recipes/linux/linux-boundary_3.0.35.bbappend +++ b/recipes/linux/linux-boundary_3.0.35.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/linux/linux-mainline_3.2.bbappend b/recipes/linux/linux-mainline_3.2.bbappend index 6ca8c2e..4c2cb59 100644 --- a/recipes/linux/linux-mainline_3.2.bbappend +++ b/recipes/linux/linux-mainline_3.2.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/linux/linux-yocto_3.10.bbappend b/recipes/linux/linux-yocto_3.10.bbappend index 9cd7e69..2645cbc 100644 --- a/recipes/linux/linux-yocto_3.10.bbappend +++ b/recipes/linux/linux-yocto_3.10.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb index f9cded9..c0afb90 100644 --- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb +++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/mkcard/mkcard_0.5.bb b/recipes/mkcard/mkcard_0.5.bb index d1da05a..8d71f81 100644 --- a/recipes/mkcard/mkcard_0.5.bb +++ b/recipes/mkcard/mkcard_0.5.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index 7194f91..f32bac4 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb index 58bed38..4cdd404 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/psplash/psplash_git.bbappend b/recipes/psplash/psplash_git.bbappend index f9f3a6e..a5017cc 100644 --- a/recipes/psplash/psplash_git.bbappend +++ b/recipes/psplash/psplash_git.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend b/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend index bd00147..2b1c656 100644 --- a/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend +++ b/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend index 6d0e105..f6fbde1 100644 --- a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend +++ b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/u-boot/u-boot-script-boundary_git.bbappend b/recipes/u-boot/u-boot-script-boundary_git.bbappend index 3fc3b47..083b2fd 100644 --- a/recipes/u-boot/u-boot-script-boundary_git.bbappend +++ b/recipes/u-boot/u-boot-script-boundary_git.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend b/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend index 8caf0c5..bad928b 100644 --- a/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend +++ b/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/udev/udev_182.bbappend b/recipes/udev/udev_182.bbappend index 970f8fb..4cee6a2 100644 --- a/recipes/udev/udev_182.bbappend +++ b/recipes/udev/udev_182.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/userland/userland_git.bbappend b/recipes/userland/userland_git.bbappend index 0e748cd..c13c3a9 100644 --- a/recipes/userland/userland_git.bbappend +++ b/recipes/userland/userland_git.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/v86d/v86d_0.1.10.bbappend b/recipes/v86d/v86d_0.1.10.bbappend index e2a9b43..d551a9f 100644 --- a/recipes/v86d/v86d_0.1.10.bbappend +++ b/recipes/v86d/v86d_0.1.10.bbappend @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/virtualbox/mount-vboxsf_4.2.14.bb b/recipes/virtualbox/mount-vboxsf_4.2.14.bb index 656f379..4026d3a 100644 --- a/recipes/virtualbox/mount-vboxsf_4.2.14.bb +++ b/recipes/virtualbox/mount-vboxsf_4.2.14.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. diff --git a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb index 09358df..128cad0 100644 --- a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb +++ b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ## ## This file is part of the Qt Enterprise Embedded Scripts of the Qt ## framework. -- cgit v1.2.3-54-g00ecf From fd4b7ea9473e18060e61cff670f3cabfd074eae9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 12 Feb 2014 17:08:56 +0200 Subject: Fix emulator hdd image building Remove nostamp so that symbolic link is not updated, when boot-directdisk has not been updated. Otherwise we ended up with broken link. Change-Id: I27a51047e74861f034fbf3f15f9cf29fd20b142b Reviewed-by: Samuli Piippo --- classes/image-hdd.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'classes/image-hdd.bbclass') diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index 8dac725..46146b7 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -34,7 +34,9 @@ SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200" inherit image_types boot-directdisk create_hdd_image () { - ln -fs ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd + cd ${DEPLOY_DIR_IMAGE} + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd + ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd } python do_hddimg() { @@ -42,4 +44,3 @@ python do_hddimg() { } addtask hddimg after do_bootdirectdisk before do_build -do_hddimg[nostamp] = "1" -- cgit v1.2.3-54-g00ecf