Accepting request 772626 from Base:System
OBS-URL: https://build.opensuse.org/request/show/772626 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=304
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
parent
48c2309976
commit
fbe3de5990
@ -1,92 +0,0 @@
|
||||
#! /bin/bash
|
||||
#
|
||||
# When upgrading from systems predating systemd (SLE11, openSUSE
|
||||
# 12.x), udev libexec directory was changed from /lib/udev to
|
||||
# /usr/lib/udev. Some customer scripts might still rely on the old
|
||||
# path, therefore try to create a symlink that preserves the old path
|
||||
# (see bsc#1050152).
|
||||
#
|
||||
# This script is supposed to be called from the %posttrans scection of
|
||||
# the udev package.
|
||||
#
|
||||
convert_lib_udev_path () {
|
||||
local failed=/bin/false
|
||||
|
||||
# Sanity check: /usr/lib/udev must exist at that point since
|
||||
# the new udev package should have been installed.
|
||||
if ! test -d /usr/lib/udev; then
|
||||
echo >&2 "/usr/lib/udev does not exist, refusing to create"
|
||||
echo >&2 "/lib/udev compat symlink."
|
||||
return 1
|
||||
fi
|
||||
|
||||
# If the symlink is missing it probably means that we're
|
||||
# upgrading and the old /lib/udev path was removed as it was
|
||||
# empty at the time the old version of udev was uninstalled.
|
||||
if ! test -e /lib/udev; then
|
||||
echo "Creating /lib/udev -> /usr/lib/udev symlink."
|
||||
ln -s /usr/lib/udev /lib/udev
|
||||
return
|
||||
fi
|
||||
|
||||
# If a symlink already exists, simply assume that we already
|
||||
# did the job. IOW we're just doing a simple update of
|
||||
# systemd/udev (not upgrading).
|
||||
if test -L /lib/udev; then
|
||||
return
|
||||
fi
|
||||
|
||||
# Sanity check: refuse to deal with anything but a directory.
|
||||
if ! test -d /lib/udev; then
|
||||
echo >&2 "/lib/udev is not either a directory nor a symlink !"
|
||||
echo >&2 "It won't be converted into a symlink to /usr/lib/udev."
|
||||
echo >&2 "Please create it manually."
|
||||
return 1
|
||||
fi
|
||||
|
||||
# /lib/udev exists and is still a directory (probably not
|
||||
# empty otherwise it would have been removed when the old
|
||||
# version of udev was uninstalled), we try to merge its
|
||||
# content with the new location and if it fails we warn the
|
||||
# user and let him sort this out.
|
||||
shopt -s globstar
|
||||
for f in /lib/udev/**; do
|
||||
if test -d "$f"; then
|
||||
continue
|
||||
fi
|
||||
if test -e /usr/"$f"; then
|
||||
echo >&2 "Failed to migrate '$f' to /usr/lib/udev because it already exists."
|
||||
failed=/bin/true
|
||||
continue
|
||||
fi
|
||||
|
||||
echo "Migrating '$f' in /usr/lib/udev"
|
||||
if ! cp -a --parents "$f" /usr; then
|
||||
echo >&2 "Failed to move '$f' in /usr/lib/udev."
|
||||
failed=/bin/true
|
||||
continue
|
||||
fi
|
||||
rm "$f"
|
||||
done
|
||||
shopt -u globstar
|
||||
|
||||
if ! $failed; then
|
||||
rm -fr /lib/udev &&
|
||||
ln -s ../usr/lib/udev /lib/udev &&
|
||||
echo "The content of /lib/udev has been moved in /usr/lib/udev successfully" &&
|
||||
echo "and /lib/udev is now a symlink pointing to /usr/lib/udev." &&
|
||||
echo "Please note /lib/udev is deprecated and shouldn't be used by" &&
|
||||
echo "new scripts/applications anymore." ||
|
||||
failed=/bin/true
|
||||
fi
|
||||
|
||||
if $failed; then
|
||||
echo >&2 "Converting /lib/udev into a symlink pointing to /usr/lib/udev was not"
|
||||
echo >&2 "possible due to previous error(s)."
|
||||
echo >&2 "Please fix them and then create the symlink with:"
|
||||
echo >&2 " 'ln -s ../usr/lib/udev /lib/udev'."
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
convert_lib_udev_path
|
||||
@ -1,3 +1,42 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 6 14:15:01 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Import commit f8adabc2b1f3e3ad150e7a3bfa88341eda5a8a57 (merge v244.2)
|
||||
|
||||
77c04ce5c2 hwdb: update to v245-rc1
|
||||
b4eb884824 Fix typo in function name
|
||||
e2d4cb9843 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it
|
||||
83bfc0d8dd sd-bus: introduce API for re-enqueuing incoming messages
|
||||
5926f9f172 polkit: use structured initialization
|
||||
0697d0d972 polkit: on async pk requests, re-validate action/details
|
||||
2589995acd polkit: reuse some common bus message appending code
|
||||
5b2442d5c3 bus-polkit: rename return error parameter to ret_error
|
||||
0a19ff7004 shared: split out polkit stuff from bus-util.c → bus-polkit.c
|
||||
1325dfb577 test: adapt to the new capsh format
|
||||
3538fafb47 meson: update efi path detection to gnu-efi-3.0.11
|
||||
3034855a5b presets: "disable" all passive targets by default
|
||||
c2e3046819 shared/sysctl-util: normalize repeated slashes or dots to a single value
|
||||
6f4364046f dhcp6: do not use T1 and T2 longer than one provided by the lease
|
||||
0ed6cda28d network: fix implicit type conversion warning by GCC-10
|
||||
f6a5c02d26 bootspec: parse random-seed-mode line in loader.conf
|
||||
ddc5dca8a7 sd-boot: fix typo
|
||||
2bbbe9ae41 test: Synchronize journal before reading from it
|
||||
072485d661 sd-bus: fix introspection bug in signal parameter names
|
||||
80af3cf5e3 efi: fix build.
|
||||
[...]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 3 14:52:51 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Use suse.pool.ntp.org server pool on SLE (jsc#SLE-7683)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 21 16:01:09 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Drop scripts-udev-convert-lib-udev-path.sh
|
||||
|
||||
Nobody should need it these days.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 14 14:21:40 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package systemd-mini
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -26,7 +26,7 @@
|
||||
##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
|
||||
%define mini -mini
|
||||
%define min_kernel_version 4.5
|
||||
%define suse_version +suse.58.g8254b8d964
|
||||
%define suse_version +suse.138.gf8adabc2b1
|
||||
|
||||
%bcond_with gnuefi
|
||||
%if 0%{?bootstrap}
|
||||
@ -54,7 +54,7 @@
|
||||
%bcond_with parentpathid
|
||||
|
||||
Name: systemd-mini
|
||||
Url: http://www.freedesktop.org/wiki/Software/systemd
|
||||
URL: http://www.freedesktop.org/wiki/Software/systemd
|
||||
Version: 244
|
||||
Release: 0
|
||||
Summary: A System and Session Manager
|
||||
@ -158,7 +158,6 @@ Source14: kbd-model-map.legacy
|
||||
Source100: scripts-systemd-fix-machines-btrfs-subvol.sh
|
||||
Source101: scripts-systemd-upgrade-from-pre-210.sh
|
||||
Source102: scripts-systemd-migrate-sysconfig-i18n.sh
|
||||
Source200: scripts-udev-convert-lib-udev-path.sh
|
||||
|
||||
# Patches listed in here are put in quarantine. Normally all
|
||||
# changes must go to upstream first and then are cherry-picked in the
|
||||
@ -239,7 +238,7 @@ This library provides several of the systemd C APIs:
|
||||
Summary: A rule-based device node and kernel event manager
|
||||
License: GPL-2.0-only
|
||||
Group: System/Kernel
|
||||
Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
|
||||
URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
|
||||
Requires: system-group-hardware
|
||||
Requires(post): sed
|
||||
Requires(post): coreutils
|
||||
@ -472,7 +471,11 @@ systemd-journal-remote, and systemd-journal-upload.
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
|
||||
%if 0%{?is_opensuse}
|
||||
ntp_servers=({0..3}.opensuse.pool.ntp.org)
|
||||
%else
|
||||
ntp_servers=({0..3}.suse.pool.ntp.org)
|
||||
%endif
|
||||
|
||||
# keep split-usr until all packages have moved their systemd rules to /usr
|
||||
%meson \
|
||||
@ -488,7 +491,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
|
||||
-Dcertificate-root=%{_sysconfdir}/pki/systemd \
|
||||
-Ddefault-hierarchy=hybrid \
|
||||
-Ddefault-kill-user-processes=false \
|
||||
-Dntp-servers="${opensuse_ntp_servers[*]}" \
|
||||
-Dntp-servers="${ntp_servers[*]}" \
|
||||
-Drc-local=/etc/init.d/boot.local \
|
||||
-Ddebug-shell=/bin/bash \
|
||||
-Dseccomp=auto \
|
||||
@ -581,9 +584,6 @@ mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn
|
||||
for s in %{S:100} %{S:101} %{S:102}; do
|
||||
install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-}
|
||||
done
|
||||
for s in %{S:200}; do
|
||||
install -m0755 -D $s %{buildroot}%{_prefix}/lib/udev/scripts/${s#*/scripts-udev-}
|
||||
done
|
||||
|
||||
# Legacy sysvinit tools
|
||||
mkdir -p %{buildroot}/sbin
|
||||
@ -868,7 +868,6 @@ systemctl daemon-reload || :
|
||||
|
||||
%posttrans -n udev%{?mini}
|
||||
%regenerate_initrd_posttrans
|
||||
%{_prefix}/lib/udev/scripts/convert-lib-udev-path.sh || :
|
||||
|
||||
%post -n libudev%{?mini}1 -p /sbin/ldconfig
|
||||
%post -n libsystemd0%{?mini} -p /sbin/ldconfig
|
||||
@ -1169,9 +1168,11 @@ fi
|
||||
%config(noreplace) %{_sysconfdir}/systemd/user.conf
|
||||
|
||||
%dir %{_datadir}/dbus-1
|
||||
%dir %{_datadir}/dbus-1/services
|
||||
%dir %{_datadir}/dbus-1/system.d
|
||||
%dir %{_datadir}/dbus-1/system-services
|
||||
|
||||
%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
|
||||
%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf
|
||||
%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf
|
||||
%{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf
|
||||
@ -1201,6 +1202,7 @@ fi
|
||||
%exclude %{_datadir}/systemd/gatewayd
|
||||
%endif
|
||||
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
|
||||
@ -1330,7 +1332,6 @@ fi
|
||||
%exclude %{_udevrulesdir}/99-systemd.rules
|
||||
%{_udevrulesdir}/*.rules
|
||||
%{_udevhwdbdir}/
|
||||
%{_prefix}/lib/udev/scripts/
|
||||
%dir %{_sysconfdir}/udev/
|
||||
%dir %{_sysconfdir}/udev/rules.d/
|
||||
%ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin
|
||||
|
||||
3
systemd-v244+suse.138.gf8adabc2b1.tar.xz
Normal file
3
systemd-v244+suse.138.gf8adabc2b1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c7c4ae099d4a421225778043d0ce9bb9f3d3a59186eb7da173e5f35edbc218c5
|
||||
size 5784940
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a1347645929f05fcc785b2f4531456eb50c6916d5f15a88cfe6fb57845ed1103
|
||||
size 5761288
|
||||
@ -1,3 +1,42 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 6 14:15:01 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Import commit f8adabc2b1f3e3ad150e7a3bfa88341eda5a8a57 (merge v244.2)
|
||||
|
||||
77c04ce5c2 hwdb: update to v245-rc1
|
||||
b4eb884824 Fix typo in function name
|
||||
e2d4cb9843 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it
|
||||
83bfc0d8dd sd-bus: introduce API for re-enqueuing incoming messages
|
||||
5926f9f172 polkit: use structured initialization
|
||||
0697d0d972 polkit: on async pk requests, re-validate action/details
|
||||
2589995acd polkit: reuse some common bus message appending code
|
||||
5b2442d5c3 bus-polkit: rename return error parameter to ret_error
|
||||
0a19ff7004 shared: split out polkit stuff from bus-util.c → bus-polkit.c
|
||||
1325dfb577 test: adapt to the new capsh format
|
||||
3538fafb47 meson: update efi path detection to gnu-efi-3.0.11
|
||||
3034855a5b presets: "disable" all passive targets by default
|
||||
c2e3046819 shared/sysctl-util: normalize repeated slashes or dots to a single value
|
||||
6f4364046f dhcp6: do not use T1 and T2 longer than one provided by the lease
|
||||
0ed6cda28d network: fix implicit type conversion warning by GCC-10
|
||||
f6a5c02d26 bootspec: parse random-seed-mode line in loader.conf
|
||||
ddc5dca8a7 sd-boot: fix typo
|
||||
2bbbe9ae41 test: Synchronize journal before reading from it
|
||||
072485d661 sd-bus: fix introspection bug in signal parameter names
|
||||
80af3cf5e3 efi: fix build.
|
||||
[...]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 3 14:52:51 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Use suse.pool.ntp.org server pool on SLE (jsc#SLE-7683)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 21 16:01:09 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Drop scripts-udev-convert-lib-udev-path.sh
|
||||
|
||||
Nobody should need it these days.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 14 14:21:40 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
|
||||
25
systemd.spec
25
systemd.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package systemd
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -24,7 +24,7 @@
|
||||
%define bootstrap 0
|
||||
%define mini %nil
|
||||
%define min_kernel_version 4.5
|
||||
%define suse_version +suse.58.g8254b8d964
|
||||
%define suse_version +suse.138.gf8adabc2b1
|
||||
|
||||
%bcond_with gnuefi
|
||||
%if 0%{?bootstrap}
|
||||
@ -52,7 +52,7 @@
|
||||
%bcond_with parentpathid
|
||||
|
||||
Name: systemd
|
||||
Url: http://www.freedesktop.org/wiki/Software/systemd
|
||||
URL: http://www.freedesktop.org/wiki/Software/systemd
|
||||
Version: 244
|
||||
Release: 0
|
||||
Summary: A System and Session Manager
|
||||
@ -156,7 +156,6 @@ Source14: kbd-model-map.legacy
|
||||
Source100: scripts-systemd-fix-machines-btrfs-subvol.sh
|
||||
Source101: scripts-systemd-upgrade-from-pre-210.sh
|
||||
Source102: scripts-systemd-migrate-sysconfig-i18n.sh
|
||||
Source200: scripts-udev-convert-lib-udev-path.sh
|
||||
|
||||
# Patches listed in here are put in quarantine. Normally all
|
||||
# changes must go to upstream first and then are cherry-picked in the
|
||||
@ -237,7 +236,7 @@ This library provides several of the systemd C APIs:
|
||||
Summary: A rule-based device node and kernel event manager
|
||||
License: GPL-2.0-only
|
||||
Group: System/Kernel
|
||||
Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
|
||||
URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
|
||||
Requires: system-group-hardware
|
||||
Requires(post): sed
|
||||
Requires(post): coreutils
|
||||
@ -470,7 +469,11 @@ systemd-journal-remote, and systemd-journal-upload.
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
|
||||
%if 0%{?is_opensuse}
|
||||
ntp_servers=({0..3}.opensuse.pool.ntp.org)
|
||||
%else
|
||||
ntp_servers=({0..3}.suse.pool.ntp.org)
|
||||
%endif
|
||||
|
||||
# keep split-usr until all packages have moved their systemd rules to /usr
|
||||
%meson \
|
||||
@ -486,7 +489,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
|
||||
-Dcertificate-root=%{_sysconfdir}/pki/systemd \
|
||||
-Ddefault-hierarchy=hybrid \
|
||||
-Ddefault-kill-user-processes=false \
|
||||
-Dntp-servers="${opensuse_ntp_servers[*]}" \
|
||||
-Dntp-servers="${ntp_servers[*]}" \
|
||||
-Drc-local=/etc/init.d/boot.local \
|
||||
-Ddebug-shell=/bin/bash \
|
||||
-Dseccomp=auto \
|
||||
@ -579,9 +582,6 @@ mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn
|
||||
for s in %{S:100} %{S:101} %{S:102}; do
|
||||
install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-}
|
||||
done
|
||||
for s in %{S:200}; do
|
||||
install -m0755 -D $s %{buildroot}%{_prefix}/lib/udev/scripts/${s#*/scripts-udev-}
|
||||
done
|
||||
|
||||
# Legacy sysvinit tools
|
||||
mkdir -p %{buildroot}/sbin
|
||||
@ -866,7 +866,6 @@ systemctl daemon-reload || :
|
||||
|
||||
%posttrans -n udev%{?mini}
|
||||
%regenerate_initrd_posttrans
|
||||
%{_prefix}/lib/udev/scripts/convert-lib-udev-path.sh || :
|
||||
|
||||
%post -n libudev%{?mini}1 -p /sbin/ldconfig
|
||||
%post -n libsystemd0%{?mini} -p /sbin/ldconfig
|
||||
@ -1167,9 +1166,11 @@ fi
|
||||
%config(noreplace) %{_sysconfdir}/systemd/user.conf
|
||||
|
||||
%dir %{_datadir}/dbus-1
|
||||
%dir %{_datadir}/dbus-1/services
|
||||
%dir %{_datadir}/dbus-1/system.d
|
||||
%dir %{_datadir}/dbus-1/system-services
|
||||
|
||||
%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
|
||||
%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf
|
||||
%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf
|
||||
%{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf
|
||||
@ -1199,6 +1200,7 @@ fi
|
||||
%exclude %{_datadir}/systemd/gatewayd
|
||||
%endif
|
||||
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
|
||||
@ -1328,7 +1330,6 @@ fi
|
||||
%exclude %{_udevrulesdir}/99-systemd.rules
|
||||
%{_udevrulesdir}/*.rules
|
||||
%{_udevhwdbdir}/
|
||||
%{_prefix}/lib/udev/scripts/
|
||||
%dir %{_sysconfdir}/udev/
|
||||
%dir %{_sysconfdir}/udev/rules.d/
|
||||
%ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin
|
||||
|
||||
Loading…
Reference in New Issue
Block a user