From 791e2ffa6c9dde409bee59d00fb505d3f19fbd52ff9f15436a52252c44f4b108 Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Tue, 29 Aug 2017 05:55:21 +0000 Subject: [PATCH 1/4] Accepting request 519251 from home:BinLiu:branches:network:ha-clustering:Factory 3) remove "||:" from tpmfiles_create if tmpfiles_create not defined, and add to the line when it is called. OBS-URL: https://build.opensuse.org/request/show/519251 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=104 --- corosync.changes | 1 + corosync.spec | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/corosync.changes b/corosync.changes index 8e75b22..7d7ff02 100644 --- a/corosync.changes +++ b/corosync.changes @@ -19,6 +19,7 @@ Thu Aug 3 02:49:21 UTC 2017 - bliu@suse.com Modified:corosync.spec 1) as in openSUSE:factory, there are %define, but bcond_with coudld be toggled by osc command , change %define to %bcond_with and %bcond_without 2) change service_del_postun to service_del_preun, since service_del_postun is not a right macro + 3) remove "||:" from tpmfiles_create if tmpfiles_create not defined, and add to the line when it is called. ------------------------------------------------------------------- diff --git a/corosync.spec b/corosync.spec index 33dffc0..dadd659 100644 --- a/corosync.spec +++ b/corosync.spec @@ -33,7 +33,7 @@ %bcond_without qnetd %if !%{defined tmpfiles_create} -%define tmpfiles_create systemd-tmpfiles --create ||: +%define tmpfiles_create systemd-tmpfiles --create %endif %if 0%{?sles_version} == 12 @@ -275,7 +275,7 @@ APIs and libraries, default configuration files, and an init script. %service_add_pre corosync.service corosync-notifyd.service %post -%tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd +%tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd ||: %{fillup_and_insserv -n corosync} %service_add_post corosync.service corosync-notifyd.service @@ -551,7 +551,7 @@ getent passwd coroqnetd >/dev/null || useradd -r -g coroqnetd -u 701 -s /sbin/no exit 0 %post -n corosync-qnetd -%tmpfiles_create /usr/lib/tmpfiles.d/corosync-qnetd.conf +%tmpfiles_create /usr/lib/tmpfiles.d/corosync-qnetd.conf ||: %if %{sles_version} > 0 ln -s /run/corosync-qnetd /var/run/ %endif From d1c555f69ac9288c5197741387c618901ef973525312e5941219c56575d6eac4 Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Tue, 29 Aug 2017 08:00:14 +0000 Subject: [PATCH 2/4] Accepting request 519278 from home:BinLiu:branches:network:ha-clustering:Factory - corosync.service should be marked as a static service(bsc#1055585) Added: 0012-mark-corosync-as-a-static-service.patch OBS-URL: https://build.opensuse.org/request/show/519278 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=105 --- 0012-mark-corosync-as-a-static-service.patch | 8 ++++++++ corosync.changes | 6 ++++++ corosync.spec | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 0012-mark-corosync-as-a-static-service.patch diff --git a/0012-mark-corosync-as-a-static-service.patch b/0012-mark-corosync-as-a-static-service.patch new file mode 100644 index 0000000..842fc9e --- /dev/null +++ b/0012-mark-corosync-as-a-static-service.patch @@ -0,0 +1,8 @@ +--- corosync-2.4.2.orig/init/corosync.service.in 2017-08-29 15:47:18.131052520 +0800 ++++ corosync-2.4.2/init/corosync.service.in 2017-08-29 15:46:24.949842298 +0800 +@@ -23,4 +23,4 @@ + #ExecStartPre=/sbin/modprobe softdog soft_margin=60 + + [Install] +-WantedBy=multi-user.target ++#WantedBy=multi-user.target diff --git a/corosync.changes b/corosync.changes index 7d7ff02..1931b55 100644 --- a/corosync.changes +++ b/corosync.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 29 07:50:16 UTC 2017 - bliu@suse.com + +- corosync.service should be marked as a static service(bsc#1055585) + Added: 0012-mark-corosync-as-a-static-service.patch + ------------------------------------------------------------------- Tue Aug 8 08:17:27 UTC 2017 - jengelh@inai.de diff --git a/corosync.spec b/corosync.spec index dadd659..f63b231 100644 --- a/corosync.spec +++ b/corosync.spec @@ -75,6 +75,7 @@ Patch18: 0008-main.c-add-option-to-set-priority.patch Patch19: 0009-totem-Propagate-totem-initialization-failure.patch Patch20: 0010-fix-ifdown-udp.patch Patch21: 0011-fix-tmpfiles-create.patch +Patch22: 0012-mark-corosync-as-a-static-service.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # openais is indeed gone and should be uninstalled. Yes, we do not @@ -154,6 +155,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 %build %if %{with runautogen} From 81c78de08e3dac1cea05a5b927e5f14bc4544ebac5d0ffd35b34d182074879f7 Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Tue, 29 Aug 2017 09:54:18 +0000 Subject: [PATCH 3/4] Accepting request 519298 from home:BinLiu:branches:network:ha-clustering:Factory 3) remove macro tpmfiles_create define from corosync.spec. OBS-URL: https://build.opensuse.org/request/show/519298 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=106 --- corosync.changes | 2 +- corosync.spec | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/corosync.changes b/corosync.changes index 1931b55..8e233f4 100644 --- a/corosync.changes +++ b/corosync.changes @@ -25,7 +25,7 @@ Thu Aug 3 02:49:21 UTC 2017 - bliu@suse.com Modified:corosync.spec 1) as in openSUSE:factory, there are %define, but bcond_with coudld be toggled by osc command , change %define to %bcond_with and %bcond_without 2) change service_del_postun to service_del_preun, since service_del_postun is not a right macro - 3) remove "||:" from tpmfiles_create if tmpfiles_create not defined, and add to the line when it is called. + 3) remove macro tpmfiles_create define from corosync.spec. ------------------------------------------------------------------- diff --git a/corosync.spec b/corosync.spec index f63b231..98112e5 100644 --- a/corosync.spec +++ b/corosync.spec @@ -32,10 +32,6 @@ %bcond_without qdevices %bcond_without qnetd -%if !%{defined tmpfiles_create} -%define tmpfiles_create systemd-tmpfiles --create -%endif - %if 0%{?sles_version} == 12 %ifnarch s390 s390x %define buildib 1 From aca77467e91bd84e6c8f01e61c760058e62c1f181186adbdea7dc0b20bf279d4 Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Tue, 29 Aug 2017 09:56:24 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=107 --- corosync.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/corosync.spec b/corosync.spec index 98112e5..c50e6ec 100644 --- a/corosync.spec +++ b/corosync.spec @@ -273,7 +273,7 @@ APIs and libraries, default configuration files, and an init script. %service_add_pre corosync.service corosync-notifyd.service %post -%tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd ||: +%tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd %{fillup_and_insserv -n corosync} %service_add_post corosync.service corosync-notifyd.service @@ -549,7 +549,7 @@ getent passwd coroqnetd >/dev/null || useradd -r -g coroqnetd -u 701 -s /sbin/no exit 0 %post -n corosync-qnetd -%tmpfiles_create /usr/lib/tmpfiles.d/corosync-qnetd.conf ||: +%tmpfiles_create /usr/lib/tmpfiles.d/corosync-qnetd.conf %if %{sles_version} > 0 ln -s /run/corosync-qnetd /var/run/ %endif