From patchwork Tue Jan 14 12:34:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 310681 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 3827F2C00B0 for ; Tue, 14 Jan 2014 23:36:06 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id A61C93FDBF for ; Tue, 14 Jan 2014 13:36:05 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id 5FBAA4020C for ; Tue, 14 Jan 2014 13:35:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=2753; q=dns/txt; s=ironport2; t=1389702906; x=1421238906; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=JYUWrEeLa0UUD8sYPxFKOvr5vpHi5dQXivq9okvuinQ=; b=Swqp0e9H4IIN3J6gRmxgpJglFlzHjLRHKhAVPDiLWtOebLlFCIBArF1r hs/YlWWfr5gwzIoUXSzK39cO/cAx6zvYXNhT9h1oUjc+OelGW/qrymNbw xEVBFMeUztX6N2ZUT4vtPNz3DmoyeDcXeKdGWB2oDpy3NS2tGVe+JlwEH 8=; X-IronPort-AV: E=Sophos;i="4.95,658,1384297200"; d="scan'208";a="196370" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 14 Jan 2014 13:35:03 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Tue, 14 Jan 2014 13:35:03 +0100 Received: by localhost (Postfix, from userid 30007) id 0604D681505; Tue, 14 Jan 2014 12:35:03 +0000 (UTC) From: To: Subject: [PATCH 080/131] dbus: Change packaging and fix DEPENDS/RDEPENDS Date: Tue, 14 Jan 2014 12:34:07 +0000 Message-ID: <2ceddbae6033cb4fe6af94c2a6e10b6b4a417c5b.1389702652.git.christian.braunersorensen@prevas.dk> X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Christian Sørensen Signed-off-by: Christian Sørensen --- recipes/dbus/dbus.inc | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/recipes/dbus/dbus.inc b/recipes/dbus/dbus.inc index 1d4d0ed..88d3956 100644 --- a/recipes/dbus/dbus.inc +++ b/recipes/dbus/dbus.inc @@ -61,41 +61,15 @@ do_install_extra_files() { } RDEPENDS_${PN}-x11 = "${PN}" -PROVIDES_${PN} = "dbus-1" RDEPENDS_${PN} += "libc ${DEPENDS_LIBC} libexpat libdbus" RDEPENDS_${PN}-x11 += "libc ${DEPENDS_LIBC}" PACKAGES =+ "${PN}-x11" inherit auto-package-libs -AUTO_PACKAGE_LIBS = "dbus" -AUTO_PACKAGE_LIBS_LIBDIR = "${libdir}:lib:-1" -AUTO_PACKAGE_LIBS_DEV_DEPENDS = "${PN}-dev_${PV}" -FILES_${PN}-libdbus-dev = "${includedir}/dbus-1.0 ${libdir}/dbus-1.0/include" -DEPENDS_${PN}-libdbus = "libc ${DEPENDS_LIBC}" - -FILES_${PN} = "\ - ${bindir}/dbus-daemon* \ - ${bindir}/dbus-uuidgen \ - ${bindir}/dbus-cleanup-sockets \ - ${bindir}/dbus-send \ - ${bindir}/dbus-monitor \ - ${libexecdir}/dbus* \ - ${sysconfdir} \ - ${datadir}/dbus-1/services \ - ${datadir}/dbus-1/system-services \ -" -FILES_${PN}-x11 = "${bindir}/dbus-launch" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool ${libdir}/" - -#pkg_postinst_${PN}() { -##!/bin/sh -## can't do adduser stuff offline -#if [ "x$D" != "x" ]; then -# exit 1 -#fi -#chmod u+s /usr/libexec/dbus-daemon-launch-helper -#} +AUTO_PACKAGE_LIBS = "dbus-1" +AUTO_PACKAGE_LIBS_DEV_DEPENDS += "libc libpthread librt" +AUTO_PACKAGE_LIBS_RDEPENDS += "libc libpthread librt" RECIPE_FLAGS += "dbus_sysvinit_start dbus_sysvinit_stop" SYSVINIT_SCRIPT_dbus = "dbus-1" @@ -106,3 +80,19 @@ inherit splashutils-progress RECIPE_FLAGS += "dbus_1_splashutils_progress dbus_1_splashutils_msg" SPLASHUTILS_INITSCRIPTS = "dbus_1" DEFAULT_USE_dbus_1_splashutils_msg = "\"Starting Dbus\"" + +inherit auto-package-utils +AUTO_PACKAGE_UTILS = "dbus-cleanup-sockets dbus-daemon dbus-launch \ + dbus-monitor dbus-run-session dbus-send dbus-uuidgen" +AUTO_PACKAGE_UTILS_DEPENDS += "libc" +AUTO_PACKAGE_UTILS_RDEPENDS += "libc" +DEPENDS_${PN}-dbus-daemon += "libexpat libpthread librt" +RDEPENDS_${PN}-dbus-daemon += "libexpat libpthread librt" +DEPENDS_${PN}-dbus-monitor += "libdbus-1" +RDEPENDS_${PN}-dbus-monitor += "libdbus-1" +DEPENDS_${PN}-dbus-run-session += "libdbus-1" +RDEPENDS_${PN}-dbus-run-session += "libdbus-1" +DEPENDS_${PN}-dbus-send += "libdbus-1" +RDEPENDS_${PN}-dbus-send += "libdbus-1" +DEPENDS_${PN}-dbus-uuidgen += "libdbus-1" +RDEPENDS_${PN}-dbus-uuidgen += "libdbus-1"