From: Marius Bakke <mbakke@fastmail.com>
To: "Stefan Stefanović" <stefanx2ovic@gmail.com>
Cc: Andy Wingo <wingo@igalia.com>, 33471@debbugs.gnu.org
Subject: [bug#33471] [PATCH] gnu: elogind: Update to 239.2.
Date: Tue, 04 Dec 2018 22:02:50 +0100 [thread overview]
Message-ID: <87zhtluhs5.fsf@fastmail.com> (raw)
In-Reply-To: <CAFBTj=hHnLhhqwrb9K46wdxGHoks2krHwfyB3dmc13YWKzqs=w@mail.gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 677 bytes --]
Stefan Stefanović <stefanx2ovic@gmail.com> writes:
> Hello,
> Marius.
>
> Thanks to your input and suggestions I managed to simplify the original patch.
> I will attach the second patch to this e-mail.
>
> I tried to stick to the suggestions you gave me,
> and tried to make this patch as small as possible.
> The "--novalid" option is not necessary for this build so, I removed it.
> Please comment on this patch, and point out other areas I need to improve.
>
> I will try to test this patch on my main system.
> I expect it to work, we will see. ;)
Thanks! I can confirm that this patch works for me.
I've applied these changes in my local branch:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Type: text/x-patch, Size: 3153 bytes --]
1 file changed, 9 insertions(+), 17 deletions(-)
gnu/packages/freedesktop.scm | 26 +++++++++-----------------
modified gnu/packages/freedesktop.scm
@@ -239,16 +239,14 @@ the freedesktop.org XDG Base Directory specification.")
"17khwbzqmkfd3hcscs51kzdpvq9p2llm08vbpsdhy9yxgwfzlfa6"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #t
- #:configure-flags
+ `(#:configure-flags
(let* ((out (assoc-ref %outputs "out"))
(sysconf (string-append out "/etc"))
(libexec (string-append out "/libexec/elogind"))
(dbuspolicy (string-append out "/etc/dbus-1/system.d"))
(shepherd (assoc-ref %build-inputs "shepherd"))
(halt-path (string-append shepherd "/sbin/halt"))
- (kexec-path "") ;; NOTE: We need to package kexec-tools,
- ;; or support kexec with shepherd.
+ (kexec-path "") ;not available in Guix yet
(poweroff-path (string-append shepherd "/sbin/shutdown"))
(reboot-path (string-append shepherd "/sbin/reboot")))
(list
@@ -268,11 +266,6 @@ the freedesktop.org XDG Base Directory specification.")
"-Dslow-tests=false"))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'clean-runpath
- (lambda _
- (substitute* "meson.build"
- (("install_rpath :") "#install_rpath :"))
- #t))
(add-after 'unpack 'fix-pkttyagent-path
(lambda _
(substitute* "meson.build"
@@ -290,22 +283,21 @@ the freedesktop.org XDG Base Directory specification.")
("docbook-xsl" ,docbook-xsl)
("gettext" ,gettext-minimal)
("gperf" ,gperf)
- ("libxml2" ,libxml2) ;for XML_CATALOG_FILES
+ ("libxml2" ,libxml2) ;for XML_CATALOG_FILES
("m4" ,m4)
("pkg-config" ,pkg-config)
("python" ,python)
("xsltproc" ,libxslt)))
(inputs
- `(("acl" ,acl) ;to add individual users to ACLs on /dev nodes
+ `(("linux-pam" ,linux-pam)
+ ("libcap" ,libcap)
+ ("shepherd" ,shepherd) ;for 'halt' and 'reboot', invoked
+ ;when pressing the power button
("dbus" ,dbus)
("eudev" ,eudev)
- ("libcap" ,libcap)
- ("linux-pam" ,linux-pam)
- ("shepherd" ,shepherd) ;for 'halt' and 'reboot', invoked
- ;when pressing the power button
- ))
+ ("acl" ,acl))) ;to add individual users to ACLs on /dev nodes
(home-page "https://github.com/elogind/elogind")
- (synopsis "Elogind provides user, seat, and session management service")
+ (synopsis "User, seat, and session management service")
(description "Elogind is the systemd project's \"logind\" service,
extracted out as a separate project. Elogind integrates with PAM to provide
the org.freedesktop.login1 interface over the system bus, allowing other parts
[back]
[-- Attachment #1.3: Type: text/plain, Size: 255 bytes --]
The 'clean-runpath' phase should be unnecessary now. The other changes
are mostly adjustments to make the final diff clearer (i.e. no sorting
of regular inputs, or synopsis change).
I will push this to 'master' tomorrow unless there are objections :-)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
next prev parent reply other threads:[~2018-12-04 21:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-23 7:11 [bug#33471] [PATCH] gnu: elogind: Update to 239.2 Stefan Stefanović
2018-11-23 18:47 ` Marius Bakke
2018-11-24 3:10 ` Stefan Stefanović
2018-11-24 4:34 ` Stefan Stefanović
2018-11-24 6:10 ` Stefan Stefanović
2018-11-25 7:02 ` Stefan Stefanović
2018-12-04 21:02 ` Marius Bakke [this message]
2018-12-05 1:18 ` Meiyo Peng
2018-12-06 19:25 ` bug#33471: " Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zhtluhs5.fsf@fastmail.com \
--to=mbakke@fastmail.com \
--cc=33471@debbugs.gnu.org \
--cc=stefanx2ovic@gmail.com \
--cc=wingo@igalia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.