From patchwork Fri Apr 4 10:42:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 27803 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f69.google.com (mail-pb0-f69.google.com [209.85.160.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1FC1420490 for ; Fri, 4 Apr 2014 10:42:58 +0000 (UTC) Received: by mail-pb0-f69.google.com with SMTP id md12sf11737538pbc.0 for ; Fri, 04 Apr 2014 03:42:58 -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=wLv4/PBkINtZDT6oZtWKnYKZUS4nkdSEswc1vEuQ22s=; b=XW8YVLYGL1xHR7QqgfZhIHZMlUlceCW8MvPefYL9HMdo5uOx6zdlmRRnUXCruHGWSQ E3ofYoQTtAG0xmpdecKtPJWqI9UfmeNgXhtEo3l+z6QQk5StQbaIIH/myGSelrhoEZi+ Iqx7ruUanZVnLLk9WE1MpAlhuefaJHkLHXZ2slyjCX7hk+QX0v3UmAoMQElLcNpCBcwO 3gTerxIWs+o4WY8GDZipfQJbi15F/U/A/9OIYbIU9sYTlObnHG1ve1Vw/PSb2u1sblkF mzK5RkanNM/p0GXR4xt8plPv4uQa/+IrNposQEqMoyQx4zHUNtgpVWM2/7kbNJofm/J9 9Jrw== X-Gm-Message-State: ALoCoQm92RBe1aDzCYCE8xnobu9XeGsAsZFiyjN01E0A1P94o0+qC75+XvuJ1AZQEdQsFZgoSg1c X-Received: by 10.66.216.167 with SMTP id or7mr4355083pac.44.1396608178274; Fri, 04 Apr 2014 03:42:58 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.42.20 with SMTP id b20ls1002685qga.5.gmail; Fri, 04 Apr 2014 03:42:58 -0700 (PDT) X-Received: by 10.59.7.228 with SMTP id df4mr4567282ved.11.1396608178137; Fri, 04 Apr 2014 03:42:58 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id e3si1351258vcy.158.2014.04.04.03.42.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Apr 2014 03:42:58 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.177 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.177; Received: by mail-ve0-f177.google.com with SMTP id sa20so1267376veb.36 for ; Fri, 04 Apr 2014 03:42:58 -0700 (PDT) X-Received: by 10.58.1.97 with SMTP id 1mr891428vel.23.1396608178033; Fri, 04 Apr 2014 03:42:58 -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 v8csp103117vcv; Fri, 4 Apr 2014 03:42:57 -0700 (PDT) X-Received: by 10.68.211.164 with SMTP id nd4mr14153785pbc.44.1396608176520; Fri, 04 Apr 2014 03:42:56 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id ep2si4441676pbb.117.2014.04.04.03.42.55 for ; Fri, 04 Apr 2014 03:42:56 -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 9E5826E747; Fri, 4 Apr 2014 10:42:53 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by mail.openembedded.org (Postfix) with ESMTP id 2913E6E4CC for ; Fri, 4 Apr 2014 10:42:48 +0000 (UTC) Received: by mail-wi0-f176.google.com with SMTP id r20so973990wiv.9 for ; Fri, 04 Apr 2014 03:42:48 -0700 (PDT) X-Received: by 10.194.161.168 with SMTP id xt8mr18802742wjb.35.1396608168877; Fri, 04 Apr 2014 03:42:48 -0700 (PDT) Received: from localhost ([2001:610:612:0:2ad2:44ff:fe4b:bc17]) by mx.google.com with ESMTPSA id x3sm18682136eep.17.2014.04.04.03.42.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Apr 2014 03:42:47 -0700 (PDT) From: Koen Kooi To: openembedded-core@lists.openembedded.org Date: Fri, 4 Apr 2014 12:42:46 +0200 Message-Id: <1396608166-4965-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.0 Cc: Koen Kooi Subject: [OE-core] [RFC][PATCHv2] 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.177 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'. Changes since v1: * extra underscore in RDEPENDS removed * Change to ${PN}-launch 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 ${PN}-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_${PN}-launch = "${bindir}/dbus-launch" +RDEPENDS_${PN}-launch = "${PN}" +RRECOMMENDS_${PN} += "${PN}-launch" + FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" pkg_postinst_dbus() {