Accepting request 791772 from home:fbui:systemd:openSUSE-Factory

- Import commit c5aa158173ced05201182d1cc18632a25cf43b94 (merge v245.4)

- Add 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch

OBS-URL: https://build.opensuse.org/request/show/791772
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1092
This commit is contained in:
Franck Bui 2020-04-06 12:58:22 +00:00 committed by Git OBS Bridge
parent e62050b7fb
commit c39def530e
7 changed files with 54 additions and 5 deletions

View File

@ -0,0 +1,27 @@
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,13 @@
-------------------------------------------------------------------
Mon Apr 6 12:42:01 UTC 2020 - Franck Bui <fbui@suse.com>
- Import commit c5aa158173ced05201182d1cc18632a25cf43b94 (merge v245.4)
-------------------------------------------------------------------
Mon Apr 6 10:02:33 UTC 2020 - Franck Bui <fbui@suse.com>
- Add 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch
-------------------------------------------------------------------
Thu Mar 19 09:32:41 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.57.g31f82b39c8
%define suse_version +suse.83.gc5aa158173
%bcond_with gnuefi
%if 0%{?bootstrap}
@ -168,6 +168,7 @@ 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

View File

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

View File

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

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Apr 6 12:42:01 UTC 2020 - Franck Bui <fbui@suse.com>
- Import commit c5aa158173ced05201182d1cc18632a25cf43b94 (merge v245.4)
-------------------------------------------------------------------
Mon Apr 6 10:02:33 UTC 2020 - Franck Bui <fbui@suse.com>
- Add 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch
-------------------------------------------------------------------
Thu Mar 19 09:32:41 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.57.g31f82b39c8
%define suse_version +suse.83.gc5aa158173
%bcond_with gnuefi
%if 0%{?bootstrap}
@ -166,6 +166,7 @@ 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