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