From patchwork Tue Sep 17 12:36:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 173893 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1067654ill; Tue, 17 Sep 2019 05:37:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqwxwQR+u50+EFJxvp0atw648PSmKXwy9lfaeYQowmE1xIsWQLkIBSyReoePvxAKy9IXGFJ4 X-Received: by 2002:a63:7a11:: with SMTP id v17mr3104917pgc.337.1568723860249; Tue, 17 Sep 2019 05:37:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568723860; cv=none; d=google.com; s=arc-20160816; b=LNdP2Iylo4P81Y8+FwUFoUfuBC2i2wVLEM/O+qhfheKB2N4kmIWWNS5XOrxbaEMFY2 yNFjJqIMGIizSnU6mHQb/x9X6TcjtLHjtqfSFrGmbMNHHG9saewO0ffMnHu2CIRsZGko /YV7cHoN6ecve4crZJ3Rj4GArcw9R1n1AB+eLW+MLRgkG7Xt9yIbk2WoNp+rqNP5n4/J Bi+5oIc6NAeg118VlgtH1hrbKFgTKeMpUbFZKWgvodMB3gT/68dFBYJ8JsfvopCOxQEz Ok2FZPrV09oKAUNzN/WoGeMbbhfDtd+AXhsQkZSItdG/6cBc7uf7WUL3V3713yqnfLZC CIeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=wobmivE+cYny6eaOxFdJpUX/oW/DLXnmwSA6AvTEa/8=; b=Smtj93qhS2tYkEnKtTJwbbDmTR59dkb4K7Y9q8KK+YH1snOfRoOlHqsr+1SVgAMpEs JyFqihE2vjhTAPRNVNENXAOz3HnAeR3ykqyeJAdbnsLV3yU16LHWJ5Lew+fT0Pv49iX6 gF6i48/nLiINzC26R/cTvdd59A+wuigz+Rpi1w14eQ+oLuM4jXUp/FT0i1EB+kv+pf37 UUkIa8eW+FGPUNHEVhTaslixD5846wSDkR4V3HIlmlMOjxuuVU9tZj+c+hE64uqyLbmH v2Ambb607w8xmNfaOFT2jJ/rg1KoTjFjx1I6RHcSAt1tjgloDldQL3X+pKIPITiUn7mB JHOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=PH2LksB1; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g15si1655126pgp.351.2019.09.17.05.37.39; Tue, 17 Sep 2019 05:37:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=PH2LksB1; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id D7F817F77F; Tue, 17 Sep 2019 12:37:27 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mail.openembedded.org (Postfix) with ESMTP id 7C3737F511 for ; Tue, 17 Sep 2019 12:37:04 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id v8so3015648wrt.2 for ; Tue, 17 Sep 2019 05:37:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=0gICo9JykwGLf/2Qzb3Z7eWZuu6arILcSjOEIuWcrhE=; b=PH2LksB1b4R4Wn+fbvTMBkpnmy7Q0EMgI0p+hnCPx3xLzvh++w1mGXZxROU3GrC1AA yuvOqADB6OuCUZjBOII3JvNIiOJDmQWkLoipwS4NBWAxPn2CYzwxg0c9UJl5TyacwJd0 YldYsTDlS5QcsZLnYdnfwibu6UrW8nmRWnxPVhESalRSSem/8hnQ99XytqvUdmnZBKZ0 MAO2ELnjdKYSPi5LDJFqnecCRyaqr2wLQZ4IdDdmzJnS7f1i6Khm9IYS3fuXMti4w2y3 q1KbOWavoT04z6BPqJptCngL3Y9Py4SbWm15NK2/wnPxD5zhxZT1KG8+2GW+KqUVcPUY EaTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0gICo9JykwGLf/2Qzb3Z7eWZuu6arILcSjOEIuWcrhE=; b=OQwHKcPHfNcNQUdp86/WlL0ZBpTdBKQpC8FaO9V8QvBJ8PLX250r2Z/K6iA/MRENT3 cy41KwfokoUyxJpnNQo3SlHEHgJOi7PJvWTZCUFoKn7w4cWSaEryqNBBldpaw+DocqA1 nCSGNRVXLhin2S/TYLCqLosml0CxkVItFiynrdq2ZemkrVBMny7tUTNIw6ZXXQI+f/4G 5DOs+XEbs6FUynC9KMkNwhd75Z13lBmEOoxHUBzpYqC8ECpgkmrr4TJAIxWX5O6f8fGC FATJD3N02esFypMSdUfbMlw87LR8F4iLNgYIcpItcPiaEbPnnYk0m9CfK+ILtAZ3PdlQ LXEA== X-Gm-Message-State: APjAAAW7Zzmb40WtYJdvn5bwD7S9zRFsHKxgiDfk/KALknDUQkQGf1Zo /BBsu+nfMqUkRPMJFnY5xrw5LYlbxF4= X-Received: by 2002:a05:6000:82:: with SMTP id m2mr2954155wrx.241.1568723824887; Tue, 17 Sep 2019 05:37:04 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id l13sm2412994wmj.25.2019.09.17.05.37.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 05:37:04 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 17 Sep 2019 13:36:55 +0100 Message-Id: <20190917123655.30315-4-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190917123655.30315-1-ross.burton@intel.com> References: <20190917123655.30315-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 4/4] distcc: split into client and server packages X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Users of distcc are rarely both clients and servers, so split the package. distcc is the client, the new distcc-server package is the server. Signed-off-by: Ross Burton --- meta/recipes-devtools/distcc/distcc_3.3.3.bb | 21 +++++++------------- 1 file changed, 7 insertions(+), 14 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/distcc/distcc_3.3.3.bb b/meta/recipes-devtools/distcc/distcc_3.3.3.bb index d8ad498f2b4..509b74baab2 100644 --- a/meta/recipes-devtools/distcc/distcc_3.3.3.bb +++ b/meta/recipes-devtools/distcc/distcc_3.3.3.bb @@ -12,7 +12,7 @@ PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+" # use system popt by default PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" -RRECOMMENDS_${PN} = "avahi-daemon" +RRECOMMENDS_${PN}-server = "avahi-daemon" SRC_URI = "git://github.com/distcc/distcc.git \ file://fix-gnome.patch \ @@ -29,6 +29,8 @@ ASNEEDED = "" EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode" +PACKAGE_BEFORE_PN = "${PN}-distmon-gnome ${PN}-server" + USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system \ --home /dev/null \ @@ -38,8 +40,8 @@ USERADD_PARAM_${PN} = "--system \ INITSCRIPT_NAME = "distcc" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "distcc.service" +SYSTEMD_PACKAGES = "${PN}-server" +SYSTEMD_SERVICE_${PN}-server = "distcc.service" do_install() { # Improve reproducibility: compress w/o timestamps @@ -53,17 +55,8 @@ do_install() { sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service } -PACKAGES += "distcc-distmon-gnome" - -FILES_${PN} = " ${sysconfdir} \ - ${bindir}/distcc \ - ${bindir}/lsdistcc \ - ${bindir}/distccd \ - ${bindir}/distccmon-text \ - ${sbindir}/update-distcc-symlinks \ - ${systemd_unitdir}/system/distcc.service" - -FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ +FILES_${PN}-server = "${bindir}/distccd ${sysconfdir} ${sbindir}" +FILES_${PN}-distmon-gnome = " ${bindir}/distccmon-gnome \ ${datadir}/applications \ ${datadir}/pixmaps"