From 8a0e5054405ef7555c36c510b68470991efc5d27 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Tue, 15 Sep 2015 15:07:01 +0200 Subject: Fix font file access rights Change-Id: Icce6d75d639191793e11639195a5c9d2e2b05a4e Reviewed-by: Samuli Piippo --- recipes/fonts/otf-noto.bb | 2 +- recipes/fonts/ttf-devanagari_2.94.0.bb | 4 ++-- recipes/fonts/ttf-opensans.bb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb index c207535..a2aaede 100644 --- a/recipes/fonts/otf-noto.bb +++ b/recipes/fonts/otf-noto.bb @@ -16,7 +16,7 @@ SRC_URI[md5sum] = "dc40e8af0b0178451ccc301f1d41e726" SRC_URI[sha256sum] = "25143bb803ebb20fd17ffd1299012ee2f3a929182ff0700ab656c181872413a4" do_install() { - install -m 0644 -d ${D}${datadir}/fonts/otf/noto + install -m 0755 -d ${D}${datadir}/fonts/otf/noto install -m 0644 ${WORKDIR}/*.otf ${D}${datadir}/fonts/otf/noto } diff --git a/recipes/fonts/ttf-devanagari_2.94.0.bb b/recipes/fonts/ttf-devanagari_2.94.0.bb index 69e66c8..f945c82 100644 --- a/recipes/fonts/ttf-devanagari_2.94.0.bb +++ b/recipes/fonts/ttf-devanagari_2.94.0.bb @@ -14,8 +14,8 @@ SRC_URI[md5sum] = "57527ee536a18b443cf786d4b8fd5ec8" SRC_URI[sha256sum] = "a6618aeb1d25df46d3c22e528c38ea1d1147654e19904497a1e97f4684c55353" do_install() { - install -m 0644 -d ${D}${datadir}/fonts/truetype/lohit - install -m 0644 -d ${D}${sysconfdir}/fonts/conf.d/ + install -m 0755 -d ${D}${datadir}/fonts/truetype/lohit + install -m 0755 -d ${D}${sysconfdir}/fonts/conf.d/ install -m 0644 ${WORKDIR}/lohit-devanagari-ttf-${PV}/66-lohit-devanagari.conf ${D}${sysconfdir}/fonts/conf.d/ install -m 0644 ${WORKDIR}/lohit-devanagari-ttf-${PV}/Lohit-Devanagari.ttf ${D}${datadir}/fonts/truetype/lohit } diff --git a/recipes/fonts/ttf-opensans.bb b/recipes/fonts/ttf-opensans.bb index ad40b81..d115219 100644 --- a/recipes/fonts/ttf-opensans.bb +++ b/recipes/fonts/ttf-opensans.bb @@ -13,7 +13,7 @@ SRC_URI = "https://www.google.com/fonts/download?kit=3hvsV99qyKCBS55e5pvb3ltkqrI BB_STRICT_CHECKSUM = "" do_install() { - install -m 0644 -d ${D}${datadir}/fonts/truetype/opensans + install -m 0755 -d ${D}${datadir}/fonts/truetype/opensans install -m 0644 ${WORKDIR}/*.ttf ${D}${datadir}/fonts/truetype/opensans } -- cgit v1.2.3-54-g00ecf From 6cd6f2ce1961274873b1f8337139a3134d4179f5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 15 Sep 2015 15:50:27 +0300 Subject: b2qt-addons: update source revisions Change-Id: I52a45f4bc3b366b61c488d36e98f4aae772d5ea9 Reviewed-by: Teemu Holappa --- recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 4 ++-- recipes-qt/b2qt-addons/b2qt-demos.bb | 10 +++++----- recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb | 2 +- recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb | 2 +- recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb | 2 +- recipes-qt/b2qt-addons/b2qt-launcher.bb | 2 +- recipes-qt/b2qt-addons/b2qt-utils.bb | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index 6766978..ef7108f 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb @@ -31,8 +31,8 @@ SRC_URI = " \ file://appcontroller.conf \ " -SRCREV = "45d549fe274cd8f16578b2ff9a34af40fd9b98a9" -BRANCH = "dev" +SRCREV = "7ac47bee4c6bd55df8c0cad14ff11457fbf07158" +BRANCH = "5.5" S = "${WORKDIR}/git" diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 9ceab8c..21ceffc 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -33,12 +33,12 @@ SRC_URI = " \ git://code.qt.io/qt/qtquickcontrols.git;branch=${QT_BRANCH};protocol=git;name=qtquickcontrols;destsuffix=qtquickcontrols \ " -BRANCH = "dev" -QT_BRANCH = "5.5" -SRCREV_demos = "de50ff5dbf2f789786e25540ba0b0efc8c68e0f9" +BRANCH = "5.5" +QT_BRANCH = "5.5.1" +SRCREV_demos = "017d5d428688ca78220e073c393df27936545f14" SRCREV_everywhere = "6178748a6ea34df40a8e3c9ce67137e33383bb0e" -SRCREV_qtcanvas3d = "debe68a85b571b70e2fe0824e5ed40484a72c216" -SRCREV_qtquickcontrols = "b4dc4a98d5deffbbb30f7011f6c0d3d10f430b98" +SRCREV_qtcanvas3d = "e372a67c1bbdf695f8e550950a3dbf3106389479" +SRCREV_qtquickcontrols = "f770dbe9d38214a37e12adb591498dcd1ad0293e" S = "${WORKDIR}/git/basicsuite" diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb index e082735..15fe3c0 100644 --- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb +++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb @@ -31,7 +31,7 @@ SRC_URI = " \ file://emulatorproxyd.sh \ " -SRCREV = "1d001910d45349ae2a44fa01516baaa7ff4c9eda" +SRCREV = "89ca944fae7106a55803ddce6fd84447685b61e5" BRANCH = "master" S = "${WORKDIR}/git/src/helperlibs/proxy" diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb index d59ba2c..622363d 100644 --- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb +++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb @@ -31,7 +31,7 @@ SRC_URI = " \ file://sdcardmountd.sh \ " -SRCREV = "1d001910d45349ae2a44fa01516baaa7ff4c9eda" +SRCREV = "89ca944fae7106a55803ddce6fd84447685b61e5" BRANCH = "master" S = "${WORKDIR}/git/src/helperlibs/sdcarddaemon" diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb index dd5637f..221816e 100644 --- a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb +++ b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb @@ -30,7 +30,7 @@ SRC_URI = " \ git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ " -SRCREV = "1d001910d45349ae2a44fa01516baaa7ff4c9eda" +SRCREV = "89ca944fae7106a55803ddce6fd84447685b61e5" BRANCH = "master" EXTRA_QMAKEVARS_PRE += "CONFIG+=force_independent" diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index 7781031..98de916 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -32,7 +32,7 @@ SRC_URI = " \ " SRCREV = "e824e206f28eb20bcb6f1d9064990f5e927261f4" -BRANCH = "dev" +BRANCH = "5.5" S = "${WORKDIR}/git" diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb index e438587..81a5b60 100644 --- a/recipes-qt/b2qt-addons/b2qt-utils.bb +++ b/recipes-qt/b2qt-addons/b2qt-utils.bb @@ -30,8 +30,8 @@ SRC_URI = " \ git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-utils \ " -SRCREV = "602034c3a71c53d050e67101e070185cbcf7ccee" -BRANCH = "dev" +SRCREV = "ae6f34543b8336ad5a202916ee42a2d2bd00bfe7" +BRANCH = "5.5" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From fb9daa75f36127475f369271e221f7de0b0d07f6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 15 Sep 2015 16:14:10 +0300 Subject: qt5-addons: update source revisions Quick Compiler no longer needs license checker from qtsdk. qt5-module now includes more paths for VKB Change-Id: Ic1027b836157d7fb7fc6fdc90ece7a0354497230 Reviewed-by: aavit --- recipes-qt/qt5-addons/qtquick2drenderer.bb | 4 ++-- recipes-qt/qt5-addons/qtquickcompiler_3.0.bb | 11 ++++------- recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb | 10 +++------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/recipes-qt/qt5-addons/qtquick2drenderer.bb b/recipes-qt/qt5-addons/qtquick2drenderer.bb index 24aff5c..13b6b72 100644 --- a/recipes-qt/qt5-addons/qtquick2drenderer.bb +++ b/recipes-qt/qt5-addons/qtquick2drenderer.bb @@ -30,8 +30,8 @@ SRC_URI = " \ git://qt-gerrit.ci.local/QtRD-15810/scenegraph-raster.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtQuick2DRenderer/1.1/Src \ " -# v1.1 -SRCREV = "97c310f3a18a5aaebf8c102ceaba1f6a093faf6b" +# v1.1.1 +SRCREV = "d7de74d6e608fbbd36fc9abad27fa82d095cb692" BRANCH = "master" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb index 6f9fa30..9c3d43b 100644 --- a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb +++ b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb @@ -27,15 +27,12 @@ LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca inherit qt5-module SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;name=compiler;destsuffix=git \ - git://qt-gerrit.ci.local/QtRD-15810/qtsdk-enterprise.git;branch=${BRANCH};protocol=ssh;name=sdk;destsuffix=git/compiler/license-checker \ + git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;destsuffix=git \ " -SRCREV_compiler = "cc3b348065e84242d772d53b5f9dcad88b0da33e" -BRANCH_compiler = "3.0" - -SRCREV_sdk = "60cb1a7763b670108b17c7e1345394e424153bea" -BRANCH_sdk = "master" +# v3.0.0 +SRCREV = "7e29e55c8315cc5e944505f13c24893d0f54efeb" +BRANCH = "3.0" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb index 036a938..e1aa642 100644 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb @@ -30,16 +30,12 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qtvirtualkeyboard;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtVirtualKeyboard/1.3/Src \ " -# v1.3.0 -SRCREV = "ad517b66fc4aadb2807951f182552a1b161d9c95" -BRANCH = "master" +# v1.3.1 +SRCREV = "567e2c1d3df5a841160b2c24a390f153b25ad368" +BRANCH = "1.3" S = "${WORKDIR}/git" DEPENDS = "qtbase qtdeclarative hunspell" EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop" - -FILES_${PN}-qmlplugins-dbg = " \ - ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/VirtualKeyboard/Styles/.debug/* \ - " -- cgit v1.2.3-54-g00ecf From 4e4779902bfce0cbc4ea8055c2b5adb1a43887c0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 2 Sep 2015 11:36:04 +0300 Subject: qt5: use the new base bbclass to get qt.conf generated populate_sdk_qt5 was split into two bbclasses and the qt.conf generation we need is in the new base class. Change-Id: I7fe2f3bdc0bf88e795add996f58b592ea12aa8a3 Reviewed-by: aavit --- recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb index 45d3148..d92c277 100644 --- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb +++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb @@ -25,7 +25,7 @@ PR = "r0" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9" -inherit populate_sdk populate_sdk_qt5 qmake5_paths +inherit populate_sdk populate_sdk_qt5_base TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host" TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target" -- cgit v1.2.3-54-g00ecf From 1fc629a20dd675bf5e37e90cc2d60017f4e9ddce Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 16 Sep 2015 09:16:21 +0300 Subject: Use 5.5.1 branch for meta-qt5 5.5.1 branch has been rebased against upstream/master and updated to use Qt 5.5.1 Change-Id: Ib575be637b44500848210d6ccb8c5456d1d5200e Reviewed-by: aavit --- scripts/manifest_qt5.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest_qt5.xml b/scripts/manifest_qt5.xml index 69eb254..1e4f902 100644 --- a/scripts/manifest_qt5.xml +++ b/scripts/manifest_qt5.xml @@ -7,7 +7,7 @@ -- cgit v1.2.3-54-g00ecf From 2c230725cb4c6b3a37df9413a8ca4b6ad56d2583 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 16 Sep 2015 14:13:40 +0300 Subject: qt5: add workaround for gcc's internal compiler error Crosscompilation of qdoc causes gcc internal compiler error on some platforms. Removing the c++11 option from the compilation prevents this. Change-Id: I0ad5832859f8c79dba401ecc1d9026559a1ec324 Reviewed-by: aavit --- .../0001-qdoc-workaround-for-gcc-s-ICE.patch | 29 ++++++++++++++++++++++ recipes-qt/qt5/qtbase_%.bbappend | 1 + 2 files changed, 30 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch diff --git a/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch b/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch new file mode 100644 index 0000000..85e569f --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch @@ -0,0 +1,29 @@ +From 75840ad8b40068b70792a27f1fdc7cccf3d28f7c Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 16 Sep 2015 13:30:38 +0300 +Subject: [PATCH] qdoc: workaround for gcc's ICE + +Remove c++11 option from compilation to prevent gcc's internal compiler error: +in add_stores, at var-tracking.c:6000 + +Signed-off-by: Samuli Piippo +--- + src/tools/qdoc/qdoc.pro | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro +index f0df113..a847482 100644 +--- a/src/tools/qdoc/qdoc.pro ++++ b/src/tools/qdoc/qdoc.pro +@@ -4,6 +4,8 @@ + requires(!contains(QT_DISABLED_FEATURES, dom)) + } + ++QMAKE_CXXFLAGS_CXX11 = ++ + option(host_build) + QT = core xml + +-- +1.9.1 + diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend index 658e068..f29cb10 100644 --- a/recipes-qt/qt5/qtbase_%.bbappend +++ b/recipes-qt/qt5/qtbase_%.bbappend @@ -38,6 +38,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ file://oe-device-extra.pri \ + file://0001-qdoc-workaround-for-gcc-s-ICE.patch \ " do_configure_prepend() { -- cgit v1.2.3-54-g00ecf From 78ab1293ea81034fa60571074ca38b2133354d36 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 17 Sep 2015 11:42:14 +0300 Subject: otf-noto: update url and add correct license Google changed the download URL for the package. The package now includes license file, use it instead of generic Apache. Change-Id: Ib66c19281d30e12246503d5ea4d6e176d73286ca Reviewed-by: Teemu Holappa --- recipes/fonts/otf-noto.bb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb index a2aaede..fc26e1a 100644 --- a/recipes/fonts/otf-noto.bb +++ b/recipes/fonts/otf-noto.bb @@ -1,19 +1,18 @@ SUMMARY = "Noto Sans CJK" SECTION = "fonts" HOMEPAGE = "http://www.google.com/get/noto" -LICENSE = "Apache-2.0" -# see https://code.google.com/p/noto/issues/detail?id=331 -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE_CJK.txt;md5=55719faa0112708e946b820b24b14097" INHIBIT_DEFAULT_DEPS = "1" inherit allarch fontcache PV = "1.004" -SRC_URI = "http://www.google.com/get/noto/pkgs/NotoSansCJKSC-hinted.zip" +SRC_URI = "https://noto-website.storage.googleapis.com/pkgs/NotoSansCJKSC-hinted.zip" -SRC_URI[md5sum] = "dc40e8af0b0178451ccc301f1d41e726" -SRC_URI[sha256sum] = "25143bb803ebb20fd17ffd1299012ee2f3a929182ff0700ab656c181872413a4" +SRC_URI[md5sum] = "c0fa6153aa826ee96041ba4470a1f51f" +SRC_URI[sha256sum] = "31459f6d8c36a1136bec3f8d720b2b637e4dded681b7bb610186c9986be25848" do_install() { install -m 0755 -d ${D}${datadir}/fonts/otf/noto -- cgit v1.2.3-54-g00ecf From a3f443f1d7c721aa1df61e18da97276992e51665 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Fri, 21 Aug 2015 09:43:45 +0200 Subject: Add ostree, dracut and libgsystem recipes. Change-Id: I8fc3b7ec5f2ebeb82e31638037a2dd2e449da48c Reviewed-by: Andy Nichols --- conf/bblayers.conf.bbb.sample | 1 + conf/bblayers.conf.emulator.sample | 1 + conf/bblayers.conf.fsl.sample | 1 + conf/bblayers.conf.rpi.sample | 1 + conf/bblayers.conf.ti.sample | 1 + conf/bblayers.conf.tibidabo.sample | 1 + conf/bblayers.conf.toradex.sample | 1 + recipes/dracut/dracut_git.bbappend | 2 + recipes/libgsystem/libgsystem.bb | 41 ++++++++++++++++++ recipes/ostree/ostree.bb | 49 ++++++++++++++++++++++ .../packagegroup-b2qt-embedded-base.bb | 2 + .../packagegroup-b2qt-embedded-toolchain-target.bb | 1 + 12 files changed, 102 insertions(+) create mode 100644 recipes/dracut/dracut_git.bbappend create mode 100644 recipes/libgsystem/libgsystem.bb create mode 100644 recipes/ostree/ostree.bb diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample index e2d95d3..8a0007c 100644 --- a/conf/bblayers.conf.bbb.sample +++ b/conf/bblayers.conf.bbb.sample @@ -36,6 +36,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ + ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample index 1e65b47..dcc0a8f 100644 --- a/conf/bblayers.conf.emulator.sample +++ b/conf/bblayers.conf.emulator.sample @@ -34,6 +34,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ + ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample index 71c3a2f..5855b60 100644 --- a/conf/bblayers.conf.fsl.sample +++ b/conf/bblayers.conf.fsl.sample @@ -36,6 +36,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ + ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample index 2cee63a..03e1412 100644 --- a/conf/bblayers.conf.rpi.sample +++ b/conf/bblayers.conf.rpi.sample @@ -35,6 +35,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ + ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample index be4d670..d9f3d5d 100644 --- a/conf/bblayers.conf.ti.sample +++ b/conf/bblayers.conf.ti.sample @@ -35,6 +35,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ + ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample index e827ae3..4f6ddee 100644 --- a/conf/bblayers.conf.tibidabo.sample +++ b/conf/bblayers.conf.tibidabo.sample @@ -37,6 +37,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ + ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-b2qt \ ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample index e0a77f6..e551264 100644 --- a/conf/bblayers.conf.toradex.sample +++ b/conf/bblayers.conf.toradex.sample @@ -37,6 +37,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ + ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/recipes/dracut/dracut_git.bbappend b/recipes/dracut/dracut_git.bbappend new file mode 100644 index 0000000..479e407 --- /dev/null +++ b/recipes/dracut/dracut_git.bbappend @@ -0,0 +1,2 @@ +# Upstream recipe mistakenly depends on systemd, we remove that dependency here. +RDEPENDS_${PN}_remove = "systemd" diff --git a/recipes/libgsystem/libgsystem.bb b/recipes/libgsystem/libgsystem.bb new file mode 100644 index 0000000..d2d1a0b --- /dev/null +++ b/recipes/libgsystem/libgsystem.bb @@ -0,0 +1,41 @@ +############################################################################# +## +## Copyright (C) 2015 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://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +SUMMARY = "LibGSystem is a GIO-based library, targeted primarily for use by operating system components." + +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +inherit autotools pkgconfig + +SRC_URI = "gitsm://github.com/GNOME/libgsystem.git;tag=v2015.2;protocol=git" +S = "${WORKDIR}/git" + +DEPENDS = "glib-2.0 attr libcap" + +do_configure_prepend() { + # Workaround a broken configure.ac. It should check first if GTK_DOC_CHECK + # macro is actually defined before trying to use it. For how-to see: + # https://developer.gnome.org/gtk-doc-manual/stable/settingup_autoconf.html.en + # We get a syntax error since we do not bundle gnome recipes that define this macro. + sed -i '/GTK_DOC_CHECK/d' ${S}/configure.ac +} diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb new file mode 100644 index 0000000..1ba1504 --- /dev/null +++ b/recipes/ostree/ostree.bb @@ -0,0 +1,49 @@ +############################################################################# +## +## Copyright (C) 2015 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://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +SUMMARY = "Tool for managing bootable, immutable, versioned filesystem trees." + +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +inherit autotools pkgconfig + +SRC_URI = "git://github.com/GNOME/ostree.git;tag=v2015.7" +S = "${WORKDIR}/git" + +DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libgsystem libassuan xz" + +EXTRA_OECONF = "--with-dracut --without-selinux --without-libarchive --with-grub2=no --enable-gtk-doc-html=no" + +do_configure_prepend() { + cd ${S} + # Update submodules and workaround bugs. + env NOCONFIGURE=1 ./autogen.sh + cd - +} + +do_install_append() { + # Silence installed-vs-shipped error message. We provide our own dracut module. + # The only way to force OSTree to build necessary binaries is to pass "--with-dracut", + # this of course is a broken configure.ac logic. + rm -rf ${D}${libdir}/dracut/ +} diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index 82e801b..a2d9c72 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -60,6 +60,8 @@ RDEPENDS_${PN} = "\ tzdata-europe \ atk \ libevent \ + ostree \ + dracut \ ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ ${MACHINE_EXTRA_INSTALL} \ " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb index b31ea3f..59fa843 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb @@ -50,6 +50,7 @@ RDEPENDS_${PN} += "\ libpq-dev \ atk-dev \ libevent-dev \ + ostree-dev \ ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \ ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \ ${MACHINE_EXTRA_INSTALL_SDK} \ -- cgit v1.2.3-54-g00ecf From 8874262b25488d81bf9ee23f4d425a104f31a7e1 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 28 Sep 2015 10:12:01 +0300 Subject: Revert "toradex: move to V2.4 branch" This reverts commit 299aa675369abe4f1eae062bd4f468a006449033. Colibri VF kernel breaks with adb, revert back to older release. Change-Id: I3c933eb55b0fb03c5837fdbb4678c0a7f3b13df8 Reviewed-by: aavit --- conf/distro/include/colibri-imx6.conf | 3 +- ...-iMX6-set-1280x720-16-for-HDMI-by-default.patch | 32 ++++++++++++++++++ .../recipes/linux/linux-toradex-fsl_git.bbappend | 6 ++++ .../recipes/linux/linux-toradex-vf_3.18.bbappend | 34 +++++++++++++++++++ .../recipes/linux/linux-toradex-vf_4.%.bbappend | 34 ------------------- .../0001-Update-default-args-for-apalis-imx6.patch | 30 ++++++++--------- .../0001-colibri-vf-enable-sdboot-by-default.patch | 38 ++++++++++++++-------- scripts/manifest.xml | 2 +- scripts/manifest_dizzy.xml | 2 +- 9 files changed, 114 insertions(+), 67 deletions(-) create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend delete mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index fcf716a..f0b6179 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf @@ -27,8 +27,7 @@ KERNEL_IMAGETYPE = "uImage" BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ - ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \ - ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \ + ${KERNEL_IMAGETYPE}-${KERNEL_DEVICETREE}:${KERNEL_DEVICETREE} \ u-boot-${MACHINE}.imx:u-boot.imx \ " BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch b/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch new file mode 100644 index 0000000..719a38d --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch @@ -0,0 +1,32 @@ +From 7515eb259a380578540323be5d4913245e81c454 Mon Sep 17 00:00:00 2001 +From: Andy Nichols +Date: Mon, 13 Apr 2015 12:54:17 +0200 +Subject: [PATCH] Colibri-iMX6: set 1280x720@16 for HDMI by default + +--- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi +index e638266..dd8b21fc5 100644 +--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi ++++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi +@@ -70,12 +70,11 @@ + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "hdmi"; + interface_pix_fmt = "RGB24"; +- mode_str ="1920x1080M@60"; +-/* default_bpp = <16>;*/ +- default_bpp = <24>; ++ mode_str ="1280x729M@60"; ++ default_bpp = <16>; + int_clk = <0>; + late_init = <0>; +- status = "disabled"; ++ status = "okay"; + }; + + mxcfb2: fb@1 { +-- +2.3.5 + diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend index f739245..7c19d86 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend @@ -26,6 +26,12 @@ SRC_URI += "\ file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \ " +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch \ + " + # kernel image files are not needed in the image RDEPENDS_kernel-base = "" diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend new file mode 100644 index 0000000..fd9ad55 --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend @@ -0,0 +1,34 @@ +############################################################################# +## +## 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://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \ + " + +do_configure_prepend () { + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig + echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig +} diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend deleted file mode 100644 index fd9ad55..0000000 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend +++ /dev/null @@ -1,34 +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://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \ - " - -do_configure_prepend () { - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig - echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig -} diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch index 174f3b0..60c5171 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch @@ -1,4 +1,4 @@ -From 1d5baa56ff177d7858727d1c4428096781e3817c Mon Sep 17 00:00:00 2001 +From 7538ad166d0fb1999f32f2d80969184484c2ba07 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 27 Oct 2014 14:53:25 +0200 Subject: [PATCH] Update default args for apalis imx6 @@ -10,30 +10,30 @@ disable cursor blinking. 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index 162be2e..f659384 100644 +index 5d32118..289d611 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h -@@ -246,14 +246,14 @@ +@@ -212,14 +212,14 @@ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" #define SD_BOOTCMD \ - "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ - "rootwait\0" \ + "drive=2\0" \ - "sdboot=run setup; " \ + "sdboot=" "run setup; " \ - "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ + "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \ + "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \ "${vidargs}; echo Booting from SD card in 8bit slot...; " \ -- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ -+ "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \ +- "run sddtbload; fatload mmc 1:1 ${kernel_addr_r} " \ ++ "run sddtbload; fatload mmc ${drive}:1 ${kernel_addr_r} " \ "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \ -- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ -+ "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \ +- "sddtbload=setenv dtbparam; fatload mmc 1:1 ${fdt_addr_r} " \ ++ "sddtbload=setenv dtbparam; fatload mmc ${drive}:1 ${fdt_addr_r} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" - #define USB_BOOTCMD \ -@@ -273,7 +273,8 @@ + #ifndef CONFIG_APALIS_IMX6_V1_0 +@@ -229,7 +229,8 @@ #define FDT_FILE "imx6q-apalis-eval_v1_0.dtb" #endif #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -43,15 +43,15 @@ index 162be2e..f659384 100644 "run nfsboot ; echo ; echo nfsboot failed ; " \ "usb start ;" \ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ -@@ -292,7 +293,7 @@ - "|| setenv drive 2; load ${interface} ${drive}:1 " \ - "${kernel_addr_r} flash_blk.img\0" \ +@@ -242,7 +243,7 @@ + NFS_BOOTCMD \ + SD_BOOTCMD \ "setup=setenv setupargs fec_mac=${ethaddr} " \ - "consoleblank=0 no_console_suspend=1 console=tty1 " \ + "consoleblank=0 no_console_suspend=1 vt.global_cursor_default=0 " \ "console=${console},${baudrate}n8\0 " \ - "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \ - " source ${kernel_addr_r}\0" \ + "setupdate=setenv drive 1; fatload mmc ${drive}:1 ${kernel_addr_r} " \ + "flash_mmc.img || setenv drive 2; fatload mmc ${drive}:1 " \ -- 1.9.1 diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch index bae71d5..2e72ff6 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch @@ -1,35 +1,45 @@ -From 878f506e43f40c2667e9e5ae82741d32fc653cac Mon Sep 17 00:00:00 2001 +From a388755704c3f8c4336939f3c868942d68b1e256 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 28 May 2015 09:06:54 +0300 Subject: [PATCH] colibri vf: enable sdboot by default -Run sdboot first and remove console message from tty1 +Run sdboot first, update dtb file location to /boot/ and +remove console message from tty1 --- - include/configs/colibri_vf.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + include/configs/colibri_vf.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h -index 06caabd..fb9fe41 100644 +index feea159..b080510 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h -@@ -174,7 +174,7 @@ - "ubifsload ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \ - "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ +@@ -135,7 +135,7 @@ + "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \ + "run sddtbload; bootz ${kernel_addr_r} - ${dtbparam}\0" \ + "sddtbload=setenv dtbparam; load mmc 0:2 ${fdt_addr_r} " \ +- "${soc}-colibri-${fdt_board}.dtb && " \ ++ "/boot/${soc}-colibri-${fdt_board}.dtb && " \ + "setenv dtbparam ${fdt_addr_r}\0" + + #define NFS_BOOTCMD \ +@@ -160,7 +160,7 @@ + "/boot/${soc}-colibri-${fdt_board}.dtb && " \ + "setenv dtbparam ${fdt_addr_r}\0" -#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot" #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4" -@@ -187,7 +187,7 @@ +@@ -173,7 +173,7 @@ "defargs=\0" \ "console=ttyLP0\0" \ - "setup=setenv setupargs " \ -- "console=tty1 console=${console}" \ -+ "console=${console}" \ - ",${baudrate}n8 ${memargs} consoleblank=0\0" \ - "setsdupdate=mmc rescan && setenv interface mmc && " \ + "setup=setenv setupargs fec_mac=${ethaddr} consoleblank=0 " \ +- "console=tty1 console=${console},${baudrate}n8 ${memargs}\0" \ ++ "console=${console},${baudrate}n8 ${memargs}\0" \ + "setsdupdate=mmc rescan && set interface mmc && " \ "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \ + "source ${loadaddr}\0" \ -- 1.9.1 diff --git a/scripts/manifest.xml b/scripts/manifest.xml index ca71c1c..4a88a1b 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -46,7 +46,7 @@ groups="notdefault,bbb"/> Date: Mon, 28 Sep 2015 16:33:01 +0300 Subject: gstreamer: fix audio volume plugin Setting volume is broken on ARM when compiled with GCC 4.9, where anything but max volume (1.0) turns into mute. Patches taken from https://community.freescale.com/thread/350584 Change-Id: I43fe71fdb62bdeed066ec468ffe70f39e950843e Reviewed-by: Yoann Lopes Reviewed-by: Karim Pinter --- .../gstreamer/gst-plugins-base/fix-gstvolume.patch | 23 ++++++++++++++++++++ recipes/gstreamer/gst-plugins-base_0.10.%.bbappend | 25 ++++++++++++++++++++++ .../gstreamer1.0-plugins-base/fix-gstvolume.patch | 23 ++++++++++++++++++++ .../gstreamer/gstreamer1.0-plugins-base_%.bbappend | 25 ++++++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 recipes/gstreamer/gst-plugins-base/fix-gstvolume.patch create mode 100644 recipes/gstreamer/gst-plugins-base_0.10.%.bbappend create mode 100644 recipes/gstreamer/gstreamer1.0-plugins-base/fix-gstvolume.patch create mode 100644 recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend diff --git a/recipes/gstreamer/gst-plugins-base/fix-gstvolume.patch b/recipes/gstreamer/gst-plugins-base/fix-gstvolume.patch new file mode 100644 index 0000000..d229e95 --- /dev/null +++ b/recipes/gstreamer/gst-plugins-base/fix-gstvolume.patch @@ -0,0 +1,23 @@ +diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c +index 0f5b362..94d03a3 100644 +--- a/gst/volume/gstvolume.c ++++ b/gst/volume/gstvolume.c +@@ -314,10 +314,14 @@ volume_update_volume (GstVolume * self, gfloat volume, + self->current_mute = FALSE; + self->current_volume = volume; + +- self->current_vol_i8 = volume * VOLUME_UNITY_INT8; +- self->current_vol_i16 = volume * VOLUME_UNITY_INT16; +- self->current_vol_i24 = volume * VOLUME_UNITY_INT24; +- self->current_vol_i32 = volume * VOLUME_UNITY_INT32; ++ self->current_vol_i8 = ++ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT8); ++ self->current_vol_i16 = ++ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT16); ++ self->current_vol_i24 = ++ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT24); ++ self->current_vol_i32 = ++ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT32); + + passthrough = (self->current_vol_i16 == VOLUME_UNITY_INT16); + } diff --git a/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend b/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend new file mode 100644 index 0000000..026aa2b --- /dev/null +++ b/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend @@ -0,0 +1,25 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://fix-gstvolume.patch" diff --git a/recipes/gstreamer/gstreamer1.0-plugins-base/fix-gstvolume.patch b/recipes/gstreamer/gstreamer1.0-plugins-base/fix-gstvolume.patch new file mode 100644 index 0000000..f67a840 --- /dev/null +++ b/recipes/gstreamer/gstreamer1.0-plugins-base/fix-gstvolume.patch @@ -0,0 +1,23 @@ +diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c +index 0f5b362..94d03a3 100644 +--- a/gst/volume/gstvolume.c ++++ b/gst/volume/gstvolume.c +@@ -250,10 +250,14 @@ volume_update_volume (GstVolume * self, const GstAudioInfo * info, + self->current_mute = FALSE; + self->current_volume = volume; + +- self->current_vol_i8 = volume * VOLUME_UNITY_INT8; +- self->current_vol_i16 = volume * VOLUME_UNITY_INT16; +- self->current_vol_i24 = volume * VOLUME_UNITY_INT24; +- self->current_vol_i32 = volume * VOLUME_UNITY_INT32; ++ self->current_vol_i8 = ++ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT8); ++ self->current_vol_i16 = ++ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT16); ++ self->current_vol_i24 = ++ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT24); ++ self->current_vol_i32 = ++ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT32); + + passthrough = (self->current_vol_i16 == VOLUME_UNITY_INT16); + } diff --git a/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend new file mode 100644 index 0000000..026aa2b --- /dev/null +++ b/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend @@ -0,0 +1,25 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://fix-gstvolume.patch" -- cgit v1.2.3-54-g00ecf From a5323e1fc1f734036d29da80aca037576e9d94b9 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Mon, 12 Oct 2015 16:09:33 +0200 Subject: Build nativesdk-ostree The 'ostree' binary is not available as an installable package on Ubuntu. Instead of requiring users to build it from the source code, lets add a native ostree binary to the toolchain. Change-Id: I50031e0fc72bc0585785634a329d1557876a020b Reviewed-by: Samuli Piippo --- recipes/e2fsprogs/e2fsprogs_%.bbappend | 1 + recipes/glib-networking/glib-networking_%.bbappend | 1 + recipes/gpgme/gpgme_%.bbappend | 1 + recipes/libassuan/libassuan_%.bbappend | 1 + recipes/libgpg-error/libgpg-error_%.bbappend | 1 + recipes/libgsystem/libgsystem.bb | 2 ++ recipes/libsoup/libsoup-%.bbappend | 2 ++ recipes/ostree/ostree.bb | 2 ++ .../packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | 1 + 9 files changed, 12 insertions(+) create mode 100644 recipes/e2fsprogs/e2fsprogs_%.bbappend create mode 100644 recipes/glib-networking/glib-networking_%.bbappend create mode 100644 recipes/gpgme/gpgme_%.bbappend create mode 100644 recipes/libassuan/libassuan_%.bbappend create mode 100644 recipes/libgpg-error/libgpg-error_%.bbappend create mode 100644 recipes/libsoup/libsoup-%.bbappend diff --git a/recipes/e2fsprogs/e2fsprogs_%.bbappend b/recipes/e2fsprogs/e2fsprogs_%.bbappend new file mode 100644 index 0000000..608377e --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs_%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes/glib-networking/glib-networking_%.bbappend b/recipes/glib-networking/glib-networking_%.bbappend new file mode 100644 index 0000000..608377e --- /dev/null +++ b/recipes/glib-networking/glib-networking_%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes/gpgme/gpgme_%.bbappend b/recipes/gpgme/gpgme_%.bbappend new file mode 100644 index 0000000..608377e --- /dev/null +++ b/recipes/gpgme/gpgme_%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes/libassuan/libassuan_%.bbappend b/recipes/libassuan/libassuan_%.bbappend new file mode 100644 index 0000000..608377e --- /dev/null +++ b/recipes/libassuan/libassuan_%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes/libgpg-error/libgpg-error_%.bbappend b/recipes/libgpg-error/libgpg-error_%.bbappend new file mode 100644 index 0000000..2a59083 --- /dev/null +++ b/recipes/libgpg-error/libgpg-error_%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND += "nativesdk" diff --git a/recipes/libgsystem/libgsystem.bb b/recipes/libgsystem/libgsystem.bb index d2d1a0b..f006a39 100644 --- a/recipes/libgsystem/libgsystem.bb +++ b/recipes/libgsystem/libgsystem.bb @@ -39,3 +39,5 @@ do_configure_prepend() { # We get a syntax error since we do not bundle gnome recipes that define this macro. sed -i '/GTK_DOC_CHECK/d' ${S}/configure.ac } + +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes/libsoup/libsoup-%.bbappend b/recipes/libsoup/libsoup-%.bbappend new file mode 100644 index 0000000..4a95767 --- /dev/null +++ b/recipes/libsoup/libsoup-%.bbappend @@ -0,0 +1,2 @@ +DEPENDS += "glib-networking" +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb index 1ba1504..4700f08 100644 --- a/recipes/ostree/ostree.bb +++ b/recipes/ostree/ostree.bb @@ -47,3 +47,5 @@ do_install_append() { # this of course is a broken configure.ac logic. rm -rf ${D}${libdir}/dracut/ } + +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index f64c0ac..7591b6b 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -30,6 +30,7 @@ RDEPENDS_${PN} = "\ nativesdk-python-modules \ nativesdk-python-misc \ nativesdk-gperf \ + nativesdk-ostree \ ${@base_contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland", "", d)} \ ${MACHINE_EXTRA_INSTALL_SDK_HOST} \ " -- cgit v1.2.3-54-g00ecf From a8c49af2fa8e64dd6f913d597eb3ac2611c966b4 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Mon, 12 Oct 2015 16:10:17 +0200 Subject: Patch and update ostree Update ostree version and apply a patch that is waiting to be merged in the upstream project. OTA scripts need these changes to function properly. Change-Id: Ia4cbde1e3c55ee1bb1a27492c8325d2fdab5deb8 Reviewed-by: Samuli Piippo --- recipes/ostree/ostree.bb | 6 ++- ...-require-boot-uEnv.txt-for-u-boot-support.patch | 62 ++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 recipes/ostree/ostree/0001-Don-t-require-boot-uEnv.txt-for-u-boot-support.patch diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb index 4700f08..96931f1 100644 --- a/recipes/ostree/ostree.bb +++ b/recipes/ostree/ostree.bb @@ -27,7 +27,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" inherit autotools pkgconfig -SRC_URI = "git://github.com/GNOME/ostree.git;tag=v2015.7" +SRC_URI = " \ + git://github.com/GNOME/ostree.git;tag=v2015.9 \ + file://0001-Don-t-require-boot-uEnv.txt-for-u-boot-support.patch \ + " + S = "${WORKDIR}/git" DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libgsystem libassuan xz" diff --git a/recipes/ostree/ostree/0001-Don-t-require-boot-uEnv.txt-for-u-boot-support.patch b/recipes/ostree/ostree/0001-Don-t-require-boot-uEnv.txt-for-u-boot-support.patch new file mode 100644 index 0000000..8e1be94 --- /dev/null +++ b/recipes/ostree/ostree/0001-Don-t-require-boot-uEnv.txt-for-u-boot-support.patch @@ -0,0 +1,62 @@ +From ca0a0261be6397d5acb7a4fa2a492c5b554fb1fe Mon Sep 17 00:00:00 2001 +From: Gatis Paeglis +Date: Tue, 6 Oct 2015 23:43:25 +0200 +Subject: [PATCH] Don't require /boot/uEnv.txt for u-boot support + +The current code checks if /boot/uEnv.txt is a symlink to +decice if sysroot requires u-boot support. Why this is bad: + +There are 2 ways to provide a custom env to u-boot from user space: + +1) A compiled binary that is sourced from u-boot. +2) A text file (usually /uEnv.txt) that is imported into env from u-boot. + +The current OSTree u-boot integration code was designed with the 1st +case in mind. + +Many bootscripts provided by an embedded device vendors expect +to find uEnv.txt in the top level directory, it is often hardcoded +when building u-boot and is difficult to change later on. Or in other +cases it is stored in read-only memory so changing it would require +re-flushing boot loader with a new env. So the issue here is that +OSTree's and vendor uEnv.txt want to exist on the same path and OSTree +would throw away any changes added to /uEnv.txt by user on the next +upgrade/deploy. + +This patch "hides" away the OSTree's env file loader/uEnv.txt from users +who are used to edditing uEnv.txt at the top level directory. Now to add +OSTree support on such boards you can simply add a custom logic in uEnv.txt +that loads ostree env from /loader/uEnv.txt + +This change is backward compatible with the previous ostree releases and +solves the issue described in: + +https://bugzilla.gnome.org/show_bug.cgi?id=755787 +--- + src/libostree/ostree-bootloader-uboot.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c +index 4c0218f..f67e9bd 100644 +--- a/src/libostree/ostree-bootloader-uboot.c ++++ b/src/libostree/ostree-bootloader-uboot.c +@@ -52,7 +52,7 @@ _ostree_bootloader_uboot_query (OstreeBootloader *bootloader, + { + OstreeBootloaderUboot *self = OSTREE_BOOTLOADER_UBOOT (bootloader); + +- *out_is_active = g_file_query_file_type (self->config_path, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL) == G_FILE_TYPE_SYMBOLIC_LINK; ++ *out_is_active = g_file_query_file_type (self->config_path, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL) == G_FILE_TYPE_REGULAR; + return TRUE; + } + +@@ -177,6 +177,6 @@ _ostree_bootloader_uboot_new (OstreeSysroot *sysroot) + { + OstreeBootloaderUboot *self = g_object_new (OSTREE_TYPE_BOOTLOADER_UBOOT, NULL); + self->sysroot = g_object_ref (sysroot); +- self->config_path = g_file_resolve_relative_path (self->sysroot->path, "boot/uEnv.txt"); ++ self->config_path = g_file_resolve_relative_path (self->sysroot->path, "boot/loader/uEnv.txt"); + return self; + } +-- +2.1.4 + -- cgit v1.2.3-54-g00ecf