[Buildroot] [PATCH 1/1] Revert "package/polkit: switch to meson-package"

Yann E. MORIN yann.morin.1998 at free.fr
Mon Sep 13 19:23:18 UTC 2021


On 2021-09-12 23:30 +0200, Fabrice Fontaine spake thusly:
> This reverts commit 1db13226394ff7e6f5e7ca643e275f35d6c633bb which
> raises the following build failure if systemd-polkit is enabled
> because dbus was added to POLKIT_DEPENDENCIES:
> 
> package/dbus/dbus.mk:124: *** Recursive variable 'DBUS_FINAL_RECURSIVE_DEPENDENCIES' references itself (eventually).  Stop.

This is because dbus is a new dependency with the conversion to meson.

But on fact, upstream has already dropped that dependency:

    https://gitlab.freedesktop.org/polkit/polkit/-/commit/4bb2157adae620c8b07caf5a24b177d1f90f2fbb

So, I think we could keep a meson package [0], backport that patch from
upstream, ask Adam to update his duktape-based fork and do a new
release, perhaprs? ;-]

Fabrice, can you test and send the backport if it works?

Regards,
Yann E. MORIN.

> This commit can be safely reverted as commit
> 8dda79970661090f202e1f20e5982ba53fdaeb95 will fix the autotools build
> failure with gobject-introspection
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/0e038fae0f5fc2db3e85be05db4612e4f2395e35
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ---
>  ...02-Improve-meson_post_install-script.patch | 124 ------------------
>  package/polkit/Config.in                      |   2 +-
>  package/polkit/polkit.mk                      |  27 ++--
>  3 files changed, 17 insertions(+), 136 deletions(-)
>  delete mode 100644 package/polkit/0002-Improve-meson_post_install-script.patch
> 
> diff --git a/package/polkit/0002-Improve-meson_post_install-script.patch b/package/polkit/0002-Improve-meson_post_install-script.patch
> deleted file mode 100644
> index 932bf88f59..0000000000
> --- a/package/polkit/0002-Improve-meson_post_install-script.patch
> +++ /dev/null
> @@ -1,124 +0,0 @@
> -From 6c8022392713955c5ae0061e22b50a16a1c2252a Mon Sep 17 00:00:00 2001
> -From: Simon McVittie <smcv at collabora.com>
> -Date: Thu, 15 Jul 2021 12:36:05 +0000
> -Subject: [PATCH] Improve meson_post_install script
> -
> -[Retrieved from:
> -https://gitlab.freedesktop.org/polkit/polkit/-/commit/6c8022392713955c5ae0061e22b50a16a1c2252a]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ----
> - .gitlab-ci.yml        |  3 +--
> - meson_post_install.py | 58 +++++++++++++++++++++++++++++++++++--------
> - 2 files changed, 49 insertions(+), 12 deletions(-)
> -
> -diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> -index 8ac3e9f..6d0abb4 100644
> ---- a/.gitlab-ci.yml
> -+++ b/.gitlab-ci.yml
> -@@ -26,8 +26,6 @@ build_stable:
> -   before_script:
> -     - dnf upgrade -y --nogpgcheck fedora-release fedora-repos*
> -     - dnf update -y && dnf install -y $DEPENDENCIES
> --    - getent group polkitd >/dev/null || groupadd -r polkitd
> --    - getent passwd polkitd >/dev/null || useradd -r -g polkitd -d / -s /sbin/nologin -c "User for polkitd" polkitd
> - 
> -   script:
> -     - meson setup 
> -@@ -43,6 +41,7 @@ build_stable:
> -     - meson compile -C builddir
> -     - meson test    -C builddir
> -     - meson install -C builddir
> -+    - DESTDIR=$(pwd)/DESTDIR meson install -C builddir
> -   artifacts:
> -     name: 'test logs'
> -     when: 'always'
> -diff --git a/meson_post_install.py b/meson_post_install.py
> -index 0a0fccf..0ab7469 100644
> ---- a/meson_post_install.py
> -+++ b/meson_post_install.py
> -@@ -1,20 +1,44 @@
> - #!/usr/bin/env python3
> - 
> --import getpass
> - import os
> - import pwd
> - import sys
> - 
> -+destdir = os.environ.get('DESTDIR')
> - prefix = os.environ['MESON_INSTALL_DESTDIR_PREFIX']
> - 
> --bindir = os.path.join(prefix, sys.argv[1])
> --pkgdatadir = os.path.join(prefix, sys.argv[2])
> --pkglibdir = os.path.join(prefix, sys.argv[3])
> --pkgsysconfdir = os.path.join(prefix, sys.argv[4])
> -+def destdir_path(p):
> -+    if os.path.isabs(p):
> -+        if destdir is None:
> -+            return p
> -+        else:
> -+            return os.path.join(destdir, os.path.relpath(p, '/'))
> -+    else:
> -+        return os.path.join(prefix, p)
> - 
> --polkitd_uid = pwd.getpwnam(sys.argv[5]).pw_uid
> -+bindir = destdir_path(sys.argv[1])
> -+pkgdatadir = destdir_path(sys.argv[2])
> -+pkglibdir = destdir_path(sys.argv[3])
> -+pkgsysconfdir = destdir_path(sys.argv[4])
> -+polkitd_user = sys.argv[5]
> - 
> --os.chmod(os.path.join(bindir, 'pkexec'), 0o4775)
> -+try:
> -+    polkitd_uid = pwd.getpwnam(polkitd_user).pw_uid
> -+except KeyError:
> -+    polkitd_uid = None
> -+
> -+dst = os.path.join(bindir, 'pkexec')
> -+
> -+if os.geteuid() == 0:
> -+    os.chmod(dst, 0o4755)
> -+    os.chown(dst, 0, -1)
> -+else:
> -+    print(
> -+        'Owner and mode of {} need to be setuid root (04755) after '
> -+        'installation'.format(
> -+            dst,
> -+        )
> -+    )
> - 
> - dst_dirs = [
> -     os.path.join(pkgsysconfdir, 'rules.d'),
> -@@ -24,13 +48,27 @@ dst_dirs = [
> - for dst in dst_dirs:
> -     if not os.path.exists(dst):
> -         os.makedirs(dst, mode=0o700)
> --        if getpass.getuser() == "root":
> -+        if os.geteuid() == 0 and polkitd_uid is not None:
> -             os.chown(dst, polkitd_uid, -1)
> -+        else:
> -+            print(
> -+                'Owner of {} needs to be set to {} after installation'.format(
> -+                    dst, polkitd_user,
> -+                )
> -+            )
> - 
> - # polkit-agent-helper-1 need to be setuid root because it's used to
> - # authenticate not only the invoking user, but possibly also root
> - # and/or other users.
> - dst = os.path.join(pkglibdir, 'polkit-agent-helper-1')
> --os.chmod(dst, 0o4755)
> --if getpass.getuser() == "root":
> -+
> -+if os.geteuid() == 0:
> -+    os.chmod(dst, 0o4755)
> -     os.chown(dst, 0, -1)
> -+else:
> -+    print(
> -+        'Owner and mode of {} need to be setuid root (04755) after '
> -+        'installation'.format(
> -+            dst,
> -+        )
> -+    )
> --- 
> -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..3a8c442dbb 100644
> --- a/package/polkit/polkit.mk
> +++ b/package/polkit/polkit.mk
> @@ -9,31 +9,36 @@ POLKIT_SITE = $(call github,aduskett,polkit-duktape,v$(POLKIT_VERSION))
>  POLKIT_LICENSE = GPL-2.0
>  POLKIT_LICENSE_FILES = COPYING
>  POLKIT_CPE_ID_VENDOR = polkit_project
> +POLKIT_AUTORECONF = YES
>  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)
> +POLKIT_CONF_ENV = \
> +	CXXFLAGS="$(TARGET_CXXFLAGS)" \
> +	LIBS=$(TARGET_NLS_LIBS)
>  
>  POLKIT_CONF_OPTS = \
> -	-Dman=false \
> -	-Dexamples=false \
> -	-Dsession_tracking=ConsoleKit \
> -	-Djs_engine=duktape
> +	--with-os-type=unknown \
> +	--disable-man-pages \
> +	--disable-examples \
> +	--disable-libelogind \
> +	--disable-libsystemd-login \
> +	--with-duktape
>  
>  ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
> -POLKIT_CONF_OPTS += -Dintrospection=true
> +POLKIT_CONF_OPTS += --enable-introspection
>  POLKIT_DEPENDENCIES += gobject-introspection
>  else
> -POLKIT_CONF_OPTS += -Dintrospection=false
> +POLKIT_CONF_OPTS += --disable-introspection
>  endif
>  
>  ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
>  POLKIT_DEPENDENCIES += linux-pam
> -POLKIT_CONF_OPTS += -Dauthfw=pam
> +POLKIT_CONF_OPTS += --with-authfw=pam
>  else
> -POLKIT_CONF_OPTS += -Dauthfw=shadow
> +POLKIT_CONF_OPTS += --with-authfw=shadow
>  endif
>  
>  # polkit.{its,loc} are needed for gvfs and must be installed in $(HOST_DIR)
> @@ -67,4 +72,4 @@ define POLKIT_INSTALL_INIT_SYSV
>  		$(TARGET_DIR)/etc/init.d/S50polkit
>  endef
>  
> -$(eval $(meson-package))
> +$(eval $(autotools-package))
> -- 
> 2.33.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at 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.  |
'------------------------------^-------^------------------^--------------------'


More information about the buildroot mailing list