From patchwork Mon Jun 24 15:45:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Faith X-Patchwork-Id: 1121408 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=impinj.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=impinj.com header.i=@impinj.com header.b="NNAP+erV"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45XYj13t07z9s5c for ; Tue, 25 Jun 2019 01:52:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E8C0785C4C; Mon, 24 Jun 2019 15:52:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fevrqzTrZ3L6; Mon, 24 Jun 2019 15:52:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6468884C53; Mon, 24 Jun 2019 15:52:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id CA3341BF285 for ; Mon, 24 Jun 2019 15:52:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C5EBD858BA for ; Mon, 24 Jun 2019 15:52:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ej6ztm0aUObr for ; Mon, 24 Jun 2019 15:52:12 +0000 (UTC) X-Greylist: delayed 00:05:09 by SQLgrey-1.7.6 Received: from us-smtp-delivery-168.mimecast.com (us-smtp-delivery-168.mimecast.com [216.205.24.168]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E3E808525D for ; Mon, 24 Jun 2019 15:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=impinj.com; s=mimecast20190405; t=1561391530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EJ8Ewl2jBZiRpQGTGtEn5h2MOMhgLhhOtfwbA93GSjs=; b=NNAP+erVHgniraSw+G4aLzr8LGCSOL7KOGEQl6fo5r++662oVVu6fk9ijtzxHCTGIM+r00 sMRClc/uM2LQkWwOz2z9hmJTWvVePpfE+nOPNRg2A3jqKLr3+BOQ0S/Q/PYtzlS6cfhTM0 empJDoS75oSzcOdBw25C+Rc8XWBco3s= Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-co1nam05lp2058.outbound.protection.outlook.com [104.47.48.58]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-64-zZMyLsvyP5G625cs_8nX8w-1; Mon, 24 Jun 2019 11:45:49 -0400 Received: from BYAPR06MB5382.namprd06.prod.outlook.com (20.178.53.75) by BYAPR06MB6373.namprd06.prod.outlook.com (20.178.51.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2008.17; Mon, 24 Jun 2019 15:45:46 +0000 Received: from BYAPR06MB5382.namprd06.prod.outlook.com ([fe80::6d54:4d0f:1e2b:612f]) by BYAPR06MB5382.namprd06.prod.outlook.com ([fe80::6d54:4d0f:1e2b:612f%5]) with mapi id 15.20.2008.017; Mon, 24 Jun 2019 15:45:46 +0000 From: John Faith To: "buildroot@buildroot.org" Thread-Topic: [PATCH 2/2] sdbusplus: new package Thread-Index: AQHVKqPjxM1j6qjQcEWd6+nP90fxMA== Date: Mon, 24 Jun 2019 15:45:45 +0000 Message-ID: <20190624154451.22199-2-jfaith@impinj.com> References: <20190624154451.22199-1-jfaith@impinj.com> In-Reply-To: <20190624154451.22199-1-jfaith@impinj.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BY5PR13CA0025.namprd13.prod.outlook.com (2603:10b6:a03:180::38) To BYAPR06MB5382.namprd06.prod.outlook.com (2603:10b6:a03:d7::11) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.19.1 x-originating-ip: [216.207.205.253] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7daec3b6-7e75-44fb-49b5-08d6f8bb05a5 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:BYAPR06MB6373; x-ms-traffictypediagnostic: BYAPR06MB6373: x-ms-exchange-purlcount: 1 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:9508; x-forefront-prvs: 007814487B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(136003)(39840400004)(396003)(346002)(366004)(189003)(199004)(76176011)(6512007)(6506007)(386003)(50226002)(4326008)(25786009)(53936002)(52116002)(107886003)(99286004)(6306002)(256004)(14444005)(478600001)(2616005)(11346002)(26005)(476003)(446003)(102836004)(186003)(68736007)(316002)(486006)(36756003)(54906003)(66066001)(2351001)(6486002)(2501003)(5640700003)(6436002)(8936002)(1730700003)(81156014)(81166006)(5660300002)(6916009)(305945005)(2906002)(71200400001)(71190400001)(3846002)(14454004)(6116002)(1076003)(7736002)(86362001)(8676002)(966005)(66946007)(66476007)(66556008)(64756008)(66446008)(73956011); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR06MB6373; H:BYAPR06MB5382.namprd06.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Dum2XhVk63mSvXOzmvKD5fYgvIe3saQFvlCoivOFn2kZHa14GTSpH3tBimm++1XqVaA5RaoPqDLLjFxCqu8m8gC1nQ70cntz+PFoCbaAYHLd/jWDwY9ZUEK8GRJxn3M0zAjtdMZoyvy/XkbSSSHTuOrnfuf4arewY6Et6rG1cwixhBqsi6Tl2Toqmc3rJThqri0XwAm4fBmOFTDzmHMl5VAmq+43Z9bYw57HpsOGqop9QzNhc7Pop1rGMUfg1hHt2ofn232lDobQjeLodT3ldwd7ai9NWjL6vWaXAxAR+BqnaLwpUSeXkNHaaYCLCKFTh4GExExE79KBtFgK5PHbcHw8EYCix9bJX0pvITJkXYBHleIE1xNghysZOkLJXK1Y2qQFdplSeLkFvvVt30RkP93j8zkSUp9C2C9HN1xAiDg= MIME-Version: 1.0 X-OriginatorOrg: impinj.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7daec3b6-7e75-44fb-49b5-08d6f8bb05a5 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jun 2019 15:45:46.2452 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 6de70f0f-7357-4529-a415-d8cbb7e93e5e X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: jfaith@impinj.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR06MB6373 X-MC-Unique: zZMyLsvyP5G625cs_8nX8w-1 X-Mimecast-Spam-Score: 0 Subject: [Buildroot] [PATCH 2/2] sdbusplus: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Faith , Trent Piepho , Asaf Kahlon Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Trent Piepho A C++ library for interacting with sd-bus and a C++ bindings generator. The host build produces a code generation tool, sdbus++ while the target build gives libsdbusplus. The target build of sdbusplus tries to use the code generator tool, which we do not build for the target, to build an example program. Disable the examples to fix this. The code generator requires host-python-pyyaml, since this isn't built on the target, the target build does not require python-pyyaml. The host package includes a code and documentation generation program, which is useful for including in a buildroot SDK, even if no target packages built need it. So make it a selected host package. Signed-off-by: John Faith Signed-off-by: Trent Piepho --- DEVELOPERS | 1 + package/Config.in | 1 + package/Config.in.host | 1 + ...x-example-build-with-disable-sdbuspp.patch | 42 +++++++++++++++++++ package/sdbusplus/Config.in | 12 ++++++ package/sdbusplus/Config.in.host | 10 +++++ package/sdbusplus/sdbusplus.hash | 2 + package/sdbusplus/sdbusplus.mk | 21 ++++++++++ 8 files changed, 90 insertions(+) create mode 100644 package/sdbusplus/0001-build-Fix-example-build-with-disable-sdbuspp.patch create mode 100644 package/sdbusplus/Config.in create mode 100644 package/sdbusplus/Config.in.host create mode 100644 package/sdbusplus/sdbusplus.hash create mode 100644 package/sdbusplus/sdbusplus.mk diff --git a/DEVELOPERS b/DEVELOPERS index e9c521f400..08ef4f74eb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1176,6 +1176,7 @@ F: package/dhcpcd/ N: John Faith F: package/python-inflection/ +F: package/sdbusplus/ N: Jonathan Ben Avraham F: arch/Config.in.xtensa diff --git a/package/Config.in b/package/Config.in index d501b5a65b..73aeed26a1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -513,6 +513,7 @@ endmenu source "package/rtl8723bu/Config.in" source "package/rtl8821au/Config.in" source "package/sane-backends/Config.in" + source "package/sdbusplus/Config.in" source "package/sdparm/Config.in" source "package/sedutil/Config.in" source "package/setserial/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 1501889b72..835dd04237 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -61,6 +61,7 @@ menu "Host utilities" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" + source "package/sdbusplus/Config.in.host" source "package/squashfs/Config.in.host" source "package/sunxi-tools/Config.in.host" source "package/swig/Config.in.host" diff --git a/package/sdbusplus/0001-build-Fix-example-build-with-disable-sdbuspp.patch b/package/sdbusplus/0001-build-Fix-example-build-with-disable-sdbuspp.patch new file mode 100644 index 0000000000..1262ced0f2 --- /dev/null +++ b/package/sdbusplus/0001-build-Fix-example-build-with-disable-sdbuspp.patch @@ -0,0 +1,42 @@ +From c5d5a94f8e554f160e3f120b826e97b2961e2706 Mon Sep 17 00:00:00 2001 +From: Trent Piepho +Date: Mon, 14 May 2018 16:17:38 -0700 +Subject: [PATCH] build: Fix example build with --disable-sdbuspp + +The calculator server examples uses the sdbus++ python program to build. +If this has been disabled, then trying to use it to build the example +could fail. For instance, if python and all necessary python packages +are not available. This might be the case when cross building the only +the library component for a target system. + +Don't build the calculator example when sdbus++ has been disabled. + +Signed-off-by: Trent Piepho +--- + example/Makefile.am | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/example/Makefile.am b/example/Makefile.am +index 2cf8941..b0c3a4f 100644 +--- a/example/Makefile.am ++++ b/example/Makefile.am +@@ -1,4 +1,7 @@ +-noinst_PROGRAMS = calculator-server list-users ++noinst_PROGRAMS = list-users ++ ++if WANT_SDBUSPP ++noinst_PROGRAMS += calculator-server + + calculator_server_generated_files = \ + net/poettering/Calculator/server.hpp \ +@@ -8,6 +11,7 @@ calculator_server_generated_files = \ + + calculator_markdown_generated_files = \ + calculator.md ++endif + + calculator_server_SOURCES = \ + calculator-server.cpp $(calculator_server_generated_files) +-- +2.14.3 + diff --git a/package/sdbusplus/Config.in b/package/sdbusplus/Config.in new file mode 100644 index 0000000000..578d2d5bd7 --- /dev/null +++ b/package/sdbusplus/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_SDBUSPLUS + bool "sdbusplus" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_HOST_PKGCONF + help + A C++ library for sd-bus with a bindings and doc generator. + + This will build the target library. See the host package for + the bindings and documentation generation program. + + https://github.com/openbmc/sdbusplus diff --git a/package/sdbusplus/Config.in.host b/package/sdbusplus/Config.in.host new file mode 100644 index 0000000000..03f55c4c4f --- /dev/null +++ b/package/sdbusplus/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_SDBUSPLUS + bool "host-sdbusplus" + select BR2_PACKAGE_HOST_PKGCONF + help + A C++ library for sd-bus with a bindings and doc generator. + + This will be the host side generation tool for bindings and + documentation. + + https://github.com/openbmc/sdbusplus diff --git a/package/sdbusplus/sdbusplus.hash b/package/sdbusplus/sdbusplus.hash new file mode 100644 index 0000000000..5b616970d5 --- /dev/null +++ b/package/sdbusplus/sdbusplus.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9136215c5fc849c33555db4210f17d844864c1b0790fe35026d594af965aa09d sdbusplus-28dc36d509ba8f77ffb5726cc7d5f0184f8054b1.tar.gz diff --git a/package/sdbusplus/sdbusplus.mk b/package/sdbusplus/sdbusplus.mk new file mode 100644 index 0000000000..b1b3d5c138 --- /dev/null +++ b/package/sdbusplus/sdbusplus.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# sdbusplus +# +################################################################################ + +SDBUSPLUS_VERSION = 28dc36d509ba8f77ffb5726cc7d5f0184f8054b1 +SDBUSPLUS_SITE = $(call github,openbmc,sdbusplus,$(SDBUSPLUS_VERSION)) +SDBUSPLUS_DEPENDENCIES = host-autoconf-archive host-pkgconf systemd +HOST_SDBUSPLUS_DEPENDENCIES = host-autoconf-archive host-pkgconf \ + $(PKG_PYTHON_HOST_PYTHON) host-python-inflection host-python-mako host-python-pyyaml +SDBUSPLUS_CONF_OPTS = --disable-sdbuspp +HOST_SDBUSPLUS_CONF_OPTS = --disable-libsdbusplus +SDBUSPLUS_AUTORECONF = YES +SDBUSPLUS_AUTORECONF_OPTS = --include=$(HOST_DIR)/usr/share/autoconf-archive +SDBUSPLUS_INSTALL_STAGING = YES +SDBUSPLUS_LICENSE = Apache-2.0 +SDBUSPLUS_LICENSE_FILES = LICENSE + +$(eval $(autotools-package)) +$(eval $(host-autotools-package))