Accepting request 796797 from Base:System

OBS-URL: https://build.opensuse.org/request/show/796797
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=307
This commit is contained in:
Dominique Leuenberger 2020-04-25 18:16:51 +00:00 committed by Git OBS Bridge
parent fa9b776f47
commit 815d358fde
7 changed files with 59 additions and 36 deletions

View File

@ -1,27 +0,0 @@
From 525cbb666e260770ad191d06dac0ab79e341bbe2 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Mon, 6 Apr 2020 11:50:29 +0200
Subject: [PATCH 1/1] meson: fix build of udev 'path_id_compat' builtin with
meson 0.54
Since meson 0.54, branch compats/udev-compat-symlinks needs this fix but it
should be applied while merging compats/udev-compat-symlinks branch.
---
src/udev/compat/meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/udev/compat/meson.build b/src/udev/compat/meson.build
index 3d683c7ce9..18df75222d 100644
--- a/src/udev/compat/meson.build
+++ b/src/udev/compat/meson.build
@@ -4,7 +4,6 @@ foreach prog : ['path_id_compat.c']
prog,
include_directories : includes,
c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
- link_with : [libudev_internal],
link_with : [libudev_static],
install_rpath : udev_rpath,
install : true,
--
2.16.4

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Fri Apr 24 07:38:48 UTC 2020 - Franck Bui <fbui@suse.com>
- Drop %tmpfiles_create portables.conf from %post of networkd sub-package
It was probably mistakenly added because systemd-portable served as
template for systemd-network.
-------------------------------------------------------------------
Thu Apr 23 14:17:31 UTC 2020 - Franck Bui <fbui@suse.com>
- Import commit 08cd65ac385c884ed6e4bd71128a0796f56ecd17 (include merge of v245.5)
1ceedf8535 meson: fix build of udev 'path_id_compat' builtin with meson 0.54
e61569d4a9 pid1: by default make user units inherit their umask from the user manager (bsc#1162698)
64fdacd5f1 user-util: rework how we validate user names (bsc#1170272)
[...]
-------------------------------------------------------------------
Thu Apr 23 14:00:42 UTC 2020 - Franck Bui <fbui@suse.com>
- Drop 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch
It's been merged in 'openSUSE-Factory' branch otherwise this branch
won't build anymore since meson has been upgraded to version 0.54 in
Factory.
-------------------------------------------------------------------
Wed Apr 15 19:06:27 UTC 2020 - Franck Bui <fbui@suse.com>

View File

@ -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.83.gc5aa158173
%define suse_version +suse.117.g08cd65ac38
%bcond_with gnuefi
%if 0%{?bootstrap}
@ -168,7 +168,6 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh
Patch1: 0001-SUSE-policy-do-not-clean-tmp-by-default.patch
Patch2: 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch
Patch3: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch
Patch4: 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -976,7 +975,6 @@ fi
%endif
%post network
%tmpfiles_create portables.conf
%if %{with networkd}
%service_add_post systemd-networkd.service
%service_add_post systemd-networkd-wait-online.service

View File

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

View File

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

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Fri Apr 24 07:38:48 UTC 2020 - Franck Bui <fbui@suse.com>
- Drop %tmpfiles_create portables.conf from %post of networkd sub-package
It was probably mistakenly added because systemd-portable served as
template for systemd-network.
-------------------------------------------------------------------
Thu Apr 23 14:17:31 UTC 2020 - Franck Bui <fbui@suse.com>
- Import commit 08cd65ac385c884ed6e4bd71128a0796f56ecd17 (include merge of v245.5)
1ceedf8535 meson: fix build of udev 'path_id_compat' builtin with meson 0.54
e61569d4a9 pid1: by default make user units inherit their umask from the user manager (bsc#1162698)
64fdacd5f1 user-util: rework how we validate user names (bsc#1170272)
[...]
-------------------------------------------------------------------
Thu Apr 23 14:00:42 UTC 2020 - Franck Bui <fbui@suse.com>
- Drop 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch
It's been merged in 'openSUSE-Factory' branch otherwise this branch
won't build anymore since meson has been upgraded to version 0.54 in
Factory.
-------------------------------------------------------------------
Wed Apr 15 19:06:27 UTC 2020 - Franck Bui <fbui@suse.com>

View File

@ -24,7 +24,7 @@
%define bootstrap 0
%define mini %nil
%define min_kernel_version 4.5
%define suse_version +suse.83.gc5aa158173
%define suse_version +suse.117.g08cd65ac38
%bcond_with gnuefi
%if 0%{?bootstrap}
@ -166,7 +166,6 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh
Patch1: 0001-SUSE-policy-do-not-clean-tmp-by-default.patch
Patch2: 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch
Patch3: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch
Patch4: 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -974,7 +973,6 @@ fi
%endif
%post network
%tmpfiles_create portables.conf
%if %{with networkd}
%service_add_post systemd-networkd.service
%service_add_post systemd-networkd-wait-online.service