summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorKalle Viironen <kalle.viironen@digia.com>2014-05-26 13:54:08 +0300
committerKalle Viironen <kalle.viironen@digia.com>2014-05-26 13:54:14 +0300
commit24cb0946765e299d4553ab5fa2a37afcac1ea242 (patch)
tree059b678bd52fb3c49841f585054517673ce4e288 /classes
parentbfb97bc3cc517c42647f5f8b1308bb7b1f4c76f1 (diff)
parent2ab3d7fc456ece32ab23e1909ea0d865955f29d9 (diff)
downloadmeta-boot2qt-QtEE_v3.0.0.tar.gz
Merge branch 'stable' into releaseQtEE_v3.0.0
* stable: (25 commits) blacklist evbug kernel module ca-certificates: enable c_rehash in update-ca-certificates openssl: make sure c_rehash is included in the image emulator: include mesa back to the image mesa: include gles development files in sdk sabre: updated kernel arguments imx6: kernel update for nitrogen6x mesa: remove from emulator image Include support for Freescale SABRE SD (iMX6Q) sabresd: add function fs support to sabresd kernel gstreamer: include icydemuxer needed for internet radios libsdl: disable dependency to libglu linux-yocto: upstream version has changed wpa-supplicant: upstream version has changed gpu-viv-bin-mx6q: upstream version has changed busybox: upstream version has changed nitrogen6x: use preferred version for kernel libgles: inhibit QA error for files already being stripped Update used branch to daisy Move to version 1.6 ... Change-Id: Ie81ed17be1096dbb37b1e5f023aa4eba846ca0fe
Diffstat (limited to 'classes')
-rw-r--r--classes/bootfs-image.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass
index 5292965..cbb6c4c 100644
--- a/classes/bootfs-image.bbclass
+++ b/classes/bootfs-image.bbclass
@@ -26,7 +26,7 @@ BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}"
26BOOTFS_DEPENDS ?= "" 26BOOTFS_DEPENDS ?= ""
27 27
28fakeroot do_bootfs () { 28fakeroot do_bootfs () {
29 if [ -n ${BOOTFS_CONTENT} ]; then 29 if [ -z "${BOOTFS_CONTENT}" ]; then
30 exit 0 30 exit 0
31 fi 31 fi
32 32