From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B304C433EF for ; Wed, 15 Sep 2021 20:00:25 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB2C26105A for ; Wed, 15 Sep 2021 20:00:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DB2C26105A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=free.fr Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.buildroot.org Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A4E63401DF; Wed, 15 Sep 2021 20:00:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Lhy5mOUJEb5b; Wed, 15 Sep 2021 20:00:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 7B44340129; Wed, 15 Sep 2021 20:00:22 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 580641BF30F for ; Wed, 15 Sep 2021 20:00:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 467B040129 for ; Wed, 15 Sep 2021 20:00:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f0npyNvph7cu for ; Wed, 15 Sep 2021 20:00:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [IPv6:2a01:e0c:1:1599::11]) by smtp2.osuosl.org (Postfix) with ESMTPS id F02CA40124 for ; Wed, 15 Sep 2021 20:00:18 +0000 (UTC) Received: from ymorin.is-a-geek.org (unknown [IPv6:2a01:cb19:8b51:cb00:2c:c310:297c:8ffe]) (Authenticated sender: yann.morin.1998@free.fr) by smtp2-g21.free.fr (Postfix) with ESMTPSA id F0D442003C3; Wed, 15 Sep 2021 22:00:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1631736015; bh=CJDlSNoWcMVHKL7txUcW/7uOAvUhUhHJ8VmcHKSJhsw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=pFmJsCa51lRK82gcrAd1ETgiSK6MxaSaHcW/Bg1ksJvnTn2AnDcUzI2447Yh2IHlR qR1wXgHF6UmxnCj3ldTetxWVusL25u18rJS/U1YawNXa4Cx520A9m/Tq6b8rHJ5jf+ LG/9IPqx78phcFFq2VwdaMZPs6SJcyaWcpGB2OtNErknZHAUl6JN8NJMCObJ8J+Ukc IdAPpIZ91SLG2LgroBxTV+UNbHAeqf+T4t8TIpCXac3x5xYO5Iv4AqDMiBDFdTOYxo MXhLPPplCtlQ94sSMGalGTUM4GIIaELiNy2XIJfSU1s+DFW5DRHH7xFTIEIrkOWTrn nx8i6JdRrQv6w== Received: by ymorin.is-a-geek.org (sSMTP sendmail emulation); Wed, 15 Sep 2021 22:00:08 +0200 Date: Wed, 15 Sep 2021 22:00:08 +0200 From: "Yann E. MORIN" To: Fabrice Fontaine Message-ID: <20210915200008.GS1053080@scaer> References: <20210913203406.3877994-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210913203406.3877994-1-fontaine.fabrice@gmail.com> User-Agent: Mutt/1.5.22 (2013-10-16) Subject: Re: [Buildroot] [PATCH 1/1] package/polkit: drop dbus build dependency X-BeenThere: buildroot@lists.buildroot.org 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: Marek Belisko , buildroot@buildroot.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" Fabrice, All, On 2021-09-13 22:34 +0200, Fabrice Fontaine spake thusly: > Drop dbus build dependency to avoid the following build failure since > commit 1db13226394ff7e6f5e7ca643e275f35d6c633bb if systemd-polkit is > enabled: > > package/dbus/dbus.mk:124: *** Recursive variable 'DBUS_FINAL_RECURSIVE_DEPENDENCIES' references itself (eventually). Stop. > > Fixes: > - http://autobuild.buildroot.org/results/0e038fae0f5fc2db3e85be05db4612e4f2395e35 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...t-computation-of-dbus-data-directory.patch | 35 ++++++++++++++++ > ...Don-t-require-dbus-development-files.patch | 42 +++++++++++++++++++ > package/polkit/Config.in | 2 +- > package/polkit/polkit.mk | 2 +- > 4 files changed, 79 insertions(+), 2 deletions(-) > create mode 100644 package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch > create mode 100644 package/polkit/0004-build-Don-t-require-dbus-development-files.patch > > diff --git a/package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch b/package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch > new file mode 100644 > index 0000000000..7fce2e10a5 > --- /dev/null > +++ b/package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch > @@ -0,0 +1,35 @@ > +From 9fa097f4dde92a0c1675400228b4cb965ed3e123 Mon Sep 17 00:00:00 2001 > +From: Simon McVittie > +Date: Thu, 3 Jun 2021 18:55:29 +0100 > +Subject: [PATCH] build: Remove redundant computation of dbus data directory > + > +We were asking pkg-config "if I define ${datadir} to pk_prefix/pk_datadir, > +what would ${datadir} be?" but the answer is obviously always going to be > +pk_prefix/pk_datadir. > + > +Signed-off-by: Simon McVittie > + > +[Retrieved (and slightly updated for duktape fork) from: > +https://gitlab.freedesktop.org/polkit/polkit/-/commit/9fa097f4dde92a0c1675400228b4cb965ed3e123] > +Signed-off-by: Fabrice Fontaine > +--- > + meson.build | 3 +-- > + 1 file changed, 1 insertion(+), 2 deletions(-) > + > +diff --git a/meson.build b/meson.build > +index 6a6799e..03a7683 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -136,8 +136,7 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin > + endif > + > + dbus_dep = dependency('dbus-1') > +-dbus_confdir = dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', pk_prefix / pk_datadir]) #changed from sysconfdir with respect to commit#8eada3836465838 > +-dbus_policydir = dbus_confdir / 'dbus-1/system.d' > ++dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d' > + dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) > + > + # check OS > +-- > +GitLab > + > diff --git a/package/polkit/0004-build-Don-t-require-dbus-development-files.patch b/package/polkit/0004-build-Don-t-require-dbus-development-files.patch > new file mode 100644 > index 0000000000..1b7adbf67f > --- /dev/null > +++ b/package/polkit/0004-build-Don-t-require-dbus-development-files.patch > @@ -0,0 +1,42 @@ > +From 4bb2157adae620c8b07caf5a24b177d1f90f2fbb Mon Sep 17 00:00:00 2001 > +From: Simon McVittie > +Date: Thu, 3 Jun 2021 18:57:00 +0100 > +Subject: [PATCH] build: Don't require dbus development files > + > +We don't actually need libdbus, only the dbus-daemon's installation > +directory for system services, which in practice is always going to be > +/usr/share/dbus-1/system-services. > + > +Signed-off-by: Simon McVittie > + > +[Retrieved (and slightly updated for duktape fork) from: > +https://gitlab.freedesktop.org/polkit/polkit/-/commit/4bb2157adae620c8b07caf5a24b177d1f90f2fbb] > +Signed-off-by: Fabrice Fontaine > +--- > + meson.build | 9 +++++++-- > + 1 file changed, 7 insertions(+), 2 deletions(-) > + > +diff --git a/meson.build b/meson.build > +index 03a7683..539ec7a 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -135,9 +135,14 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin > + js_dep = dependency('mozjs-78') > + endif > + > +-dbus_dep = dependency('dbus-1') > ++dbus_dep = dependency('dbus-1', required: false) > + dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d' > +-dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) > ++if dbus_dep.found() > ++ dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) > ++else > ++ # libdbus development files not installed, assume a standard layout > ++ dbus_system_bus_services_dir = pk_prefix / pk_datadir / 'dbus-1' / 'system-services' > ++endif > + > + # check OS > + host_system = host_machine.system() > +-- > +GitLab > + > diff --git a/package/polkit/Config.in b/package/polkit/Config.in > index a968ee52d7..622cbbb90b 100644 > --- a/package/polkit/Config.in > +++ b/package/polkit/Config.in > @@ -5,7 +5,7 @@ config BR2_PACKAGE_POLKIT > depends on BR2_USE_MMU # libglib2, dbus > depends on BR2_USE_WCHAR # libglib2 > depends on !BR2_STATIC_LIBS # duktape > - select BR2_PACKAGE_DBUS > + select BR2_PACKAGE_DBUS # runtime > select BR2_PACKAGE_DUKTAPE > select BR2_PACKAGE_EXPAT > select BR2_PACKAGE_LIBGLIB2 > diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk > index 7d75d66ffb..ed6f1a5a8f 100644 > --- a/package/polkit/polkit.mk > +++ b/package/polkit/polkit.mk > @@ -12,7 +12,7 @@ POLKIT_CPE_ID_VENDOR = polkit_project > POLKIT_INSTALL_STAGING = YES > > POLKIT_DEPENDENCIES = \ > - dbus duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) > + duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) > > POLKIT_LDFLAGS = $(TARGET_NLS_LIBS) > > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot@lists.buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@lists.buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot