From ac8f7194f2b5896084a813d298ed486b4f479c91 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 6 Mar 2014 15:34:10 +0200 Subject: mkcard: remove recipe for mkcard mkcard.sh script is moved to b2qt-build-scripts, so that deployment of images is not dependent on the toolchain. Task-number: QTEE-434 Change-Id: If7a93d4e8065c38a1d7205ce29d11ca8fbf8d2cf Reviewed-by: Rainer Keller --- recipes/mkcard/files/mkcard.sh | 62 ---------------------- recipes/mkcard/mkcard_0.5.bb | 36 ------------- ...dk-packagegroup-b2qt-embedded-toolchain-host.bb | 1 - 3 files changed, 99 deletions(-) delete mode 100755 recipes/mkcard/files/mkcard.sh delete mode 100644 recipes/mkcard/mkcard_0.5.bb diff --git a/recipes/mkcard/files/mkcard.sh b/recipes/mkcard/files/mkcard.sh deleted file mode 100755 index e75a176..0000000 --- a/recipes/mkcard/files/mkcard.sh +++ /dev/null @@ -1,62 +0,0 @@ -#! /bin/sh -# mkcard.sh v0.5 -# (c) Copyright 2009 Graeme Gregory -# Licensed under terms of GPLv2 -# -# Parts of the procudure base on the work of Denys Dmytriyenko -# http://wiki.omap.com/index.php/MMC_Boot_Format - -export LC_ALL=C - -if [ $# -ne 1 ]; then - echo "Usage: $0 " - exit 1; -fi - -DRIVE=$1 - -dd if=/dev/zero of=$DRIVE bs=1024 count=1024 - -SIZE=`fdisk -l $DRIVE | grep Disk | grep bytes | awk '{print $5}'` - -echo DISK SIZE - $SIZE bytes - -CYLINDERS=`echo $SIZE/255/63/512 | bc` - -echo CYLINDERS - $CYLINDERS - -{ -echo ,9,0x0C,* -echo ,,,- -} | sfdisk -D -H 255 -S 63 -C $CYLINDERS $DRIVE - -sleep 1 - -# handle various device names. -# note something like fdisk -l /dev/loop0 | egrep -E '^/dev' | cut -d' ' -f1 -# won't work due to https://bugzilla.redhat.com/show_bug.cgi?id=649572 - -PARTITION1=${DRIVE}1 -if [ ! -b ${PARTITION1} ]; then - PARTITION1=${DRIVE}p1 -fi - -PARTITION2=${DRIVE}2 -if [ ! -b ${PARTITION2} ]; then - PARTITION2=${DRIVE}p2 -fi - -# now make partitions. -if [ -b ${PARTITION1} ]; then - umount ${PARTITION1} - mkfs.vfat -F 32 -n "boot" ${PARTITION1} -else - echo "Cant find boot partition in /dev" -fi - -if [ -b ${PARITION2} ]; then - umount ${PARTITION2} - mke2fs -t ext3 -j -L "rootfs" ${PARTITION2} -else - echo "Cant find rootfs partition in /dev" -fi diff --git a/recipes/mkcard/mkcard_0.5.bb b/recipes/mkcard/mkcard_0.5.bb deleted file mode 100644 index 8d71f81..0000000 --- a/recipes/mkcard/mkcard_0.5.bb +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -DESCRIPTION = "mkcard.sh v0.5" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://${COREBASE}/bitbake/COPYING;md5=751419260aa954499f7abaabaa882bbe" -SECTION = "devel" -PR = "0" - -SRC_URI = "file://mkcard.sh" - -do_install () { - install -d ${D}${bindir}/ - install -m 0755 ${WORKDIR}/mkcard.sh ${D}${bindir}/ -} - -BBCLASSEXTEND = "nativesdk" diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index f32bac4..9c92438 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -28,7 +28,6 @@ LICENSE = "CLOSED" require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb RDEPENDS_${PN} = "\ - mkcard-nativesdk \ python-nativesdk \ python-subprocess-nativesdk \ " -- cgit v1.2.3-54-g00ecf From c778994a57be0698b8871183fe9dc51a85930ee6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 4 Mar 2014 12:17:44 +0200 Subject: Change from dylan to dora brach in README Change-Id: Ice674e12a893f217c61d68d0410e73e0dc2b6ee4 Reviewed-by: Samuli Piippo --- README | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index ea8d774..a2aa884 100644 --- a/README +++ b/README @@ -29,26 +29,26 @@ OpenEmbedded and Yocto. This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: dylan +branch: dora revision: HEAD URI: git://git.openembedded.org/meta-openembedded layer: meta-oe -branch: dylan +branch: dora revision: HEAD URI: git://git.yoctoproject.org/meta-ti -branch: dylan +branch: dora revision: HEAD URI: git://git.yoctoproject.org/meta-fsl-arm -branch: dylan +branch: dora revision: HEAD URI: git://github.com/Freescale/meta-fsl-arm-extra.git -branch: dylan +branch: dora revision: HEAD URI: git://git.yoctoproject.org/meta-raspberrypi -branch: dylan +branch: dora revision: HEAD -- cgit v1.2.3-54-g00ecf From 4157f4331347813136b6f4276f11ddd917903733 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 4 Mar 2014 15:30:55 +0200 Subject: Create only tar.gz image type Change-Id: Ie68be23a897483e722d03d154514f5678321570b Reviewed-by: Samuli Piippo --- conf/distro/include/beagleboard.conf | 10 +--------- conf/distro/include/nitrogen6x.conf | 5 +---- conf/distro/include/raspberrypi.conf | 2 +- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index dab0c5a..829b4fa 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf @@ -20,15 +20,7 @@ ## ############################################################################# -IMAGE_CLASSES += "image_types_sdcard" -IMAGE_FSTYPES = "tar.gz ext3 sdcard" - -BOOT_SCRIPTS = "\ - u-boot-${MACHINE}.img:u-boot.img \ - MLO-${MACHINE}:MLO \ - " -SDCARD_GENERATION_COMMAND = "generate_imx_sdcard" -UBOOT_SUFFIX = "img" +IMAGE_FSTYPES = "tar.gz" PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index b761ddd..5f6df70 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -20,10 +20,7 @@ ## ############################################################################# -IMAGE_CLASSES += "image_types_sdcard" -IMAGE_FSTYPES = "tar.gz ext3 sdcard" - -BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript" +IMAGE_FSTYPES = "tar.gz" MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 97513a8..12f1033 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -20,7 +20,7 @@ ## ############################################################################# -IMAGE_FSTYPES = "tar.gz ext3 rpi-sdimg" +IMAGE_FSTYPES = "tar.gz" PREFERRED_PROVIDER_virtual/libgles1 = "userland" -- cgit v1.2.3-54-g00ecf From 0975201e0a0e09ec878b210aa461949a3da9c32e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 4 Mar 2014 11:58:10 +0200 Subject: use package groups for image content Move installed packages from image recipe to separate package group recipes Change-Id: I0417953da4bc92438b3201b38b43f6d1784f1f17 Reviewed-by: Samuli Piippo --- conf/distro/b2qt.conf | 1 + recipes/images/b2qt-embedded-image.bb | 50 ++-------------------- .../packagegroup-b2qt-embedded-base.bb | 48 +++++++++++++++++++++ .../packagegroup-b2qt-embedded-gstreamer.bb | 42 ++++++++++++++++++ .../packagegroup-b2qt-embedded-tools.bb | 33 ++++++++++++++ 5 files changed, 128 insertions(+), 46 deletions(-) create mode 100644 recipes/packagegroup/packagegroup-b2qt-embedded-base.bb create mode 100644 recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb create mode 100644 recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index cde0b02..baaf998 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -46,3 +46,4 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" +MACHINE_EXTRA_INSTALL ?= "" diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index a9ec3bf..4b492cd 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -34,50 +34,8 @@ IMAGE_FEATURES += "\ inherit core-image -EXTRA_IMAGEDEPENDS_mx6 += "u-boot-script-boundary" - -MACHINE_EXTRA_INSTALL ?= "" - -GSTREAMER_EXTRA_INSTALL = "\ - gst-meta-video \ - gst-meta-audio \ - gst-plugins-good \ - gst-plugins-base-app \ - gst-plugins-good-videofilter \ - gst-plugins-good-id3demux \ - gst-plugins-good-auparse \ - gst-plugins-good-isomp4 \ - gst-plugins-ugly-rmdemux \ - gst-plugins-ugly-asf \ - gst-plugins-ugly-a52dec \ - gst-ffmpeg \ - " - -TOOLS_EXTRA_INSTALL = "\ - adbd \ - ldd \ - binutils \ - binutils-symlinks \ - " - IMAGE_INSTALL += "\ - kernel-modules \ - psplash \ - openssh-sftp-server \ - openssl \ - libpng \ - jpeg \ - tiff \ - libxslt \ - icu \ - freetype \ - fontconfig \ - liberation-fonts \ - tslib \ - tslib-calibrate \ - alsa-utils-amixer \ - hunspell \ - ${GSTREAMER_EXTRA_INSTALL} \ - ${TOOLS_EXTRA_INSTALL} \ - ${MACHINE_EXTRA_INSTALL} \ - " + packagegroup-b2qt-embedded-base \ + packagegroup-b2qt-embedded-tools \ + packagegroup-b2qt-embedded-gstreamer \ + " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb new file mode 100644 index 0000000..f518430 --- /dev/null +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -0,0 +1,48 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Packagegroup for B2Qt embedded Linux image" +LICENSE = "CLOSED" +PR = "r0" + +inherit packagegroup + +RDEPENDS_${PN} = "\ + kernel-modules \ + adbd \ + psplash \ + openssh-sftp-server \ + openssl \ + libpng \ + jpeg \ + tiff \ + libxslt \ + icu \ + freetype \ + fontconfig \ + liberation-fonts \ + tslib \ + tslib-calibrate \ + alsa-utils-amixer \ + hunspell \ + ${MACHINE_EXTRA_INSTALL} \ + " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb new file mode 100644 index 0000000..f6a8a54 --- /dev/null +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb @@ -0,0 +1,42 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Additional gstreamer packagegroup for B2Qt embedded Linux image" +LICENSE = "CLOSED" +PR = "r0" + +inherit packagegroup + +RDEPENDS_${PN} = "\ + gst-meta-video \ + gst-meta-audio \ + gst-plugins-good \ + gst-plugins-base-app \ + gst-plugins-good-videofilter \ + gst-plugins-good-id3demux \ + gst-plugins-good-auparse \ + gst-plugins-good-isomp4 \ + gst-plugins-ugly-rmdemux \ + gst-plugins-ugly-asf \ + gst-plugins-ugly-a52dec \ + gst-ffmpeg \ + " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb new file mode 100644 index 0000000..61ca211 --- /dev/null +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb @@ -0,0 +1,33 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Additional tools packagegroup for B2Qt embedded Linux image" +LICENSE = "CLOSED" +PR = "r0" + +inherit packagegroup + +RDEPENDS_${PN} = "\ + ldd \ + binutils \ + binutils-symlinks \ + " -- cgit v1.2.3-54-g00ecf From d469a7df484e1916a25d566d53f2d733ae6edbb1 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 12 Mar 2014 14:01:21 +0200 Subject: adbd: make switching between usb and ethernet easier Using settings in /etc/default/adbd, user can easily switch between usb and ethernet connection for the adbd. Task-number: QTEE-172 Change-Id: I8652f85878983d0bc9b9139cee6af874b8207fce Reviewed-by: Rainer Keller --- recipes/adbd/adbd.bb | 6 +++++- recipes/adbd/files/adb-init | 26 ++++++++++++++------------ recipes/adbd/files/defaults | 4 ++++ recipes/adbd/files/emulator/adb-init | 21 --------------------- recipes/adbd/files/emulator/defaults | 4 ++++ recipes/adbd/files/raspberrypi/adb-init | 21 --------------------- recipes/adbd/files/raspberrypi/defaults | 4 ++++ 7 files changed, 31 insertions(+), 55 deletions(-) create mode 100644 recipes/adbd/files/defaults delete mode 100755 recipes/adbd/files/emulator/adb-init create mode 100644 recipes/adbd/files/emulator/defaults delete mode 100644 recipes/adbd/files/raspberrypi/adb-init create mode 100644 recipes/adbd/files/raspberrypi/defaults diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb index 1feb7c3..9e3ed67 100644 --- a/recipes/adbd/adbd.bb +++ b/recipes/adbd/adbd.bb @@ -36,6 +36,7 @@ SRC_URI = "git://android.googlesource.com/platform/system/core;protocol=https \ file://adbd.patch;striplevel=2 \ file://Makefile.adbd \ file://adb-init \ + file://defaults \ " S = "${WORKDIR}/git/adb" @@ -44,7 +45,7 @@ FILES_${PN} += "${bindir}/adbd" do_configure() { if [ -n "${ADB_PRODUCTID}" ]; then - sed -i -e 's/PRODUCT=.*/PRODUCT=${ADB_PRODUCTID}/' ${WORKDIR}/adb-init + sed -i -e 's/PRODUCT=.*/PRODUCT=${ADB_PRODUCTID}/' ${WORKDIR}/defaults fi } @@ -58,6 +59,9 @@ do_install() { install -m 0755 -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/adb-init ${D}${sysconfdir}/init.d/ + + install -m 0755 -d ${D}${sysconfdir}/default + install -m 0755 ${WORKDIR}/defaults ${D}${sysconfdir}/default/adbd } INITSCRIPT_NAME = "adb-init" diff --git a/recipes/adbd/files/adb-init b/recipes/adbd/files/adb-init index 6faed60..92500d7 100755 --- a/recipes/adbd/files/adb-init +++ b/recipes/adbd/files/adb-init @@ -2,25 +2,27 @@ DAEMON=/usr/bin/adbd -VENDOR=0x18d1 -PRODUCT=0x0000 -SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address) +. /etc/default/adbd case "$1" in start) - modprobe g_ffs idVendor=${VENDOR} idProduct=${PRODUCT} iSerialNumber=${SERIAL} - mkdir -p /dev/usb-ffs - chmod 770 /dev/usb-ffs - mkdir -p /dev/usb-ffs/adb - chmod 770 /dev/usb-ffs/adb - mount -t functionfs adb /dev/usb-ffs/adb -o uid=0,gid=0 + if [ "$USE_ETHERNET" = "no" ]; then + modprobe g_ffs idVendor=${VENDOR} idProduct=${PRODUCT} iSerialNumber=${SERIAL} + mkdir -p /dev/usb-ffs + chmod 770 /dev/usb-ffs + mkdir -p /dev/usb-ffs/adb + chmod 770 /dev/usb-ffs/adb + mount -t functionfs adb /dev/usb-ffs/adb -o uid=0,gid=0 + fi start-stop-daemon --start --quiet --exec $DAEMON & ;; stop) start-stop-daemon --stop --quiet --exec $DAEMON - sleep 1 - umount /dev/usb-ffs/adb - rmmod g_ffs + if [ "$USE_ETHERNET" = "no" ]; then + sleep 1 + umount /dev/usb-ffs/adb + rmmod g_ffs + fi ;; restart) start-stop-daemon --stop --quiet --exec $DAEMON diff --git a/recipes/adbd/files/defaults b/recipes/adbd/files/defaults new file mode 100644 index 0000000..d2a3cc0 --- /dev/null +++ b/recipes/adbd/files/defaults @@ -0,0 +1,4 @@ +VENDOR=0x18d1 +PRODUCT=0x0000 +SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address) +USE_ETHERNET=no diff --git a/recipes/adbd/files/emulator/adb-init b/recipes/adbd/files/emulator/adb-init deleted file mode 100755 index 8910e0e..0000000 --- a/recipes/adbd/files/emulator/adb-init +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -DAEMON=/usr/bin/adbd - -case "$1" in -start) - start-stop-daemon --start --quiet --exec $DAEMON & - ;; -stop) - start-stop-daemon --stop --quiet --exec $DAEMON - ;; -restart) - start-stop-daemon --stop --quiet --exec $DAEMON - sleep 1 - start-stop-daemon --start --quiet --exec $DAEMON & - ;; -*) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac -exit 0 diff --git a/recipes/adbd/files/emulator/defaults b/recipes/adbd/files/emulator/defaults new file mode 100644 index 0000000..0fbba4c --- /dev/null +++ b/recipes/adbd/files/emulator/defaults @@ -0,0 +1,4 @@ +VENDOR=0x18d1 +PRODUCT=0x0000 +SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address) +USE_ETHERNET=yes diff --git a/recipes/adbd/files/raspberrypi/adb-init b/recipes/adbd/files/raspberrypi/adb-init deleted file mode 100644 index 8910e0e..0000000 --- a/recipes/adbd/files/raspberrypi/adb-init +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -DAEMON=/usr/bin/adbd - -case "$1" in -start) - start-stop-daemon --start --quiet --exec $DAEMON & - ;; -stop) - start-stop-daemon --stop --quiet --exec $DAEMON - ;; -restart) - start-stop-daemon --stop --quiet --exec $DAEMON - sleep 1 - start-stop-daemon --start --quiet --exec $DAEMON & - ;; -*) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac -exit 0 diff --git a/recipes/adbd/files/raspberrypi/defaults b/recipes/adbd/files/raspberrypi/defaults new file mode 100644 index 0000000..0fbba4c --- /dev/null +++ b/recipes/adbd/files/raspberrypi/defaults @@ -0,0 +1,4 @@ +VENDOR=0x18d1 +PRODUCT=0x0000 +SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address) +USE_ETHERNET=yes -- cgit v1.2.3-54-g00ecf From 16dc6ca0c306026a5a2d363c7814d4d11c16dce3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 4 Mar 2014 15:13:17 +0200 Subject: Include licenses to the image This packages licenses for all use packages and installs them to the image. Also the license manifest it copied to /usr/share/licenses Task-number: QTEE-190 Change-Id: I1c8cbf2c9534a49043cb40b7e5941a749dd2af2c Reviewed-by: Andy Nichols --- conf/distro/b2qt.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index baaf998..66ddcf1 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -47,3 +47,6 @@ COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudiopars COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" MACHINE_EXTRA_INSTALL ?= "" + +LICENSE_CREATE_PACKAGE = "1" +COPY_LIC_MANIFEST = "1" -- cgit v1.2.3-54-g00ecf From 56a59094a1bbb5d87bb2a229d452e22121c7fcab Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 18 Mar 2014 13:43:18 +0200 Subject: sdk: libcap is required for QtWebEngine Task-number: QTEE-448 Change-Id: If90c21aa917c2742ed6ac28c141b89bc65b0a937 Reviewed-by: Andy Nichols --- .../nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb index 4cdd404..5530f54 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb @@ -47,5 +47,6 @@ RDEPENDS_${PN} += "\ udev-dev \ tslib-dev \ hunspell-dev \ + libcap-dev \ ${MACHINE_EXTRA_INSTALL_SDK} \ " -- cgit v1.2.3-54-g00ecf From dddf81fe7fb993666d8ea4c9f5e3f84593f188bc Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 18 Mar 2014 13:46:54 +0200 Subject: adbd: use network connection in imx53qsb The USB connection in imx53qsb is not working correctly, so use network connection for adbd. Change-Id: I04ed29db169a16195d840f7180b9f2eab45c185e Reviewed-by: Andy Nichols --- recipes/adbd/files/imx53qsb/defaults | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 recipes/adbd/files/imx53qsb/defaults diff --git a/recipes/adbd/files/imx53qsb/defaults b/recipes/adbd/files/imx53qsb/defaults new file mode 100644 index 0000000..0fbba4c --- /dev/null +++ b/recipes/adbd/files/imx53qsb/defaults @@ -0,0 +1,4 @@ +VENDOR=0x18d1 +PRODUCT=0x0000 +SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address) +USE_ETHERNET=yes -- cgit v1.2.3-54-g00ecf From ac491beed785edeea0e8ae3d883864ab521da6b0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 18 Mar 2014 14:04:10 +0200 Subject: image: include CA certificates to image The package includes PEM files of CA certificates to allow SSL-based applications to check for the authenticity of SSL connections. It includes, among others, certificate authorities used by the Debian infrastructure and those shipped with Mozilla's browsers. Task-number: QTEE-447 Change-Id: Ib5c5d8bd13618ff97116c2d8a5952fa49a4f16a9 Reviewed-by: Andy Nichols --- recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index f518430..0942a7e 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -44,5 +44,6 @@ RDEPENDS_${PN} = "\ tslib-calibrate \ alsa-utils-amixer \ hunspell \ + ca-certificates \ ${MACHINE_EXTRA_INSTALL} \ " -- cgit v1.2.3-54-g00ecf From 13c0a0c319524012c2b6cc7aa92d6b5f487d4d58 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 25 Mar 2014 13:41:19 +0200 Subject: Create boot.tar.gz as part of the image build Each machine config defines what is included in the boot.tar.gz package. For beaglebone, include the uEnv.txt u-boot script that is used to start up the device. Change-Id: Ia509dd61c789fda53889cea8ea9221cfa8b469a9 Reviewed-by: Andy Nichols --- classes/bootfs-image.bbclass | 51 ++++++++++++++++++++++++++++++ conf/distro/include/am335x-evm.conf | 6 ++++ conf/distro/include/beagleboard.conf | 6 ++++ conf/distro/include/beaglebone.conf | 9 ++++++ conf/distro/include/imx53qsb.conf | 6 ++++ conf/distro/include/nitrogen6x.conf | 9 ++++++ conf/distro/include/raspberrypi.conf | 6 ++++ recipes/images/b2qt-embedded-image.bb | 1 + recipes/u-boot/u-boot-uenv-script.bb | 49 ++++++++++++++++++++++++++++ recipes/u-boot/u-boot-uenv-script/uEnv.txt | 3 ++ 10 files changed, 146 insertions(+) create mode 100644 classes/bootfs-image.bbclass create mode 100644 recipes/u-boot/u-boot-uenv-script.bb create mode 100644 recipes/u-boot/u-boot-uenv-script/uEnv.txt diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass new file mode 100644 index 0000000..9218bd3 --- /dev/null +++ b/classes/bootfs-image.bbclass @@ -0,0 +1,51 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +BOOTFS_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}-${DATETIME}" +BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}" + +BOOTFS_DEPENDS ?= "" + +do_bootfs () { + if [ -n ${BOOTFS_CONTENT} ]; then + exit 0 + fi + + mkdir -p ${S}/bootfs + + for item in ${BOOTFS_CONTENT}; do + src=`echo $item | awk -F':' '{ print $1 }'` + dst=`echo $item | awk -F':' '{ print $2 }'` + + install -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/bootfs/$dst + done + + cd ${S}/bootfs + rm -f ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz + + tar czvf ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz . + ln -s ${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz +} + +addtask bootfs before do_rootfs + +do_bootfs[depends] += "${BOOTFS_DEPENDS}" diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index 5799db7..6772a2a 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf @@ -22,6 +22,12 @@ IMAGE_FSTYPES = "tar.gz" +BOOTFS_CONTENT = "\ + u-boot-${MACHINE}.img:u-boot.img \ + MLO-${MACHINE}:MLO \ + " +BOOTFS_DEPENDS = "u-boot:do_deploy" + PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index 829b4fa..dab9c68 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf @@ -22,6 +22,12 @@ IMAGE_FSTYPES = "tar.gz" +BOOTFS_CONTENT = "\ + u-boot-${MACHINE}.img:u-boot.img \ + MLO-${MACHINE}:MLO \ + " +BOOTFS_DEPENDS = "u-boot:do_deploy" + PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf index ba13aaa..376e3c6 100644 --- a/conf/distro/include/beaglebone.conf +++ b/conf/distro/include/beaglebone.conf @@ -17,6 +17,15 @@ ############################################################################ IMAGE_FSTYPES = "tar.gz" +BOOTFS_CONTENT = "\ + u-boot-${MACHINE}.img:u-boot.img \ + MLO-${MACHINE}:MLO \ + uEnv-${MACHINE}.txt:uEnv.txt \ + " +BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-uenv-script:do_deploy" + +EXTRA_IMAGEDEPENDS += "u-boot-uenv-script" + PREFERRED_VERSION_libgles-omap3 = "5.01.00.01" PREFERRED_VERSION_omap3-sgx-modules = "5.01.00.01" diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index d83f6b4..a7099a5 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf @@ -22,6 +22,12 @@ IMAGE_FSTYPES = "tar.gz" +BOOTFS_CONTENT = "\ + u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \ + ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ + " +BOOTFS_DEPENDS = "u-boot:do_deploy" + MACHINE_EXTRA_INSTALL = "\ amd-gpu-bin-mx51 \ " diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 5f6df70..2a64026 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -22,6 +22,15 @@ IMAGE_FSTYPES = "tar.gz" +BOOTFS_CONTENT = "\ + ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ + 6x_bootscript-${MACHINE}:6x_bootscript \ + 6x_upgrade-${MACHINE}:6x_upgrade \ + " +BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy" + +EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" + MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 12f1033..61cebb4 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -22,6 +22,12 @@ IMAGE_FSTYPES = "tar.gz" +BOOTFS_CONTENT = "\ + bcm2835-bootfiles/*: \ + ${KERNEL_IMAGETYPE}:kernel.img \ + " +BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy" + PREFERRED_PROVIDER_virtual/libgles1 = "userland" MACHINE_EXTRA_INSTALL = "\ diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index 4b492cd..8daffbd 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -33,6 +33,7 @@ IMAGE_FEATURES += "\ " inherit core-image +inherit bootfs-image IMAGE_INSTALL += "\ packagegroup-b2qt-embedded-base \ diff --git a/recipes/u-boot/u-boot-uenv-script.bb b/recipes/u-boot/u-boot-uenv-script.bb new file mode 100644 index 0000000..b15dd1f --- /dev/null +++ b/recipes/u-boot/u-boot-uenv-script.bb @@ -0,0 +1,49 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "U-Boot script to start up BeagleBone Black" +LICENSE = "CLOSED" +PR = "r0" + +COMPATIBLE_MACHINE = "(beaglebone)" +PV = "20140225" + +SRC_URI = "file://uEnv.txt" + +inherit deploy + +do_deploy () { + install -d ${DEPLOYDIR} + install ${WORKDIR}/uEnv.txt ${DEPLOYDIR}/uEnv-${MACHINE}-${PV}-${PR}.txt + + cd ${DEPLOYDIR} + rm -f uEnv-${MACHINE}.txt + ln -sf uEnv-${MACHINE}-${PV}-${PR}.txt uEnv-${MACHINE}.txt +} + +addtask deploy after do_install before do_build + +do_compile[noexec] = "1" +do_install[noexec] = "1" +do_populate_sysroot[noexec] = "1" + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes/u-boot/u-boot-uenv-script/uEnv.txt b/recipes/u-boot/u-boot-uenv-script/uEnv.txt new file mode 100644 index 0000000..f8385a4 --- /dev/null +++ b/recipes/u-boot/u-boot-uenv-script/uEnv.txt @@ -0,0 +1,3 @@ +bootfile=zImage +optargs=consoleblank=0 vt.global_cursor_default=0 +mmcboot=echo Booting from mmc ...; run mmcargs; bootz ${kloadaddr} - ${fdtaddr} -- cgit v1.2.3-54-g00ecf From 6be3714f9464ccc9129662e9bbf3eb04c70990e7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 27 Mar 2014 15:57:04 +0200 Subject: sdk: include bluez4-dev package to sdk Bluez was already include in the image, but need to add dev package to sdk so QtConnectivity/Bluetooth can use it. Task-number: QTEE-458 Change-Id: I128bcc9c63b88e52a71089d11e37d20efbeabdeb Reviewed-by: Andy Nichols --- .../nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb index 5530f54..9260495 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb @@ -48,5 +48,6 @@ RDEPENDS_${PN} += "\ tslib-dev \ hunspell-dev \ libcap-dev \ + ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \ ${MACHINE_EXTRA_INSTALL_SDK} \ " -- cgit v1.2.3-54-g00ecf From cadcb919c9cb71cfe994f9924bc3ddec0890fc99 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 28 Mar 2014 10:01:58 +0200 Subject: bootfs: need to use fakeroot for tar'ing Unpacking the boot.tar.gz file using sudo caused error: "Cannot change ownership to uid 1000, gid 1000: Operation not permitted" Now using fakeroot to not record my uid to the files. Change-Id: I1a953e5e363a0d9fbb914cfa8837d888421d8e14 Reviewed-by: Samuli Piippo --- classes/bootfs-image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass index 9218bd3..5292965 100644 --- a/classes/bootfs-image.bbclass +++ b/classes/bootfs-image.bbclass @@ -25,7 +25,7 @@ BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}" BOOTFS_DEPENDS ?= "" -do_bootfs () { +fakeroot do_bootfs () { if [ -n ${BOOTFS_CONTENT} ]; then exit 0 fi -- cgit v1.2.3-54-g00ecf From 03be9b83d45659d0d98fa1bf69853e0aa297ed32 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 31 Mar 2014 15:48:02 +0300 Subject: wpa-supplicant: include headers and sources for external usage Needed sources and headers are included in -dev packages, and that is included in the sdk. Task-number: QTEE-451 Change-Id: Ieb5978000856a7c2780102ab751c09e7fe2a01f8 Reviewed-by: Andy Nichols Reviewed-by: Gatis Paeglis --- ...esdk-packagegroup-b2qt-embedded-toolchain-target.bb | 1 + recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb index 9260495..457ea56 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb @@ -48,6 +48,7 @@ RDEPENDS_${PN} += "\ tslib-dev \ hunspell-dev \ libcap-dev \ + wpa-supplicant-dev \ ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \ ${MACHINE_EXTRA_INSTALL_SDK} \ " diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend b/recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend new file mode 100644 index 0000000..9a200b2 --- /dev/null +++ b/recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend @@ -0,0 +1,18 @@ +do_install_append () { + install -d ${D}${includedir}/wpa-supplicant + + install -m 0644 ${S}/src/common/wpa_ctrl.c ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}/wpa-supplicant/ + + install -m 0644 ${S}/src/utils/build_config.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/common.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/includes.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/os.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/os_unix.c ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/trace.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/wpa_debug.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/wpabuf.h ${D}${includedir}/wpa-supplicant/ +} + +FILES_${PN}-dev += "${includedir}/wpa-supplicant/*" + -- cgit v1.2.3-54-g00ecf