From patchwork Fri Apr 4 08:53:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 27795 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A7B3520490 for ; Fri, 4 Apr 2014 08:53:53 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id p10sf10259512pdj.3 for ; Fri, 04 Apr 2014 01:53:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=7W7QerCO+XE6gsQUZiVwoJYMT7BoBtJpiRflaaoTARI=; b=E6QPm8mMRCr+qgFrWSiQAOMlA5qWFWD+gEkTQt4fPenBg0vIzaS6W1m4DwYmZg7yTY nKuGmkkceIERZJKd1JfG1/TBmXpP3G94fiaLNfPdenDgPck1iwNYi1+qyNIHtU7unVFY x7s+V6u9yhEv4mFcXpcGJQRFxV0Y0UtD1nWHy4BU0d59NJuTfWvvohRwzoWX68rCebUN 2nc9OcNLghUXGloyzwqIJ8IY8IRtVK5SmaqfB5SszHe6r4aucFb9/iHh9125qzVWCY+S 7qVebXUe4dC6PGigFZgZ2AEcAIdt8RggSOPBh7va/H5qINDg1O9WNvBb9ggfitAy0EwV qFOw== X-Gm-Message-State: ALoCoQmGWFAcHjzIV97E/DDxjKMBQ3dRO5QTGWaloKkvTrixrxZEIeYvgCBLyb05+CzGpbtFZcSl X-Received: by 10.66.121.136 with SMTP id lk8mr3953853pab.34.1396601632890; Fri, 04 Apr 2014 01:53:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.103.77 with SMTP id x71ls984030qge.31.gmail; Fri, 04 Apr 2014 01:53:52 -0700 (PDT) X-Received: by 10.221.28.202 with SMTP id rv10mr7437500vcb.10.1396601632792; Fri, 04 Apr 2014 01:53:52 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id sc7si1674726vdc.193.2014.04.04.01.53.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Apr 2014 01:53:52 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id jw12so1187342veb.23 for ; Fri, 04 Apr 2014 01:53:52 -0700 (PDT) X-Received: by 10.220.170.202 with SMTP id e10mr7339096vcz.20.1396601632656; Fri, 04 Apr 2014 01:53:52 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp96591vcv; Fri, 4 Apr 2014 01:53:51 -0700 (PDT) X-Received: by 10.66.240.4 with SMTP id vw4mr13508788pac.26.1396601631003; Fri, 04 Apr 2014 01:53:51 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f1si4326918pbn.231.2014.04.04.01.53.50 for ; Fri, 04 Apr 2014 01:53:50 -0700 (PDT) Received-SPF: pass (google.com: domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7ECE86E81B; Fri, 4 Apr 2014 08:53:44 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-we0-f180.google.com (mail-we0-f180.google.com [74.125.82.180]) by mail.openembedded.org (Postfix) with ESMTP id 40D546A9C4 for ; Fri, 4 Apr 2014 08:53:40 +0000 (UTC) Received: by mail-we0-f180.google.com with SMTP id p61so3097287wes.11 for ; Fri, 04 Apr 2014 01:53:40 -0700 (PDT) X-Received: by 10.180.87.233 with SMTP id bb9mr2784277wib.10.1396601620443; Fri, 04 Apr 2014 01:53:40 -0700 (PDT) Received: from localhost ([2001:610:612:0:2ad2:44ff:fe4b:bc17]) by mx.google.com with ESMTPSA id w12sm18056563eez.36.2014.04.04.01.53.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Apr 2014 01:53:39 -0700 (PDT) From: Koen Kooi To: openembedded-core@lists.openembedded.org Date: Fri, 4 Apr 2014 10:53:37 +0200 Message-Id: <1396601617-29638-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.0 Cc: Koen Kooi Subject: [OE-core] [RFC][PATCH] dbus: split dbus-launch out into its own package (again) X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: koen.kooi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 When installing 'dbus-1' it will drag in X11 libs due to ${bindir}/dbus-launch being in ${PN}. Move it to a seperate package to be able to generate a small filesystem (e.g. initrd) without X11 libs without needed a seperate DISTRO.conf. There will be no functional changes for existing image and packagegroup recipes since ${PN} has 'dbus-launch' in RRECOMMENDS. So to filter out dbus-launch you need to add it to BAD_RECOMMENDATIONS in the image recipe. This is in essence a revert of: commit c02364f36e228835ea5d7fd4e1d347fd451f8544 Author: Radu Moisan Date: Tue Jul 31 09:23:23 2012 +0300 dbus: include dbus-launch in the main dbus package But as pointed out above, ${bindir}/dbus-launch will end up in the rootfs as before, so the issue behind c02364f36e228835ea5d7fd4e1d347fd451f8544 of a missing ${bindir}/dbus-launch won't suddenly pop up. Signed-off-by: Koen Kooi --- I've boot tested this both with BAD_RECOMMENDATIONS and without and it seems to work as intended. The big question is how to address the dbus-x11 (R)PROVIDE entries. I feel 'dbus-launch' is a much better name than 'dbus-x11', but I don't mind respinning this patch with 'dbus-x11'. meta/recipes-core/dbus/dbus.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 677ff78..28074be 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -37,7 +37,7 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session DEBIANNAME_${PN} = "dbus-1" -PACKAGES =+ "${PN}-lib" +PACKAGES =+ "${PN}-lib dbus-launch" OLDPKGNAME = "dbus-x11" OLDPKGNAME_class-nativesdk = "" @@ -51,15 +51,20 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ ${bindir}/dbus-cleanup-sockets \ ${bindir}/dbus-send \ ${bindir}/dbus-monitor \ - ${bindir}/dbus-launch \ ${libexecdir}/dbus* \ ${sysconfdir} \ ${localstatedir} \ ${datadir}/dbus-1/services \ ${datadir}/dbus-1/system-services \ ${systemd_unitdir}/system/" + FILES_${PN}-lib = "${libdir}/lib*.so.*" RRECOMMENDS_${PN}-lib = "${PN}" + +FILES_dbus-launch = "${bindir}/dbus-launch" +RDEPENDS__dbus-launch = "${PN}" +RRECOMMENDS_${PN} += "dbus-launch" + FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" pkg_postinst_dbus() {