public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Martin Pitt <martin@amutable.com>
To: git-commits@fedoraproject.org
Subject: [rpms/systemd] rawhide: Downgrade kbd dependency to Recommends unconditionally
Date: Fri, 31 Jul 2026 00:17:18 GMT	[thread overview]
Message-ID: <178545703818.1.11955005353329387941.rpms-systemd-8c0ffebeea68@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/systemd
            Branch : rawhide
            Commit : 8c0ffebeea68533f40a2e53ac8620e45eafbc3d7
            Author : Martin Pitt <martin@amutable.com>
            Date   : 2026-07-29T19:27:35+02:00
            Stats  : +0/-5 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/systemd/c/8c0ffebeea68533f40a2e53ac8620e45eafbc3d7?branch=rawhide

            Log:
            Downgrade kbd dependency to Recommends unconditionally

Commit ab743db0 made the dependency weak for %{with upstream} builds
only, because upstream 3327a411be3e ("vconsole-setup: handle gracefully
if setfont/loadkeys are not available") landed after v260 was released.
Rawhide now has v261.2, so the condition is always true here.

The hard requirement came from 01e2d8a9 (2020, rhbz#1408878), which
"upgraded" the Recommends originally added in 4ebba8aa. Now that
systemd-vconsole-setup logs a notice and skips keymap and font setup
when the binaries are absent, kbd is only needed to actually apply a
non-default console keymap or font.

This again lets minimal images that disable weak dependencies leave out
kbd together with the libxkbcommon, xkeyboard-config, and libxml2 chain
it pulls in: about 9 MB uncompressed. That particularly affects initrds,
which are unpacked into RAM.

---
diff --git a/systemd.spec b/systemd.spec
index 71a9958..6a028bd 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -532,13 +532,8 @@ Requires:       libblkid.so.1(BLKID_2.30)%{?elf_bits}
 # https://bugzilla.redhat.com/show_bug.cgi?id=1377733#c9
 Suggests:       systemd-bootchart
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1408878
-%if %{with upstream}
 # v261 handles missing setfont/loadkeys gracefully
 Recommends:     kbd
-%else
-Requires:       kbd
-%endif
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1753381
 Provides:       u2f-hidraw-policy = 1.0.2-40

                 reply	other threads:[~2026-07-31  0:17 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=178545703818.1.11955005353329387941.rpms-systemd-8c0ffebeea68@fedoraproject.org \
    --to=martin@amutable.com \
    --cc=git-commits@fedoraproject.org \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox