rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 1068038 from Base:System

Browse Source 
- Import commit 8e0a8094b8bbc442d262795b85ac57a37264c5fe (merge of v252.6)
  For a complete list of changes, visit:
  d87834a334...8e0a8094b8
- Drop 5000-rules-add-missing-line-continuation.patch, it's part of v252.6.
- aaa_base has stop providing /etc/sysctl.conf, cope with this change so the
  compat symlink we provide is not dangling during the build.

- Drop build requirement on libpci, it's not more needed since udev hwdb was
  introduced 11 years ago.

- Conditionalize the use of /lib/modprobe.d only on systems with split usr
  support enabled (i.e. SLE).

OBS-URL: https://build.opensuse.org/request/show/1068038
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=379
This commit is contained in:
Dominique Leuenberger 2023-03-02 22:02:53 +00:00 committed by Git OBS Bridge
parent 688f3b3091
commit c34d91ebee
9 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
5000-rules-add-missing-line-continuation.patch
View File

@ -1,28 +0,0 @@
From de8409ac43f6e4596de4cecce8dbbb5f1f2a18b1 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 21 Dec 2022 17:32:56 +0900
Subject: [PATCH 5000/5000] rules: add missing line continuation
Fixes a bug introduced by 953c928c24455744d5534679998d129b947a5e04.
Fixes #25811.
---
rules.d/60-evdev.rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules.d/60-evdev.rules b/rules.d/60-evdev.rules
index 15483101e7..c97cdecb58 100644
--- a/rules.d/60-evdev.rules
+++ b/rules.d/60-evdev.rules
@@ -6,7 +6,7 @@ KERNEL!="event*", GOTO="evdev_end"
# Execute the match patterns below, from least-to-most specific.
# Device matching the modalias string (bustype, vendor, product, version, other properties)
-IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=evdev:",
+IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=evdev:", \
ENV{.HAVE_HWDB_PROPERTIES}="1"
# AT keyboard matching by the machine's DMI data
--
2.35.3

1
files.network
View File

@ -28,6 +28,7 @@
%{_mandir}/man8/systemd-networkd.service.8.gz
%{_systemd_util_dir}/network/80-6rd-tunnel.network
%{_systemd_util_dir}/network/80-container-host0.network
%{_systemd_util_dir}/network/80-container-vb.network
%{_systemd_util_dir}/network/80-container-ve.network
%{_systemd_util_dir}/network/80-container-vz.network
%{_systemd_util_dir}/network/80-ethernet.network.example

8
files.systemd
View File

@ -82,6 +82,7 @@
%doc %{_sysctldir}/README
%doc %{_sysusersdir}/README
%doc %{_tmpfilesdir}/README
%exclude %{_sysconfdir}/sysctl.conf
%ghost %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/machine-id
%ghost %attr(0600,root,root) %{_localstatedir}/lib/systemd/random-seed
%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
@ -139,9 +140,11 @@
%{_datadir}/bash-completion/completions/systemd-cgtop
%{_datadir}/bash-completion/completions/systemd-delta
%{_datadir}/bash-completion/completions/systemd-detect-virt
%{_datadir}/bash-completion/completions/systemd-dissect
%{_datadir}/bash-completion/completions/systemd-id128
%{_datadir}/bash-completion/completions/systemd-path
%{_datadir}/bash-completion/completions/systemd-run
%{_datadir}/bash-completion/completions/systemd-sysext
%{_datadir}/bash-completion/completions/timedatectl
%endif
# dbus introspection data for code generators: https://github.com/systemd/systemd/pull/20294
@ -212,12 +215,17 @@
%{_journalcatalogdir}/systemd.be@latin.catalog
%{_journalcatalogdir}/systemd.bg.catalog
%{_journalcatalogdir}/systemd.catalog
%{_journalcatalogdir}/systemd.da.catalog
%{_journalcatalogdir}/systemd.de.catalog
%{_journalcatalogdir}/systemd.fr.catalog
%{_journalcatalogdir}/systemd.hr.catalog
%{_journalcatalogdir}/systemd.hu.catalog
%{_journalcatalogdir}/systemd.it.catalog
%{_journalcatalogdir}/systemd.ko.catalog
%{_journalcatalogdir}/systemd.pl.catalog
%{_journalcatalogdir}/systemd.pt_BR.catalog
%{_journalcatalogdir}/systemd.ru.catalog
%{_journalcatalogdir}/systemd.sr.catalog
%{_journalcatalogdir}/systemd.zh_CN.catalog
%{_journalcatalogdir}/systemd.zh_TW.catalog
%if %{without bootstrap}

1
files.udev
View File

@ -165,6 +165,7 @@
%{_udevrulesdir}/60-drm.rules
%{_udevrulesdir}/60-evdev.rules
%{_udevrulesdir}/60-fido-id.rules
%{_udevrulesdir}/60-infiniband.rules
%{_udevrulesdir}/60-input-id.rules
%{_udevrulesdir}/60-persistent-alsa.rules
%{_udevrulesdir}/60-persistent-input.rules

2
files.uefi-boot
View File

@ -31,7 +31,7 @@
%{_prefix}/lib/kernel/install.conf
%{_prefix}/lib/kernel/install.d/50-depmod.install
%{_prefix}/lib/kernel/install.d/90-loaderentry.install
# These are part of the very few exceptions where glob pattern is allowd.
# These are the few exceptions where glob pattern is allowed.
%{_systemd_util_dir}/boot/efi/linux*.efi.stub
%{_systemd_util_dir}/boot/efi/linux*.elf.stub
%{_systemd_util_dir}/boot/efi/systemd-boot*.efi

