From 9f7d1899235a237ba7a6000479cbf3965b224fd9 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 7 Dec 2023 09:36:52 +0100 Subject: [PATCH] packit: don't take ownership of /etc/ssh/sshd_config.d/ 7e3607996a creates a symlink under /etc/ssh/sshd_config.d/ and with current Rawhide RPM stuff the systemd RPM tries to take ownership of that directory which conflicts with the openssh-server package. Let's temporarily tweak the regex in split-files.py until this changes makes it to Rawhide. --- .packit.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.packit.yml b/.packit.yml index b886632a95..773c8f79da 100644 --- a/.packit.yml +++ b/.packit.yml @@ -32,8 +32,10 @@ actions: # [0] https://github.com/mesonbuild/meson/issues/7360 # [1] https://github.com/systemd/systemd/pull/18908#issuecomment-792250110 - 'sed -i "/^CONFIGURE_OPTS=(/a--werror" .packit_rpm/systemd.spec' - # Ignore unpackages standalone binaries + # Ignore unpackaged standalone binaries - "sed -i 's/assert False,.*/pass/' .packit_rpm/split-files.py" + # Don't take ownership of /etc/ssh/sshd_config.d/ + - "sed -i '/\\/usr\\/share\\/dbus-1\\$/a\\/etc\\/ssh\\/sshd_config.d\\$\\|' .packit_rpm/split-files.py" jobs: - job: copr_build -- 2.25.1