GNU bug report logs -
#73428
update elogind to 255
Previous Next
Reported by: Julian Flake <flake <at> uni-koblenz.de>
Date: Sun, 22 Sep 2024 18:52:02 UTC
Severity: normal
Tags: patch
Done: Andreas Enge <andreas <at> enge.fr>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 73428 in the body.
You can then email your comments to 73428 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Sun, 22 Sep 2024 18:52:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Julian Flake <flake <at> uni-koblenz.de>
:
New bug report received and forwarded. Copy sent to
bug-guix <at> gnu.org
.
(Sun, 22 Sep 2024 18:52:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
Hi,
if possible, upgrade elogind to version 255. I (and maybe others)
have issues with `loginctl suspend`, see
https://github.com/elogind/elogind/issues/208#issuecomment-2366912746
best, nutcase
--
Dipl.-Inf. Julian Flake
University of Koblenz
Faculty 4: Computer Science
Institute for Software Technology
PB 20 16 02 | D-56016 Koblenz | Germany
Voice: +49 261 287 2787
Email: flake <at> uni-koblenz.de
https://www.uni-koblenz.de/~flake
Information forwarded
to
flake <at> uni-koblenz.de, bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Mon, 23 Sep 2024 21:45:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 73428 <at> debbugs.gnu.org (full text, mbox):
This is an update to 252.24
Change-Id: Id1ab5f26a9296238724fd9873288ef5630d0a0b5
---
gnu/packages/freedesktop.scm | 6 +-
gnu/packages/patches/elogind-fix-rpath.patch | 60 --------------------
2 files changed, 3 insertions(+), 63 deletions(-)
delete mode 100644 gnu/packages/patches/elogind-fix-rpath.patch
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 993bb84ec6..e1e5e2663c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -39,6 +39,7 @@
;;; Copyright © 2024 aurtzy <aurtzy <at> gmail.com>
;;; Copyright © 2024 Dariqq <dariqq <at> posteo.net>
;;; Copyright © 2024 Wilko Meyer <w <at> wmeyer.eu>
+;;; Copyright © 2024 Julian Flake <flake <at> uni-koblenz.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -772,7 +773,7 @@ (define-public libxdg-basedir
(define-public elogind
(package
(name "elogind")
- (version "252.9")
+ (version "252.24")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -781,8 +782,7 @@ (define-public elogind
(file-name (git-file-name name version))
(sha256
(base32
- "049cfv97975x700s7lx4p9i22nv6v7j046iwkspxba7kr5qq7akw"))
- (patches (search-patches "elogind-fix-rpath.patch"))))
+ "06hgcnhk6wbsnhkrqblw23q2x2b6bijzcnqjzfdv9xqzc94pha90"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
diff --git a/gnu/packages/patches/elogind-fix-rpath.patch b/gnu/packages/patches/elogind-fix-rpath.patch
deleted file mode 100644
index 2a76cc467f..0000000000
--- a/gnu/packages/patches/elogind-fix-rpath.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Retrieved from https://github.com/elogind/elogind/issues/258
-
-From: Mark Hindley <mark <at> hindley.org.uk>
-Date: Wed, 24 May 2023 10:39:41 +0100
-Subject: Fixup_executable_rpath
-
-./meson.build sets
-
- install_rpath : rootlibexecdir
-
-however src/shared/meson.build sets
-
-libshared = shared_library(
- [snip]
- install_dir : rootpkglibdir
- )
----
- meson.build | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 694a2fd..a575f69 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2903,7 +2903,7 @@ executable('elogind',
- dependencies : [threads,
- libacl,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootlibexecdir)
-
-@@ -2913,7 +2913,7 @@ exe = executable('loginctl',
- link_with : [libshared],
- dependencies : [threads,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootbindir)
- public_programs += [exe]
-@@ -2923,7 +2923,7 @@ exe = executable('elogind-inhibit',
- include_directories : includes,
- link_with : [libshared],
- dependencies : [threads],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootbindir)
- public_programs += [exe]
-@@ -4283,7 +4283,7 @@ executable('elogind-uaccess-command',
- libshared],
- dependencies: [libacl,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootlibexecdir)
- #endif // 0
base-commit: 41e408eb1f93d96b549d345e2de74143220b7b76
--
2.46.0
Information forwarded
to
flake <at> uni-koblenz.de, bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Mon, 23 Sep 2024 21:48:02 GMT)
Full text and
rfc822 format available.
Information forwarded
to
bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Mon, 23 Sep 2024 23:55:03 GMT)
Full text and
rfc822 format available.
Message #14 received at 73428 <at> debbugs.gnu.org (full text, mbox):
The provided patch describes a minor upgrade of elogind to 252.24. Maybe
this already solves my specific issue with `loginctl suspend` while
using sway WM.
The major update to 255.x needs more attention, since configure flags
changed different tests fail.
I don't know, how to test this from a local git worktree of guix. I can
install it from my local worktree into my ~/.guix-profile, but this is
not picked up by my operating-system, which expects the binaries in my
system's profile, I guess.
Information forwarded
to
flake <at> uni-koblenz.de, julian <at> flake.de, bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Tue, 24 Sep 2024 05:20:01 GMT)
Full text and
rfc822 format available.
Message #17 received at 73428 <at> debbugs.gnu.org (full text, mbox):
v2: two separate commits:
1. update of elogind to 252.24
2. removal of unused patch
Julian Flake (2):
gnu: elogind update to 252.24
gnu: elogind: Remove unneeded rpath patch.
gnu/local.mk | 1 -
gnu/packages/freedesktop.scm | 6 +-
gnu/packages/patches/elogind-fix-rpath.patch | 60 --------------------
3 files changed, 3 insertions(+), 64 deletions(-)
delete mode 100644 gnu/packages/patches/elogind-fix-rpath.patch
base-commit: 41e408eb1f93d96b549d345e2de74143220b7b76
--
2.46.0
Information forwarded
to
flake <at> uni-koblenz.de, julian <at> flake.de, bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Tue, 24 Sep 2024 05:20:02 GMT)
Full text and
rfc822 format available.
Message #20 received at 73428 <at> debbugs.gnu.org (full text, mbox):
Change-Id: I9697aea701dca738d6f97f7ae36c9f77b920d11a
---
gnu/packages/freedesktop.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 993bb84ec6..e1e5e2663c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -39,6 +39,7 @@
;;; Copyright © 2024 aurtzy <aurtzy <at> gmail.com>
;;; Copyright © 2024 Dariqq <dariqq <at> posteo.net>
;;; Copyright © 2024 Wilko Meyer <w <at> wmeyer.eu>
+;;; Copyright © 2024 Julian Flake <flake <at> uni-koblenz.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -772,7 +773,7 @@ (define-public libxdg-basedir
(define-public elogind
(package
(name "elogind")
- (version "252.9")
+ (version "252.24")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -781,8 +782,7 @@ (define-public elogind
(file-name (git-file-name name version))
(sha256
(base32
- "049cfv97975x700s7lx4p9i22nv6v7j046iwkspxba7kr5qq7akw"))
- (patches (search-patches "elogind-fix-rpath.patch"))))
+ "06hgcnhk6wbsnhkrqblw23q2x2b6bijzcnqjzfdv9xqzc94pha90"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
--
2.46.0
Information forwarded
to
flake <at> uni-koblenz.de, julian <at> flake.de, bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Tue, 24 Sep 2024 05:20:02 GMT)
Full text and
rfc822 format available.
Message #23 received at 73428 <at> debbugs.gnu.org (full text, mbox):
Change-Id: Id12590b45317a3d965ee4d715e696e5402de85e4
---
gnu/local.mk | 1 -
gnu/packages/patches/elogind-fix-rpath.patch | 60 --------------------
2 files changed, 61 deletions(-)
delete mode 100644 gnu/packages/patches/elogind-fix-rpath.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 8e7abc8a47..dd5d6e0c85 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1170,7 +1170,6 @@ dist_patch_DATA = \
%D%/packages/patches/elm-ghc9.2.patch \
%D%/packages/patches/elm-offline-package-registry.patch \
%D%/packages/patches/elm-reactor-static-files.patch \
- %D%/packages/patches/elogind-fix-rpath.patch \
%D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
%D%/packages/patches/emacs-elpy-dup-test-name.patch \
diff --git a/gnu/packages/patches/elogind-fix-rpath.patch b/gnu/packages/patches/elogind-fix-rpath.patch
deleted file mode 100644
index 2a76cc467f..0000000000
--- a/gnu/packages/patches/elogind-fix-rpath.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Retrieved from https://github.com/elogind/elogind/issues/258
-
-From: Mark Hindley <mark <at> hindley.org.uk>
-Date: Wed, 24 May 2023 10:39:41 +0100
-Subject: Fixup_executable_rpath
-
-./meson.build sets
-
- install_rpath : rootlibexecdir
-
-however src/shared/meson.build sets
-
-libshared = shared_library(
- [snip]
- install_dir : rootpkglibdir
- )
----
- meson.build | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 694a2fd..a575f69 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2903,7 +2903,7 @@ executable('elogind',
- dependencies : [threads,
- libacl,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootlibexecdir)
-
-@@ -2913,7 +2913,7 @@ exe = executable('loginctl',
- link_with : [libshared],
- dependencies : [threads,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootbindir)
- public_programs += [exe]
-@@ -2923,7 +2923,7 @@ exe = executable('elogind-inhibit',
- include_directories : includes,
- link_with : [libshared],
- dependencies : [threads],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootbindir)
- public_programs += [exe]
-@@ -4283,7 +4283,7 @@ executable('elogind-uaccess-command',
- libshared],
- dependencies: [libacl,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootlibexecdir)
- #endif // 0
--
2.46.0
Information forwarded
to
bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Tue, 24 Sep 2024 06:10:02 GMT)
Full text and
rfc822 format available.
Message #26 received at 73428 <at> debbugs.gnu.org (full text, mbox):
$ guix refresh elogind --list-dependent
Building the following 1680 packages would ensure 3220 dependent
packages are rebuilt [...]
Information forwarded
to
bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Tue, 24 Sep 2024 09:00:01 GMT)
Full text and
rfc822 format available.
Message #29 received at 73428 <at> debbugs.gnu.org (full text, mbox):
Hi Julian,
On 23 September 2024 21:58:46 UTC, Julian Flake <julian <at> flake.de> wrote:
>I don't know, how to test this from a local git worktree of guix. I can
>install it from my local worktree into my ~/.guix-profile
However you're installing it from your local checkout should also work for reconfiguring your system, e.g., with ./pre-inst-env.
If it doesn't, you need to make sure that your privilege escalation mechanisb (sudo?) isn't clobbering your environment (guix shell?).
Kind regards,
T G-R
Sent on the go. Excuse or enjoy my brevity.
Information forwarded
to
bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Tue, 24 Sep 2024 09:02:01 GMT)
Full text and
rfc822 format available.
Information forwarded
to
bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Tue, 24 Sep 2024 09:03:02 GMT)
Full text and
rfc822 format available.
Message #35 received at submit <at> debbugs.gnu.org (full text, mbox):
...or, if you need additional channels or can't get this to work, you can commit your changes, replace the guix channel URL with "file:///home/your/guix", guix pull --{allow-downgrades,disable-authentication}, and reconfigure as you would otherwise.
Kind regards,
T G-R
Sent on the go. Excuse or enjoy my brevity.
Information forwarded
to
bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Tue, 24 Sep 2024 09:03:02 GMT)
Full text and
rfc822 format available.
Information forwarded
to
bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Tue, 24 Sep 2024 10:36:01 GMT)
Full text and
rfc822 format available.
Message #41 received at submit <at> debbugs.gnu.org (full text, mbox):
Hi,
> ...or, if you need additional channels or can't get this to
> work, you
> can commit your changes, replace the guix channel URL with
> "file:///home/your/guix", guix pull
> --{allow-downgrades,disable-authentication}, and reconfigure as
> you
> would otherwise.
that's actually exactly, what I started this morning. Building all
the packages takes a lot of time (and is still running), of
course.
Information forwarded
to
bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Tue, 24 Sep 2024 10:36:02 GMT)
Full text and
rfc822 format available.
Information forwarded
to
bug-guix <at> gnu.org
:
bug#73428
; Package
guix
.
(Tue, 24 Sep 2024 19:30:03 GMT)
Full text and
rfc822 format available.
Message #47 received at 73428 <at> debbugs.gnu.org (full text, mbox):
Can we use some branch at the QA / Build server for testing, if
all dependent packages actually build with this 252.24 patch?
Added tag(s) patch.
Request was from
Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
to
control <at> debbugs.gnu.org
.
(Thu, 26 Sep 2024 02:34:02 GMT)
Full text and
rfc822 format available.
bug reassigned from package 'guix' to 'guix-patches'.
Request was from
Ludovic Courtès <ludo <at> gnu.org>
to
control <at> debbugs.gnu.org
.
(Mon, 30 Sep 2024 20:58:02 GMT)
Full text and
rfc822 format available.
Information forwarded
to
guix-patches <at> gnu.org
:
bug#73428
; Package
guix-patches
.
(Mon, 30 Sep 2024 21:10:02 GMT)
Full text and
rfc822 format available.
Message #54 received at 73428 <at> debbugs.gnu.org (full text, mbox):
> > ...or, if you need additional channels or can't get this to
> > work, you
> > can commit your changes, replace the guix channel URL with
> > "file:///home/your/guix", guix pull
> > --{allow-downgrades,disable-authentication}, and reconfigure as
> > you
> > would otherwise.
>
> that's actually exactly, what I started this morning. Building all
> the packages takes a lot of time (and is still running), of
> course.
I had to interrupt the local build after some time and after some
successful package buildd, since it started rebuilding chromium,
libreoffice and other packages that would take too much time on my day job machine.
Therefore, it would be great, if check building the dependents could be
offloaded to qa.guix.gnu.org (or similar?). How is that triggerd? The "patch" tag
does not trigger that, right?
Best Regards,
Julian
Information forwarded
to
guix-patches <at> gnu.org
:
bug#73428
; Package
guix-patches
.
(Wed, 02 Oct 2024 00:53:01 GMT)
Full text and
rfc822 format available.
Message #57 received at 73428 <at> debbugs.gnu.org (full text, mbox):
Hi Julian,
Julian Flake <julian <at> flake.de> writes:
>> > ...or, if you need additional channels or can't get this to
>> > work, you
>> > can commit your changes, replace the guix channel URL with
>> > "file:///home/your/guix", guix pull
>> > --{allow-downgrades,disable-authentication}, and reconfigure as
>> > you
>> > would otherwise.
>>
>> that's actually exactly, what I started this morning. Building all
>> the packages takes a lot of time (and is still running), of
>> course.
>
> I had to interrupt the local build after some time and after some
> successful package buildd, since it started rebuilding chromium,
> libreoffice and other packages that would take too much time on my day job machine.
>
> Therefore, it would be great, if check building the dependents could be
> offloaded to qa.guix.gnu.org (or similar?). How is that triggerd? The "patch" tag
> does not trigger that, right?
I think QA won't currently attempt to build patch series that would
cause more than 1000 rebuilds.
--
Thanks,
Maxim
Information forwarded
to
guix-patches <at> gnu.org
:
bug#73428
; Package
guix-patches
.
(Wed, 02 Oct 2024 05:47:02 GMT)
Full text and
rfc822 format available.
Message #60 received at 73428 <at> debbugs.gnu.org (full text, mbox):
Hi Maxim,
On Wed, Oct 02 2024, Maxim Cournoyer wrote:
> I think QA won't currently attempt to build patch series that
> would
> cause more than 1000 rebuilds.
thanks for the info. How can this patch be tested, then? Is there
a lack of resources (metal)?
Best Regards,
Julian
Information forwarded
to
guix-patches <at> gnu.org
:
bug#73428
; Package
guix-patches
.
(Fri, 24 Jan 2025 00:08:01 GMT)
Full text and
rfc822 format available.
Message #63 received at 73428 <at> debbugs.gnu.org (full text, mbox):
Hi Julian,
Apologies for failing to produce a timely reply.
Julian Flake <flake <at> uni-koblenz.de> writes:
> Hi Maxim,
>
> On Wed, Oct 02 2024, Maxim Cournoyer wrote:
>
>> I think QA won't currently attempt to build patch series that would
>> cause more than 1000 rebuilds.
>
> thanks for the info. How can this patch be tested, then? Is there a
> lack of resources (metal)?
Currently we typically create a one-of-a-time branch/job to build the
change on ci.guix.gnu.org.
--
Thanks,
Maxim
Information forwarded
to
guix-patches <at> gnu.org
:
bug#73428
; Package
guix-patches
.
(Fri, 24 Jan 2025 00:23:02 GMT)
Full text and
rfc822 format available.
Message #66 received at 73428 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/freedesktop.scm (elogind): Update to 255.17.
[source]: Delete patches.
[configure-flags]: Add mode and libexecdir options. Remove obsolete
rootlibexecdir, dbussessionservicedir and dbus-interfaces-dir ones. Update
'man' option value to 'enabled'.
[phases] {do-not-install-empty-/var/log/elogind-dir}
{patch-tzdata}: New phases.
{adjust-tests}: Fix FHS assumptions in a few test files. Re-instate the
cgroup and copy_holes tests. Disable the cgroup-util, mountpoint-util,
bus-creds, login and sd-device tests.
[native-inputs]: Remove m4. Add tzdata.
* gnu/packages/patches/elogind-fix-rpath.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
Change-Id: I2426532b6b5143ad5e30ca879858356c4b9a2c3e
---
(no changes since v1)
gnu/local.mk | 1 -
gnu/packages/freedesktop.scm | 74 ++++++++++++++------
gnu/packages/patches/elogind-fix-rpath.patch | 60 ----------------
3 files changed, 54 insertions(+), 81 deletions(-)
delete mode 100644 gnu/packages/patches/elogind-fix-rpath.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 5091f93eb8..d3fd9ecfa5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1202,7 +1202,6 @@ dist_patch_DATA = \
%D%/packages/patches/elm-ghc9.2.patch \
%D%/packages/patches/elm-offline-package-registry.patch \
%D%/packages/patches/elm-reactor-static-files.patch \
- %D%/packages/patches/elogind-fix-rpath.patch \
%D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
%D%/packages/patches/emacs-elpy-dup-test-name.patch \
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index c6f18e9949..380464801d 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -27,7 +27,7 @@
;;; Copyright © 2021 Robby Zambito <contact <at> robbyzambito.me>
;;; Copyright © 2021, 2022, 2023 Maxime Devos <maximedevos <at> telenet.be>
;;; Copyright © 2021, 2022, 2024 John Kehayias <john.kehayias <at> protonmail.com>
-;;; Copyright © 2021-2024 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2021-2025 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k <at> ruhr-uni-bochum.de>
;;; Copyright © 2022 Wamm K. D. <jaft.r <at> outlook.com>
;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
@@ -823,7 +823,7 @@ (define-public libxdg-basedir
(define-public elogind
(package
(name "elogind")
- (version "252.9")
+ (version "255.17")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -832,8 +832,7 @@ (define-public elogind
(file-name (git-file-name name version))
(sha256
(base32
- "049cfv97975x700s7lx4p9i22nv6v7j046iwkspxba7kr5qq7akw"))
- (patches (search-patches "elogind-fix-rpath.patch"))))
+ "0cb6p559281dzh24is91v6d4v4kz45yhyizibi4sfql9nign865h"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
@@ -842,11 +841,8 @@ (define-public elogind
(libexec (string-append out "/libexec/elogind"))
(dbus-data (string-append out "/share/dbus-1"))
(dbuspolicy (string-append dbus-data "/system.d"))
- (dbussessionservice (string-append dbus-data "/services"))
(dbussystemservice (string-append dbus-data
"/system-services"))
- (dbusinterfaces (string-append dbus-data "/interfaces"))
-
#$@(if (not (target-riscv64?))
#~((kexec-tools #$(this-package-input "kexec-tools")))
#~())
@@ -860,13 +856,11 @@ (define-public elogind
(poweroff-path (string-append shepherd "/sbin/shutdown"))
(reboot-path (string-append shepherd "/sbin/reboot")))
(list
- (string-append "-Drootprefix=" out)
+ "-Dmode=release"
+ (string-append "-Dlibexecdir=" libexec)
(string-append "-Dsysconfdir=" sysconf)
- (string-append "-Drootlibexecdir=" libexec)
(string-append "-Ddbuspolicydir=" dbuspolicy)
- (string-append "-Ddbussessionservicedir=" dbussessionservice)
(string-append "-Ddbussystemservicedir=" dbussystemservice)
- (string-append "-Ddbus-interfaces-dir=" dbusinterfaces)
(string-append "-Dc_link_args=-Wl,-rpath=" libexec)
(string-append "-Dcpp_link_args=-Wl,-rpath=" libexec)
(string-append "-Dhalt-path=" halt-path)
@@ -877,7 +871,7 @@ (define-public elogind
(string-append "-Dreboot-path=" reboot-path)
(string-append "-Dnologin-path=" nologin-path)
"-Dcgroup-controller=elogind"
- "-Dman=true"
+ "-Dman=enabled"
;; Disable some tests.
"-Dslow-tests=false"
;; Adjust the default user shell to /bin/sh (otherwise it is set
@@ -885,6 +879,18 @@ (define-public elogind
"-Ddefault-user-shell=/bin/sh"))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch-tzdata
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (substitute* "src/basic/time-util.c"
+ (("/usr/share/zoneinfo")
+ (search-input-directory (or native-inputs inputs)
+ "share/zoneinfo")))))
+ (add-after 'unpack 'do-not-install-empty-/var/log/elogind-dir
+ (lambda _
+ ;; This is the elogind state directory, which is not writable in
+ ;; the build environment.
+ (substitute* "meson.build"
+ (("install_emptydir\\(elogindstatedir)") ""))))
(add-after 'unpack 'fix-pkttyagent-path
(lambda _
(substitute* "meson.build"
@@ -901,18 +907,46 @@ (define-public elogind
(("PKGSYSCONFDIR") "\"/etc/elogind\""))))
(add-after 'unpack 'adjust-tests
(lambda _
+ ;; A few tests expect /var/tmp to exists, but it doesn't in the
+ ;; container.
+ (substitute* '("src/test/test-xattr-util.c"
+ "src/test/test-copy.c"
+ "src/test/test-fs-util.c")
+ (("/var/tmp/")
+ "/tmp/"))
+ (substitute* "src/test/test-xattr-util.c"
+ ;; The xattr-util test depends on /usr; patch it to use /tmp
+ ;; instead.
+ (("fd, \"usr\", \"user.idontexist\"")
+ "fd, \"/tmp\", \"user.idontexist\""))
+ (substitute* '("src/test/test-chase.c"
+ "src/test/test-fd-util.c")
+ ;; Many checks use /usr, which doesn't exist in our
+ ;; environment.
+ (("/usr")
+ "/tmp")
+ (("\"usr\"")
+ "\"tmp\""))
(substitute* "src/test/meson.build"
- ((".*'test-cgroup.c'.*") "")) ;no cgroup in container
+ ;; Requires cgroup support.
+ ((".*'test-cgroup-util\\.c'.*") "")
+ ;; Requires privilege to create mount namespaces.
+ ((".*'test-mountpoint-util\\.c'.*") ""))
+ (substitute* "src/libelogind/meson.build"
+ ;; The bus-creds test fails due to requiring cgroups.
+ ((".*'sd-bus/test-bus-creds.c'.*") "")
+ ;; The login test fails due to 'sd_pid_get_slice' returning
+ ;; NULL.
+ ((".*'sd-login/test-login.c'.*") "")
+ ;; The sd-device test fails due to 'devname_from_devnum'
+ ;; returning NULL.
+ ((".*'sd-device/test-sd-device.c'.*") ""))
;; This test tries to copy some bytes from /usr/lib/os-release,
;; which does not exist in the build container. Choose something
;; more likely to be available.
(substitute* "src/test/test-copy.c"
(("/usr/lib/os-release")
- "/etc/passwd")
- ;; Skip the copy_holes test, which fails for unknown reasons
- ;; (see: https://github.com/elogind/elogind/issues/261).
- (("TEST_RET\\(copy_holes).*" all)
- (string-append all " return 77;\n")))
+ "/etc/passwd"))
;; Use a shebang that works in the build container.
(substitute* "src/test/test-exec-util.c"
(("#!/bin/sh")
@@ -948,11 +982,11 @@ (define-public elogind
docbook-xsl
gettext-minimal
gperf
- m4
pkg-config
python
python-jinja2
- libxslt))
+ libxslt
+ tzdata))
(inputs
(append
(if (not (target-riscv64?))
diff --git a/gnu/packages/patches/elogind-fix-rpath.patch b/gnu/packages/patches/elogind-fix-rpath.patch
deleted file mode 100644
index 2a76cc467f..0000000000
--- a/gnu/packages/patches/elogind-fix-rpath.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Retrieved from https://github.com/elogind/elogind/issues/258
-
-From: Mark Hindley <mark <at> hindley.org.uk>
-Date: Wed, 24 May 2023 10:39:41 +0100
-Subject: Fixup_executable_rpath
-
-./meson.build sets
-
- install_rpath : rootlibexecdir
-
-however src/shared/meson.build sets
-
-libshared = shared_library(
- [snip]
- install_dir : rootpkglibdir
- )
----
- meson.build | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 694a2fd..a575f69 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2903,7 +2903,7 @@ executable('elogind',
- dependencies : [threads,
- libacl,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootlibexecdir)
-
-@@ -2913,7 +2913,7 @@ exe = executable('loginctl',
- link_with : [libshared],
- dependencies : [threads,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootbindir)
- public_programs += [exe]
-@@ -2923,7 +2923,7 @@ exe = executable('elogind-inhibit',
- include_directories : includes,
- link_with : [libshared],
- dependencies : [threads],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootbindir)
- public_programs += [exe]
-@@ -4283,7 +4283,7 @@ executable('elogind-uaccess-command',
- libshared],
- dependencies: [libacl,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootlibexecdir)
- #endif // 0
base-commit: a1074ecbcb147abe9ffbb1774f11be7704a41c8a
--
2.47.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#73428
; Package
guix-patches
.
(Fri, 24 Jan 2025 00:29:02 GMT)
Full text and
rfc822 format available.
Message #69 received at 73428 <at> debbugs.gnu.org (full text, mbox):
Hi Julian,
Julian Flake <flake <at> uni-koblenz.de> writes:
> Hi Maxim,
>
> On Wed, Oct 02 2024, Maxim Cournoyer wrote:
>
>> I think QA won't currently attempt to build patch series that would
>> cause more than 1000 rebuilds.
>
> thanks for the info. How can this patch be tested, then? Is there a
> lack of resources (metal)?
I've just sent a patch I had laying around for elogind 255, and added a
job in the CI for it: https://ci.guix.gnu.org/jobset/elogind-updates
Let's keep an eye on things and merge it if it doesn't break anything.
--
Thanks,
Maxim
Information forwarded
to
guix-patches <at> gnu.org
:
bug#73428
; Package
guix-patches
.
(Fri, 24 Jan 2025 14:58:02 GMT)
Full text and
rfc822 format available.
Message #72 received at 73428 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/freedesktop.scm (elogind): Update to 255.17.
[source]: Delete patches.
[configure-flags]: Add mode and libexecdir options. Remove obsolete
rootlibexecdir, dbussessionservicedir and dbus-interfaces-dir ones. Update
'man' option value to 'enabled'.
[phases] {do-not-install-empty-/var/log/elogind-dir}
{patch-tzdata}: New phases.
{adjust-tests}: Fix FHS assumptions in a few test files. Re-instate the
cgroup and copy_holes tests. Disable the cgroup-util, mountpoint-util,
bus-creds, login and sd-device tests.
[native-inputs]: Remove m4. Add tzdata.
* gnu/packages/patches/elogind-fix-rpath.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
Change-Id: I2426532b6b5143ad5e30ca879858356c4b9a2c3e
---
Changes in v3:
- rebased
gnu/local.mk | 1 -
gnu/packages/freedesktop.scm | 74 ++++++++++++++------
gnu/packages/patches/elogind-fix-rpath.patch | 60 ----------------
3 files changed, 54 insertions(+), 81 deletions(-)
delete mode 100644 gnu/packages/patches/elogind-fix-rpath.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 5091f93eb8..d3fd9ecfa5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1202,7 +1202,6 @@ dist_patch_DATA = \
%D%/packages/patches/elm-ghc9.2.patch \
%D%/packages/patches/elm-offline-package-registry.patch \
%D%/packages/patches/elm-reactor-static-files.patch \
- %D%/packages/patches/elogind-fix-rpath.patch \
%D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
%D%/packages/patches/emacs-elpy-dup-test-name.patch \
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index c6f18e9949..380464801d 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -27,7 +27,7 @@
;;; Copyright © 2021 Robby Zambito <contact <at> robbyzambito.me>
;;; Copyright © 2021, 2022, 2023 Maxime Devos <maximedevos <at> telenet.be>
;;; Copyright © 2021, 2022, 2024 John Kehayias <john.kehayias <at> protonmail.com>
-;;; Copyright © 2021-2024 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2021-2025 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k <at> ruhr-uni-bochum.de>
;;; Copyright © 2022 Wamm K. D. <jaft.r <at> outlook.com>
;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
@@ -823,7 +823,7 @@ (define-public libxdg-basedir
(define-public elogind
(package
(name "elogind")
- (version "252.9")
+ (version "255.17")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -832,8 +832,7 @@ (define-public elogind
(file-name (git-file-name name version))
(sha256
(base32
- "049cfv97975x700s7lx4p9i22nv6v7j046iwkspxba7kr5qq7akw"))
- (patches (search-patches "elogind-fix-rpath.patch"))))
+ "0cb6p559281dzh24is91v6d4v4kz45yhyizibi4sfql9nign865h"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
@@ -842,11 +841,8 @@ (define-public elogind
(libexec (string-append out "/libexec/elogind"))
(dbus-data (string-append out "/share/dbus-1"))
(dbuspolicy (string-append dbus-data "/system.d"))
- (dbussessionservice (string-append dbus-data "/services"))
(dbussystemservice (string-append dbus-data
"/system-services"))
- (dbusinterfaces (string-append dbus-data "/interfaces"))
-
#$@(if (not (target-riscv64?))
#~((kexec-tools #$(this-package-input "kexec-tools")))
#~())
@@ -860,13 +856,11 @@ (define-public elogind
(poweroff-path (string-append shepherd "/sbin/shutdown"))
(reboot-path (string-append shepherd "/sbin/reboot")))
(list
- (string-append "-Drootprefix=" out)
+ "-Dmode=release"
+ (string-append "-Dlibexecdir=" libexec)
(string-append "-Dsysconfdir=" sysconf)
- (string-append "-Drootlibexecdir=" libexec)
(string-append "-Ddbuspolicydir=" dbuspolicy)
- (string-append "-Ddbussessionservicedir=" dbussessionservice)
(string-append "-Ddbussystemservicedir=" dbussystemservice)
- (string-append "-Ddbus-interfaces-dir=" dbusinterfaces)
(string-append "-Dc_link_args=-Wl,-rpath=" libexec)
(string-append "-Dcpp_link_args=-Wl,-rpath=" libexec)
(string-append "-Dhalt-path=" halt-path)
@@ -877,7 +871,7 @@ (define-public elogind
(string-append "-Dreboot-path=" reboot-path)
(string-append "-Dnologin-path=" nologin-path)
"-Dcgroup-controller=elogind"
- "-Dman=true"
+ "-Dman=enabled"
;; Disable some tests.
"-Dslow-tests=false"
;; Adjust the default user shell to /bin/sh (otherwise it is set
@@ -885,6 +879,18 @@ (define-public elogind
"-Ddefault-user-shell=/bin/sh"))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch-tzdata
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (substitute* "src/basic/time-util.c"
+ (("/usr/share/zoneinfo")
+ (search-input-directory (or native-inputs inputs)
+ "share/zoneinfo")))))
+ (add-after 'unpack 'do-not-install-empty-/var/log/elogind-dir
+ (lambda _
+ ;; This is the elogind state directory, which is not writable in
+ ;; the build environment.
+ (substitute* "meson.build"
+ (("install_emptydir\\(elogindstatedir)") ""))))
(add-after 'unpack 'fix-pkttyagent-path
(lambda _
(substitute* "meson.build"
@@ -901,18 +907,46 @@ (define-public elogind
(("PKGSYSCONFDIR") "\"/etc/elogind\""))))
(add-after 'unpack 'adjust-tests
(lambda _
+ ;; A few tests expect /var/tmp to exists, but it doesn't in the
+ ;; container.
+ (substitute* '("src/test/test-xattr-util.c"
+ "src/test/test-copy.c"
+ "src/test/test-fs-util.c")
+ (("/var/tmp/")
+ "/tmp/"))
+ (substitute* "src/test/test-xattr-util.c"
+ ;; The xattr-util test depends on /usr; patch it to use /tmp
+ ;; instead.
+ (("fd, \"usr\", \"user.idontexist\"")
+ "fd, \"/tmp\", \"user.idontexist\""))
+ (substitute* '("src/test/test-chase.c"
+ "src/test/test-fd-util.c")
+ ;; Many checks use /usr, which doesn't exist in our
+ ;; environment.
+ (("/usr")
+ "/tmp")
+ (("\"usr\"")
+ "\"tmp\""))
(substitute* "src/test/meson.build"
- ((".*'test-cgroup.c'.*") "")) ;no cgroup in container
+ ;; Requires cgroup support.
+ ((".*'test-cgroup-util\\.c'.*") "")
+ ;; Requires privilege to create mount namespaces.
+ ((".*'test-mountpoint-util\\.c'.*") ""))
+ (substitute* "src/libelogind/meson.build"
+ ;; The bus-creds test fails due to requiring cgroups.
+ ((".*'sd-bus/test-bus-creds.c'.*") "")
+ ;; The login test fails due to 'sd_pid_get_slice' returning
+ ;; NULL.
+ ((".*'sd-login/test-login.c'.*") "")
+ ;; The sd-device test fails due to 'devname_from_devnum'
+ ;; returning NULL.
+ ((".*'sd-device/test-sd-device.c'.*") ""))
;; This test tries to copy some bytes from /usr/lib/os-release,
;; which does not exist in the build container. Choose something
;; more likely to be available.
(substitute* "src/test/test-copy.c"
(("/usr/lib/os-release")
- "/etc/passwd")
- ;; Skip the copy_holes test, which fails for unknown reasons
- ;; (see: https://github.com/elogind/elogind/issues/261).
- (("TEST_RET\\(copy_holes).*" all)
- (string-append all " return 77;\n")))
+ "/etc/passwd"))
;; Use a shebang that works in the build container.
(substitute* "src/test/test-exec-util.c"
(("#!/bin/sh")
@@ -948,11 +982,11 @@ (define-public elogind
docbook-xsl
gettext-minimal
gperf
- m4
pkg-config
python
python-jinja2
- libxslt))
+ libxslt
+ tzdata))
(inputs
(append
(if (not (target-riscv64?))
diff --git a/gnu/packages/patches/elogind-fix-rpath.patch b/gnu/packages/patches/elogind-fix-rpath.patch
deleted file mode 100644
index 2a76cc467f..0000000000
--- a/gnu/packages/patches/elogind-fix-rpath.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Retrieved from https://github.com/elogind/elogind/issues/258
-
-From: Mark Hindley <mark <at> hindley.org.uk>
-Date: Wed, 24 May 2023 10:39:41 +0100
-Subject: Fixup_executable_rpath
-
-./meson.build sets
-
- install_rpath : rootlibexecdir
-
-however src/shared/meson.build sets
-
-libshared = shared_library(
- [snip]
- install_dir : rootpkglibdir
- )
----
- meson.build | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 694a2fd..a575f69 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2903,7 +2903,7 @@ executable('elogind',
- dependencies : [threads,
- libacl,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootlibexecdir)
-
-@@ -2913,7 +2913,7 @@ exe = executable('loginctl',
- link_with : [libshared],
- dependencies : [threads,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootbindir)
- public_programs += [exe]
-@@ -2923,7 +2923,7 @@ exe = executable('elogind-inhibit',
- include_directories : includes,
- link_with : [libshared],
- dependencies : [threads],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootbindir)
- public_programs += [exe]
-@@ -4283,7 +4283,7 @@ executable('elogind-uaccess-command',
- libshared],
- dependencies: [libacl,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootlibexecdir)
- #endif // 0
base-commit: 9b98e4b0ee45fb712d815601645fb561a83b4e25
--
2.47.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#73428
; Package
guix-patches
.
(Fri, 24 Jan 2025 20:43:02 GMT)
Full text and
rfc822 format available.
Message #75 received at 73428 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Hi Maxim,
On Fri, Jan 24 2025, Maxim Cournoyer wrote:
> Apologies for failing to produce a timely reply.
no problem. Great to see progress now, thank you!
Best Regards,
Julian
[signature.asc (application/pgp-signature, inline)]
Reply sent
to
Andreas Enge <andreas <at> enge.fr>
:
You have taken responsibility.
(Fri, 11 Apr 2025 14:30:04 GMT)
Full text and
rfc822 format available.
Notification sent
to
Julian Flake <flake <at> uni-koblenz.de>
:
bug acknowledged by developer.
(Fri, 11 Apr 2025 14:30:05 GMT)
Full text and
rfc822 format available.
Message #80 received at 73428-done <at> debbugs.gnu.org (full text, mbox):
This has just been pushed, thanks!
Andreas
Information forwarded
to
guix-patches <at> gnu.org
:
bug#73428
; Package
guix-patches
.
(Sat, 12 Apr 2025 13:00:04 GMT)
Full text and
rfc822 format available.
Message #83 received at 73428-done <at> debbugs.gnu.org (full text, mbox):
Hi,
Julian Flake <flake <at> uni-koblenz.de> writes:
> Hi,
>
> if possible, upgrade elogind to version 255. I (and maybe others) have
> issues with `loginctl suspend`, see
> https://github.com/elogind/elogind/issues/208#issuecomment-2366912746
That's finally happened.
--
Thanks,
Maxim
Information forwarded
to
guix-patches <at> gnu.org
:
bug#73428
; Package
guix-patches
.
(Sat, 12 Apr 2025 19:09:02 GMT)
Full text and
rfc822 format available.
Message #86 received at 73428-done <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Hi,
On Sat, Apr 12 2025, Maxim Cournoyer wrote:
> Julian Flake <flake <at> uni-koblenz.de> writes:
>> if possible, upgrade elogind to version 255.
>
> That's finally happened.
Thank you!
Best Regards, nutcase
[signature.asc (application/pgp-signature, inline)]
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Sun, 11 May 2025 11:24:06 GMT)
Full text and
rfc822 format available.
This bug report was last modified 50 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.