From cf48c124f789746f895bf7ba0a5177c567b018249bc2369522baba46bc574eca Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 9 Feb 2018 14:26:29 +0000 Subject: [PATCH] - Import commit 4a6a1e4f0b02e6cedf7eba93b85a6dd968f875c7 db1d8eacd compat-rules: make path_id_compat build with meson - Drop 0001-compat-rules-make-path_id_compat-build-with-meson.patch which is now part of the git repo (see above). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1011 --- ...make-path_id_compat-build-with-meson.patch | 41 ------------------- systemd-234.tar.xz | 4 +- systemd-mini.changes | 10 +++++ systemd-mini.spec | 3 +- systemd.changes | 10 +++++ systemd.spec | 3 +- 6 files changed, 24 insertions(+), 47 deletions(-) delete mode 100644 0001-compat-rules-make-path_id_compat-build-with-meson.patch diff --git a/0001-compat-rules-make-path_id_compat-build-with-meson.patch b/0001-compat-rules-make-path_id_compat-build-with-meson.patch deleted file mode 100644 index deecae1..0000000 --- a/0001-compat-rules-make-path_id_compat-build-with-meson.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1cbe23da27e68bd3c7ca2a2fe6007d9a53533de9 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Fri, 2 Feb 2018 17:58:19 +0100 -Subject: [PATCH 1/1] compat-rules: make path_id_compat build with meson - ---- - src/udev/compat/meson.build | 11 +++++++++++ - src/udev/meson.build | 2 ++ - 2 files changed, 13 insertions(+) - create mode 100644 src/udev/compat/meson.build - -diff --git a/src/udev/compat/meson.build b/src/udev/compat/meson.build -new file mode 100644 -index 000000000..0d77da2e1 ---- /dev/null -+++ b/src/udev/compat/meson.build -@@ -0,0 +1,11 @@ -+foreach prog : ['path_id_compat.c'] -+ -+ executable(prog.split('.')[0], -+ prog, -+ include_directories : includes, -+ c_args : ['-DLOG_REALM=LOG_REALM_UDEV'], -+ link_with : [libudev_internal], -+ install_rpath : udev_rpath, -+ install : true, -+ install_dir : udevlibexecdir) -+endforeach -diff --git a/src/udev/meson.build b/src/udev/meson.build -index 13cd26bb8..4aa431ecc 100644 ---- a/src/udev/meson.build -+++ b/src/udev/meson.build -@@ -151,3 +151,5 @@ install_data(udev_pc, - - meson.add_install_script('sh', '-c', - mkdir_p.format(join_paths(sysconfdir, 'udev/rules.d'))) -+ -+subdir('compat') --- -2.15.1 - diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index ff0ac11..bf54056 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67c4157ca16b0e7ee1d02b11463df889aac4f25f682388357da029125eb3e367 -size 3353968 +oid sha256:3ebafff50a8ea2bce9ed34712b14947d8754fbdd4a1c085aa9dd285450e8dd2d +size 3354512 diff --git a/systemd-mini.changes b/systemd-mini.changes index 7e9eb93..4b3c533 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Feb 9 14:01:24 UTC 2018 - fbui@suse.com + +- Import commit 4a6a1e4f0b02e6cedf7eba93b85a6dd968f875c7 + + db1d8eacd compat-rules: make path_id_compat build with meson + +- Drop 0001-compat-rules-make-path_id_compat-build-with-meson.patch + which is now part of the git repo (see above). + ------------------------------------------------------------------- Fri Feb 9 07:59:56 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 5d63313..003b565 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -159,7 +159,6 @@ Source1065: udev-remount-tmpfs # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-compat-rules-make-path_id_compat-build-with-meson.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -404,7 +403,7 @@ Some systemd commands offer bash completion, but it is an optional dependency. %prep %setup -q -n systemd-%{version} -%autopatch -p1 +# %autopatch -p1 %build # keep split-usr until all packages have moved their systemd rules to /usr diff --git a/systemd.changes b/systemd.changes index 7e9eb93..4b3c533 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Feb 9 14:01:24 UTC 2018 - fbui@suse.com + +- Import commit 4a6a1e4f0b02e6cedf7eba93b85a6dd968f875c7 + + db1d8eacd compat-rules: make path_id_compat build with meson + +- Drop 0001-compat-rules-make-path_id_compat-build-with-meson.patch + which is now part of the git repo (see above). + ------------------------------------------------------------------- Fri Feb 9 07:59:56 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 138409b..351d963 100644 --- a/systemd.spec +++ b/systemd.spec @@ -157,7 +157,6 @@ Source1065: udev-remount-tmpfs # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-compat-rules-make-path_id_compat-build-with-meson.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -402,7 +401,7 @@ Some systemd commands offer bash completion, but it is an optional dependency. %prep %setup -q -n systemd-%{version} -%autopatch -p1 +# %autopatch -p1 %build # keep split-usr until all packages have moved their systemd rules to /usr