3
systemd-v252.5+suse.46.gd87834a334.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bb506e9ea2783c8dff075ecfd6d253fd397d2bd017f928903aff0cd6f272c9e1
size 8050412

3
systemd-v252.6+suse.48.g8e0a8094b8.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:58501d3c453cc1c3363dd0263190d9514b34b4392f1ecaa32e9f7a2c715fa8d9
size 8090264

25
systemd.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Mon Feb 27 08:43:27 UTC 2023 - Franck Bui <fbui@suse.com>
- Import commit 8e0a8094b8bbc442d262795b85ac57a37264c5fe (merge of v252.6)
For a complete list of changes, visit:
https://github.com/openSUSE/systemd/compare/d87834a33444b7163e741e1089e82b44af663808...8e0a8094b8bbc442d262795b85ac57a37264c5fe
- Drop 5000-rules-add-missing-line-continuation.patch, it's part of v252.6.
- aaa_base has stop providing /etc/sysctl.conf, cope with this change so the
compat symlink we provide is not dangling during the build.
-------------------------------------------------------------------
Fri Feb 17 11:06:41 UTC 2023 - Franck Bui <fbui@suse.com>
- Drop build requirement on libpci, it's not more needed since udev hwdb was
introduced 11 years ago.
-------------------------------------------------------------------
Tue Feb 7 08:44:32 UTC 2023 - Franck Bui <fbui@suse.com>
- Conditionalize the use of /lib/modprobe.d only on systems with split usr
support enabled (i.e. SLE).
-------------------------------------------------------------------
Mon Jan 30 08:39:24 UTC 2023 - Franck Bui <fbui@suse.com>

29
systemd.spec
View File

@ -19,7 +19,7 @@
%global flavor @BUILD_FLAVOR@%{nil}
%define min_kernel_version 4.5
%define archive_version +suse.46.gd87834a334
%define archive_version +suse.48.g8e0a8094b8
%define _testsuitedir /usr/lib/systemd/tests
%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
@ -72,7 +72,7 @@
Name: systemd%{?mini}
URL: http://www.freedesktop.org/wiki/Software/systemd
Version: 252.5
Version: 252.6
Release: 0
Summary: A System and Session Manager
License: LGPL-2.1-or-later
@ -114,7 +114,6 @@ BuildRequires: python3-jinja2
BuildRequires: suse-module-tools >= 12.4
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(blkid) >= 2.26
BuildRequires: pkgconfig(libpci) >= 3
%if %{with bootstrap}
#!BuildIgnore: dbus-1
@ -213,7 +212,6 @@ Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch
# very few cases, some stuff might be broken in upstream and need to be fixed
# quickly. But even in these cases, the patches are temporary and should be
# removed as soon as a fix is merged by upstream.
Patch5000: 5000-rules-add-missing-line-continuation.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -749,7 +747,7 @@ rm %{buildroot}%{_mandir}/man1/resolvconf.1*
%endif
%if %{with sysvcompat}
install -m0755 -D %{SOURCE4} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-install
install -m0755 -D %{SOURCE4} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-install
%endif
mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network
@ -780,22 +778,19 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff
ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit
ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel
%endif
# kmod keeps insisting on using /lib/modprobe.d only.
mkdir -p %{buildroot}%{_modprobedir}
mv %{buildroot}/usr/lib/modprobe.d/* %{buildroot}%{_modprobedir}/
%endif
# Make sure we don't ship static enablement symlinks in /etc during
# installation, presets should be honoured instead.
rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants}
rm -f %{buildroot}/etc/systemd/system/default.target
rm -rf %{buildroot}%{_sysconfdir}/systemd/system/*.target.{requires,wants}
rm -f %{buildroot}%{_sysconfdir}/systemd/system/default.target
# Replace upstream systemd-user with the openSUSE one.
install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{SOURCE2}
# kmod keeps insisting on using /lib on SLE.
if [ "$(realpath %{_modprobedir})" != /usr/lib/modprobe.d ]; then
mkdir -p %{buildroot}%{_modprobedir}
mv %{buildroot}/usr/lib/modprobe.d/* %{buildroot}%{_modprobedir}/
fi
# Don't enable wall ask password service, it spams every console (bnc#747783).
rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path
@ -812,9 +807,9 @@ mv %{buildroot}%{_datadir}/polkit-1/rules.d/systemd-networkd.rules \
%endif
# Since v207 /etc/sysctl.conf is no longer parsed (commit 04bf3c1a60d82791),
# however backward compatibility is provided by
# /usr/lib/sysctl.d/99-sysctl.conf.
# however backward compatibility is provided by the following symlink.
ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf
touch %{buildroot}%{_sysconfdir}/sysctl.conf
# The definitions of the basic users/groups are given by system-user package on
# SUSE (bsc#1006978).
@ -827,7 +822,7 @@ rm -f %{buildroot}%{_environmentdir}/99-environment.conf
# Remove README file in init.d as (SUSE) rpm requires executable files in this
# directory... oh well.
rm -f %{buildroot}/etc/init.d/README
rm -f %{buildroot}%{_sysconfdir}/init.d/README
# This dir must be owned (and thus created) by systemd otherwise the build
# system will complain. This is odd since we simply own a ghost file in it...
@ -884,7 +879,7 @@ touch %{buildroot}%{_localstatedir}/lib/systemd/i18n-migrated
%fdupes -s %{buildroot}%{_mandir}
# Make sure to disable all services by default. The Suse branding presets
# Make sure to disable all services by default. The SUSE branding presets
# package takes care of defining the right policies.
rm -f %{buildroot}%{_presetdir}/*.preset
echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset