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(-) (limited to 'conf') 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 (limited to 'conf') 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 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(+) (limited to 'conf') 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 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 (limited to 'conf') 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