From patchwork Tue Sep 17 12:36:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 173890 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1067191ill; Tue, 17 Sep 2019 05:37:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqzH6WZG8VfSrqTg4E+hDr2rAYAQZAPIe4vtDuu0Nxjnca/89CsuuZALJTHTRl4HJ44FIjni X-Received: by 2002:a17:90a:a503:: with SMTP id a3mr4703633pjq.11.1568723828097; Tue, 17 Sep 2019 05:37:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568723828; cv=none; d=google.com; s=arc-20160816; b=fQ1JhRQ/eiNbJJSZULahVgb9dGxTzuQ4s6NQGIdcSNLY1gY9i7duffPJ3gf5dRalDn jWnaQRgsPYPVsMgn6KiNhow/zvRDNi4agrVW9RfOmcKKqXodANMD7BuaSIOWkrwFoJ4o BdFG1pj6HKjUtWXb9cfqJMdx7f+hN8ckaHbpv3xzBWk+hA6rGrZ48Qg4y55D5pY4M2zp onP8yBnuZcXeHttz9T4ALUzexrZas+KrtlLbIGPKG3Eu4ZSotsGXbylLqD+7raDDGENP eyKk+6xzToVcuNka35QxZZQ7c++6Z0hjZTz/gSAxA5KKXqrV8L/JtUqO28DgtgCYwpoc 3hxA== 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:message-id:date:to:from:dkim-signature:delivered-to; bh=htTt8QtVEm7P5mRKEuTbrkuncPnVxJP44iAPhZ6TBls=; b=oHtOK3rRI0a4VYQUj4aRTx8PS2olFEZyhz+xJz8Ecsu3OVfM2894+7L6VMzoSzb6cQ /68kNn8JhOUxlyXeJi0l4XBC1SpnSqpUbgDFSCLCjN0Qu8gOqyrgK4dkHJ8a2lsiPUvu HkJizY2cjTsEjoAFOB4MxfNRpHXhQFnwIg4LfwfRQisk9Xi5cXWmH+16SIYK39qFs1fk pnJPECe0B3TTh3mFgLgyFVTOavahXjOkvGTmfW4n4KjvoClJbO9kI4dKr/FV4TQ8yUqW lWkXH8EbtR726fNb2BTDjFfZd1SruEgKzxrEbEFLiJkX7euTmXnMI3i8h9K2Ea7Nfea/ 5ZLw== 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=J6zFIwjC; 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 4si1867050pfj.184.2019.09.17.05.37.07; Tue, 17 Sep 2019 05:37:08 -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=J6zFIwjC; 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 9C88A7F74F; Tue, 17 Sep 2019 12:37:02 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mail.openembedded.org (Postfix) with ESMTP id E11C97F604 for ; Tue, 17 Sep 2019 12:37:00 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id v17so2965786wml.4 for ; Tue, 17 Sep 2019 05:37:02 -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:mime-version :content-transfer-encoding; bh=npOiPGN6zqNN2CfTL/wVPCb/qv4MGNAIyhJuaweURpU=; b=J6zFIwjCk037jHUGJzZKREGLWXBmiXcnW89FQy/hvct0aghL7o3If5tBIDhDharcLa HVyxCLtt1D8bKcUsxw+o8/fL75GSJKLIUO7zqmx7Fas0+iZ7f+sYbrZDS2gYlPt1NpeK 7fX4bOzlSfyWaGAD7Hbc7fjrs58KZgSKCxNpJYJSqPUMblVTvOUEcrW/VThEzXbnlzES zQym2+kHVaGCSeR56MQe7TxWVYUu8CYKO9lPc7aF0yAVYT6lQrGKC0gBYHOzSMALHzHN 5AE3Msg/phez7Ci9QQKa8owjWvI9Kf8jS0KXkaObEn4ioYZGi96H72g+aX/iG335PYmF HGsg== 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:mime-version :content-transfer-encoding; bh=npOiPGN6zqNN2CfTL/wVPCb/qv4MGNAIyhJuaweURpU=; b=dkvbWPz2pshEGJFOFrDYzJG1jF3cewnSmsUDFT9fC9GUwqj3U9sclIcr1KlYZJwAoJ NXLkBaZZkNBNn65ig9eX58CBWnyZcLRmKtqYmLTswhOgO3cehf4m8SVgKwURRnqpTP8e NrNa3P3huER7O6GTxjb7IUHnuDKaY+FHOa6RQoaGK5OTPpJyuSnXATgdb3anemmbmX3t C13k3Au8iKFfIHNikttGVRY8JdqbO6VVHd8YQkq7jeTzPwaPkrtqALm+NwqZhuesUJk5 p+ttlwKGdLt6o4wgV5dZQqwfauft+BNcqttKiKAoj9YC8zsn+5/SwTAjVW8q245DxZll 440w== X-Gm-Message-State: APjAAAVZD/sBSLGlts118Sz8BRssVbIZSkFATdAGxQgcWGt2pyAd4ae8 h/aYqbqpxHL9P1ipqpp0vlGGSzQ4O1w= X-Received: by 2002:a1c:c5cb:: with SMTP id v194mr3305785wmf.108.1568723821039; Tue, 17 Sep 2019 05:37:01 -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.36.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 05:36:59 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 17 Sep 2019 13:36:52 +0100 Message-Id: <20190917123655.30315-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/4] libical: upgrade to 3.0.6 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 Signed-off-by: Ross Burton --- .../libical/{libical_3.0.5.bb => libical_3.0.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/libical/{libical_3.0.5.bb => libical_3.0.6.bb} (90%) -- 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-support/libical/libical_3.0.5.bb b/meta/recipes-support/libical/libical_3.0.6.bb similarity index 90% rename from meta/recipes-support/libical/libical_3.0.5.bb rename to meta/recipes-support/libical/libical_3.0.6.bb index 3832b20bf11..032f3655e9a 100644 --- a/meta/recipes-support/libical/libical_3.0.5.bb +++ b/meta/recipes-support/libical/libical_3.0.6.bb @@ -9,8 +9,8 @@ SECTION = "libs" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "9be4e8a1739a9c27e06aa8ce66b8cb34" -SRC_URI[sha256sum] = "7ad550c8c49c9b9983658e3ab3e68b1eee2439ec17b169a6b1e6ecb5274e78e6" +SRC_URI[md5sum] = "463a59244c6767b8e67b29379405e297" +SRC_URI[sha256sum] = "5c8a21c2b732ece4a33e5c862970b4f35a8548bbcda50de5695f6fc211ac4d97" UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" inherit cmake pkgconfig From patchwork Tue Sep 17 12:36:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 173891 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1067480ill; Tue, 17 Sep 2019 05:37:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqyCh6oim3YwTGUmpf+qmU42DzvhrPu3Y9DCxodh3d1EWxpZWE4eUQzdTgTJm5GAodzLH4lE X-Received: by 2002:a63:7d49:: with SMTP id m9mr3219118pgn.161.1568723848094; Tue, 17 Sep 2019 05:37:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568723848; cv=none; d=google.com; s=arc-20160816; b=zt9v2N3NtA8mQP62u3ICcD2hVNIdhQoAfUHm0E1akE8t3mVa3KV/YD2uzL0H4wt0Rs 73cUo41J/aLim7wXv/gCDShdAwY5iMCy2ddwIQH5Ue0ahlO7pc0pakKUHzzO4igNrZIr WkR6EL5tbEZPs8FbTcK6nEy++wDt894i4FpOxxjaFvGiP0K5j2ZGudcV1f6NFvIYqTjh 9A9iZDs8N6EYJ6R5qIkjWMvu3odrGWyaK4pCiQ/irIEGJXIFiUs7S8aQ9BX5nvDwLGvq jCPKVA0y+WWp+1IEe/P5JHcZiWvjpEI/K3aEap+IIYzO8y5yf6FB1v50zalb7xiiftRg 9I2A== 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=TzPicAVaHylGe6ZC08L1HWCwLvdb4mh8H3F5n5gwi84=; b=U0ODq6Y1UH+s1No2hnPwOABGP6i08krCpt4kFAiPffKD1BxFaZY3Qk4gvbrXSNh1JJ FxEe/VOibiTffTCktNWiR6iJgUVxfB87/75bC4eqzF8pd+0c2du5MKUR7UwPXxfv5caw X+vlfqmTD+5UQuccI4f8GJUxJVPB7kGhJ9eNI31Hbqyfr6yS66BZpM5PMPb2ybnblJZZ 70UWlwMQtdD/UX49z3cVywjNbVQUKxvERP9u2fiLpdRjmTSBeLkY9z6ao09gZ0RoP/+e CZmVKfJugrBh3WHPEnzR5JoZLwNYavkvSj0zb2uj9lh5JXwiP6YsPHZz6MmrruLO8KWZ 1qNg== 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=m6sHp3Cb; 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 q13si1854644pfn.134.2019.09.17.05.37.27; Tue, 17 Sep 2019 05:37:28 -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=m6sHp3Cb; 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 261A07F74B; Tue, 17 Sep 2019 12:37:25 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mail.openembedded.org (Postfix) with ESMTP id 06EAF7F511 for ; Tue, 17 Sep 2019 12:37:01 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id i1so2995352wro.4 for ; Tue, 17 Sep 2019 05:37:03 -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=690Y3CiUjerxe85IfDI1Drnt7de4ahS7CH+yTFvNw94=; b=m6sHp3Cbc2mg/B0cbq2LqpGmpRZtAlspsI1wW/wbVtcZhAiaDfHo3FYHM85mhxuluL giGrAcPqaf9rkGoIvHgXhzXtDAFIL7EC3y2qXTtFirqoGhMtEtjkJFOCPTpkxZ1hPr+j ZHxNeGX0mQruPWsc+28bx2QtZOMkpzfXNnhTAtb3ZB7Tq0M/n2XWGxoRK565uJ/WjrcJ DUYJql750jmrbILv26dothGr+tD1upoE3PxHC9A4pcfE/kBeiYh4bG6/LWFqeQwt9Pnd oIx2cGQLAVpwQCn/b/nIiKDHU1NgJoTHz3C0wgQuIFcg9/HsuFXpBteEiDL0scuakr/Q Xv8w== 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=690Y3CiUjerxe85IfDI1Drnt7de4ahS7CH+yTFvNw94=; b=Rkg5oKmpFrJEJj5bcw+yOurFNpfbjnbKt1RF0wD9DYKPvclCr+xZO7ZpwCB75rjwpB gkFTsFMXcIMY0CveD9mJvL4kjXpF+BTthoCgtmnZHThkrwVKnK8QMW98vjhneFEwmY/H ymFXAE7IeMcIaTVkNeLVmLA1ykiDT89r+bLlZJslhye4kfo3NSwFnhQDTR55Roi9RDDd wTz5I8daMzf7rYEY2ikDki/uXxAFhYDgBpamjB1movtx/BvTeKIJy60WvBo8nd3+nCg7 DgByUTcaGn3XkIFrcZTgCDTx3zM4cr/y4XDcdDxtclKu9vyAffqiVoPw0tBbUNzZZVqy ce8Q== X-Gm-Message-State: APjAAAU2zk42hdPKeUzFvWygT37hm8prTZn2S+Y+rB6GnqHZHUkGNkCi JsuS+0iixbCreZwFm3KJGw7HGl0po5g= X-Received: by 2002:adf:f790:: with SMTP id q16mr2833789wrp.164.1568723822137; Tue, 17 Sep 2019 05:37:02 -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.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 05:37:01 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 17 Sep 2019 13:36:53 +0100 Message-Id: <20190917123655.30315-2-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 2/4] distcc: clean up the UI install logic 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 Remove the local copy of the desktop file, instead apply a patch from upstream to fix the file. This also fixes the install paths, so update the recipe. Remove glibc-specific installation as this was due to uclibc failures. Refresh and submit upstream the out-of-tree build fix. Signed-off-by: Ross Burton --- meta/recipes-devtools/distcc/distcc_3.3.3.bb | 13 +- .../distcc/files/distccmon-gnome.desktop | 12 -- .../distcc/files/fix-gnome.patch | 122 ++++++++++++++++++ .../distcc/files/separatebuilddir.patch | 42 +++--- 4 files changed, 154 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-devtools/distcc/files/distccmon-gnome.desktop create mode 100644 meta/recipes-devtools/distcc/files/fix-gnome.patch diff --git a/meta/recipes-devtools/distcc/distcc_3.3.3.bb b/meta/recipes-devtools/distcc/distcc_3.3.3.bb index 7942debec9e..d8ad498f2b4 100644 --- a/meta/recipes-devtools/distcc/distcc_3.3.3.bb +++ b/meta/recipes-devtools/distcc/distcc_3.3.3.bb @@ -15,9 +15,9 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" RRECOMMENDS_${PN} = "avahi-daemon" SRC_URI = "git://github.com/distcc/distcc.git \ + file://fix-gnome.patch \ file://separatebuilddir.patch \ file://default \ - file://distccmon-gnome.desktop \ file://distcc \ file://distcc.service" SRCREV = "4cde9bcfbda589abd842e3bbc652ce369085eaae" @@ -51,13 +51,8 @@ do_install() { install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_unitdir}/system sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service - ${DESKTOPINSTALL} -} -DESKTOPINSTALL = "" -DESKTOPINSTALL_libc-glibc () { - install -d ${D}${datadir}/distcc/ - install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ } + PACKAGES += "distcc-distmon-gnome" FILES_${PN} = " ${sysconfdir} \ @@ -67,8 +62,10 @@ FILES_${PN} = " ${sysconfdir} \ ${bindir}/distccmon-text \ ${sbindir}/update-distcc-symlinks \ ${systemd_unitdir}/system/distcc.service" + FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ - ${datadir}/distcc" + ${datadir}/applications \ + ${datadir}/pixmaps" # diff --git a/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop b/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop deleted file mode 100644 index 7b5d85ce4e2..00000000000 --- a/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Version=0.9.4 -Exec=distccmon-gnome -Name=distcc monitor -GenericName=Distributed Compile Monitor -Comment=Graphical view of distributed compile tasks -Icon=distccmon-gnome-icon -TryExec=distccmon-gnome -Terminal=false -Type=Application -Categories=GNOME;Development; -StartupNotify=true diff --git a/meta/recipes-devtools/distcc/files/fix-gnome.patch b/meta/recipes-devtools/distcc/files/fix-gnome.patch new file mode 100644 index 00000000000..f1f5ed1a9f2 --- /dev/null +++ b/meta/recipes-devtools/distcc/files/fix-gnome.patch @@ -0,0 +1,122 @@ +Upstream-Status: Backport [https://github.com/distcc/distcc/pull/319] +Signed-off-by: Ross Burton + +From 2faacc2be8d7eeee0a3f66d88fedd1d3ab11070e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sat, 8 Dec 2018 12:50:07 +0100 +Subject: [PATCH] Fix desktop spec compliance of distccmon-gnome install + +Update the .desktop file and install rules for distccmon-gnome to +conform to the freedesktop.org specifications. More specifically: + +- update to version 1.0 of the spec +- remove obsolete 'Encoding' key +- remove obsolete 'Application' category and add recommended 'GTK' +- install icon file to the correct directory +- strip suffix from desktop file (specifying it is deprecated) +- while at it, remove redundant '-icon' from the filename +- install desktop file to the correct directory +--- + Makefile.in | 18 ++++++++++-------- + gnome/distccmon-gnome.desktop | 7 +++---- + ...mon-gnome-icon.png => distccmon-gnome.png} | Bin + src/mon-gnome.c | 2 +- + 4 files changed, 14 insertions(+), 13 deletions(-) + rename gnome/{distccmon-gnome-icon.png => distccmon-gnome.png} (100%) + +diff --git a/Makefile.in b/Makefile.in +index 6e1e467..1106559 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -52,13 +52,14 @@ mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include + docdir = @docdir@ +-pkgdatadir = $(datadir)/@PACKAGE_NAME@ ++icondir = $(datarootdir)/pixmaps ++desktopdir = $(datarootdir)/applications + + include_server_builddir = $(builddir)/_include_server + + # These must be done from here, not from autoconf, because they can + # contain variable expansions written in Make syntax. Ew. +-DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" ++DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" + + # arguments to pkgconfig + GNOME_PACKAGES = @GNOME_PACKAGES@ +@@ -387,7 +388,7 @@ man_HTML = man/distcc_1.html man/distccd_1.html man/distccmon_text_1.html \ + man/lsdistcc_1.html man/pump_1.html man/include_server_1.html + MEN = $(man1_MEN) + +-gnome_data = gnome/distccmon-gnome-icon.png \ ++gnome_data = gnome/distccmon-gnome.png \ + gnome/distccmon-gnome.desktop + + popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ +@@ -1033,7 +1034,8 @@ showpaths: + @echo " programs $(DESTDIR)$(bindir)" + @echo " sbin programs $(DESTDIR)$(sbindir)" + @echo " system configuration $(DESTDIR)$(sysconfdir)" +- @echo " shared data files $(DESTDIR)$(pkgdatadir)" ++ @echo " icon file $(DESTDIR)$(icondir)" ++ @echo " application file $(DESTDIR)$(desktopdir)" + + + # install-sh can't handle multiple arguments, but we don't need any +@@ -1129,10 +1131,10 @@ install-example: $(example_DOCS) + done + + install-gnome-data: $(gnome_data) +- $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" +- for p in $(gnome_data); do \ +- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ +- done ++ $(mkinstalldirs) "$(DESTDIR)$(icondir)" ++ $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" ++ $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" ++ $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" + + install-conf: $(conf_files) $(default_files) + $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" +diff --git a/gnome/distccmon-gnome.desktop b/gnome/distccmon-gnome.desktop +index bd1fa26..7205f5e 100644 +--- a/gnome/distccmon-gnome.desktop ++++ b/gnome/distccmon-gnome.desktop +@@ -1,6 +1,5 @@ + [Desktop Entry] +-Version=0.9.4 +-Encoding=UTF-8 ++Version=1.0 + Exec=distccmon-gnome + Name=distcc monitor + Name[sv]=distcc övervakare +@@ -8,9 +7,9 @@ GenericName=Distributed Compile Monitor + GenericName[sv]=Distribuerad kompilerings-övervakare + Comment=Graphical view of distributed compile tasks + Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter +-Icon=distccmon-gnome-icon.png ++Icon=distccmon-gnome + TryExec=distccmon-gnome + Terminal=false + Type=Application +-Categories=GNOME;Application;Development; ++Categories=GNOME;GTK;Development; + StartupNotify=true +diff --git a/gnome/distccmon-gnome-icon.png b/gnome/distccmon-gnome.png +similarity index 100% +rename from gnome/distccmon-gnome-icon.png +rename to gnome/distccmon-gnome.png +diff --git a/src/mon-gnome.c b/src/mon-gnome.c +index 24681d0..bfc286d 100644 +--- a/src/mon-gnome.c ++++ b/src/mon-gnome.c +@@ -599,7 +599,7 @@ static GtkWidget * dcc_gnome_make_mainwin (void) + + #if GTK_CHECK_VERSION(2,2,0) + gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), +- PKGDATADIR "/distccmon-gnome-icon.png", ++ ICONDIR "/distccmon-gnome.png", + NULL); + #endif + diff --git a/meta/recipes-devtools/distcc/files/separatebuilddir.patch b/meta/recipes-devtools/distcc/files/separatebuilddir.patch index 7580b5584bc..0a251e6294e 100644 --- a/meta/recipes-devtools/distcc/files/separatebuilddir.patch +++ b/meta/recipes-devtools/distcc/files/separatebuilddir.patch @@ -1,21 +1,33 @@ -When building with a separate build directory, make install fails, -unable to find the gnome_data files. This patch corrects the -patch and ensures the build works in this case. +Upstream-Status: Submitted [https://github.com/distcc/distcc/pull/363] +Signed-off-by: Ross Burton -RP 2013/3/8 +From 469628ee8dc90c7162d1a850c0b179b7349f9cf3 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 17 Sep 2019 13:04:22 +0100 +Subject: [PATCH] Makefile.in: fix out-of-tree builds when the GNOME UI is + enabled -Upstream-Status: Pending +The install command doesn't use $(srcdir) so out-of-tree builds fail. -Index: git/Makefile.in -=================================================================== ---- git.orig/Makefile.in -+++ git/Makefile.in -@@ -1117,7 +1117,7 @@ install-example: $(example_DOCS) +Signed-off-by: Ross Burton +--- + Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 123054f..b9ce974 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1130,8 +1130,8 @@ install-example: $(example_DOCS) install-gnome-data: $(gnome_data) - $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" - for p in $(gnome_data); do \ -- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ -+ $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ - done + $(mkinstalldirs) "$(DESTDIR)$(icondir)" + $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" +- $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" +- $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" ++ $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" ++ $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" install-conf: $(conf_files) $(default_files) + $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" +-- +2.20.1 From patchwork Tue Sep 17 12:36:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 173892 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1067568ill; Tue, 17 Sep 2019 05:37:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqyozZvSBsU9ORYg3dTdWtMmJhgajlTKLyt581bgmgSPlZpYnIKwHwnd1WcK3Jd44OjdFVe8 X-Received: by 2002:aa7:9e50:: with SMTP id z16mr4072066pfq.83.1568723854009; Tue, 17 Sep 2019 05:37:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568723854; cv=none; d=google.com; s=arc-20160816; b=VhKegP/XbrMgg+j6Yjt2f/cgGTqTb3Wj5rKaNA+ra1xWKJF7F5PBVEU5ZTa/v6jVkG HEm7dKAnGS8hEgXyiSMMxtIRzzKyE6KUIaqzQ3uvrnHZsEvT0Hm142hl69v5KYwLIbzK lbS8XTJOqAzfBPAFaHCFUPbaqSJK/TCmDIP0yqtjrG+zFCumG1hCINtqrm6Oxe6OTzAw GoSEfQQrLsOikEVMXe6pmfb5tZqFRKLOW3pXQ5zVWyvHVLyuFJwjo91Pu1GYHOFtlvnY qj+evR/l7u4/aOJF86SpfhLMbv4ASIn5dFuSKtfbM93k6+7kPSzZhsQFq2LWFKTbaOvw N2Rg== 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=mUbb3PW4BPTEPrT8VHD2XRLZI8dGoWkLJKFGMI7KZ+o=; b=UBWDt+87Qi1S/yR7tJjV4D16Tr0grm3RiAq/IXEVGe9uSpRvEODUwnFAApiQBOGY2h J95a6zOD1nCRPDgkKZEIlnd68pLpB0rOyY4Llc8zq2lOhimqY9Hfl+MRAVWJDsxB8E4L DUPwfC2HuoQQz9UYO4hH/vZtq6eBQ7QTzUxIT+LzZplw4FfKYyjZwu/gkIY6aDplKSqu qn0QFy9hECRJ7LCePEzz1yKr0cU1cSEqsoScc0l8CoF5IBUqaoNa6BAUkAQh2g72z4v7 nOKJMop7MUDvMD9fCbrO7XrH+rPMg7ijv/CXKM5fIeTMlp3DdODU3lZB6qPdc+c2C+m4 oG6w== 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=n4O72guD; 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 q22si1560205pgv.129.2019.09.17.05.37.33; Tue, 17 Sep 2019 05:37:33 -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=n4O72guD; 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 83A517F76D; Tue, 17 Sep 2019 12:37:26 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mail.openembedded.org (Postfix) with ESMTP id 58DDA7F511 for ; Tue, 17 Sep 2019 12:37:03 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id l3so2969122wru.7 for ; Tue, 17 Sep 2019 05:37:04 -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=o/JymHSja4o5mwbXay9zSL3mTnwM7c0NW69jGXXdwjE=; b=n4O72guDlHSOCvtalaNdZMuT76lQr8XGo2piOykgJUUTcOMhFLYGzKig346jrJt1XA WRLTSDoeSWdWlbXp9wWLaXt+M/3bPKbNOAN7m6x7pR3aYHsaRy132ta/Tkhozwqr0UZi iRF1sCWcybOkiuwYiyMyY59p4II4Jho85zvsySuATs/VNeMREViDBa6ZSAKBCoBPnIwD 3uOdhoROVxB3FF2m3LBasqAPDQ84cYNCT5iDFNpeds9VPTUOyG5/PYwlxMCDYIW1M8zW fk9BKpWl6lvmoejx/qUOO2gGkykxFYay0VvtJamavw+hOcp5EUfBDy5ffXe6XJwktbXg mlfQ== 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=o/JymHSja4o5mwbXay9zSL3mTnwM7c0NW69jGXXdwjE=; b=NpezZA2w1D7sluo3WcopyG4VdesS36sY0zXTtrakzIhEogRV37cJn/pzdf772JmxqO ZmZv6boL4zJIvbdyn9etIly/OVhctbxcB/NxL+ZLlheLdnIIU4xMgLEUcKktIuja/4tV z+yFjTWvT06SzYWoshPEWYpAHDTLLJ1k0WTdh2VcQZSxf6fty2VCbmpe1T0NMBh04KmQ nvG0+A2g2cPLgZOe3XADPmCVZIqB3cITkM+HMN+/JKFVvzG8HT7ehEEtbLryDWe4Y41L wBooc2JiKh50CK4O4OeRMdZPkDnS882Uwk3a2kuWewKDmvQG6/NuZpSi7Xnt0yEQbfgV CDfw== X-Gm-Message-State: APjAAAXHBOxCwBm7mzH9JKX+jAD5yH+VwIJvsv/oiKxv7qOW11RwMJmq BgNRJ0DyUixcOdXwO62Jz5ek2jwyrjc= X-Received: by 2002:adf:f081:: with SMTP id n1mr2801814wro.273.1568723823792; Tue, 17 Sep 2019 05:37:03 -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.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 05:37:02 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 17 Sep 2019 13:36:54 +0100 Message-Id: <20190917123655.30315-3-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 3/4] distcc: use --enable-tcp-insecure instead of --make-me-a-botnet 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 --make-me-a-botnet is worrying, --enable-tcp-insecure is clearer and doesn't scare people glancing at 'ps'. Signed-off-by: Ross Burton --- meta/recipes-devtools/distcc/files/default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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/files/default b/meta/recipes-devtools/distcc/files/default index e5ca68b8561..a5bc13ecf33 100644 --- a/meta/recipes-devtools/distcc/files/default +++ b/meta/recipes-devtools/distcc/files/default @@ -21,4 +21,4 @@ ALLOWEDNETS="127.0.0.1" # # OPTIONS is used for the systemd service file # -OPTIONS="--allow 127.0.0.1 --make-me-a-botnet" +OPTIONS="--allow 127.0.0.1 --enable-tcp-insecure" 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"