From 3d363df976d644aab7592be1a32bd77935ba679c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Feb 2015 16:40:42 +0200 Subject: dbus: rename bbappend to work with tibidabo Change-Id: Ib332c8e0019e7c34ca10aa4e09e4bfcc627ef4fe Reviewed-by: Eirik Aavitsland --- recipes/dbus/dbus_%.bbappend | 47 +++++++++++++++++++++++++++++++++++++++ recipes/dbus/dbus_1.6.18.bbappend | 47 --------------------------------------- 2 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 recipes/dbus/dbus_%.bbappend delete mode 100644 recipes/dbus/dbus_1.6.18.bbappend diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend new file mode 100644 index 0000000..d824989 --- /dev/null +++ b/recipes/dbus/dbus_%.bbappend @@ -0,0 +1,47 @@ +############################################################################# +## +## 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://dbus-session.init \ + file://dbus-session-address \ + " + +INITSCRIPT_PACKAGES = "${PN} ${PN}-session-init" +INITSCRIPT_NAME_${PN}-session-init = "dbus-session" +INITSCRIPT_PARAMS_${PN}-session-init = "start 20 5 3 2 . stop 10 0 1 6 ." + +PACKAGES =+ "${PN}-session-init" +FILES_${PN}-session-init = " \ + ${sysconfdir}/init.d/dbus-session \ + ${sysconfdir}/profile.d/dbus-session-address \ + " + +do_install_append_class-target() { + if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh + install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session + fi + install -d ${D}${sysconfdir}/profile.d + install -m 0755 ${WORKDIR}/dbus-session-address ${D}${sysconfdir}/profile.d/ +} diff --git a/recipes/dbus/dbus_1.6.18.bbappend b/recipes/dbus/dbus_1.6.18.bbappend deleted file mode 100644 index d824989..0000000 --- a/recipes/dbus/dbus_1.6.18.bbappend +++ /dev/null @@ -1,47 +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://dbus-session.init \ - file://dbus-session-address \ - " - -INITSCRIPT_PACKAGES = "${PN} ${PN}-session-init" -INITSCRIPT_NAME_${PN}-session-init = "dbus-session" -INITSCRIPT_PARAMS_${PN}-session-init = "start 20 5 3 2 . stop 10 0 1 6 ." - -PACKAGES =+ "${PN}-session-init" -FILES_${PN}-session-init = " \ - ${sysconfdir}/init.d/dbus-session \ - ${sysconfdir}/profile.d/dbus-session-address \ - " - -do_install_append_class-target() { - if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/init.d - sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh - install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session - fi - install -d ${D}${sysconfdir}/profile.d - install -m 0755 ${WORKDIR}/dbus-session-address ${D}${sysconfdir}/profile.d/ -} -- cgit v1.2.3-54-g00ecf