Accepting request 545006 from network:ha-clustering:Factory

OBS-URL: https://build.opensuse.org/request/show/545006
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocfs2-tools?expand=0&rev=69
This commit is contained in:
Dominique Leuenberger 2017-11-24 09:56:41 +00:00 committed by Git OBS Bridge
commit 648d05c2af
3 changed files with 23 additions and 109 deletions

View File

@ -1,95 +0,0 @@
#!/bin/bash
# Copyright (c) 2008 Andrew Beekhof
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany
# All Rights Reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of version 2 of the GNU General Public License as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it would be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
# Further, this software is distributed without any warranty that it is
# free of the rightful claim of any third person regarding infringement
# or the like. Any license provided herein, whether implied or
# otherwise, applies only to this software file. Patent licenses, if
# any, provided herein do not apply to combinations of this program with
# other software, or any other product whatsoever.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write the Free Software Foundation,
# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
#
#######################################################################
# OCF initialization
. ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
# Parameter defaults
: ${OCF_RESKEY_stack:="pcmk"}
: ${OCF_RESKEY_sysfs:="/sys/fs"}
: ${OCF_RESKEY_daemon_timeout:="10"}
: ${OCF_RESKEY_configfs:="/sys/kernel/config"}
: ${OCF_RESKEY_CRM_meta_gloablly_unique:="false"}
o2cb_start() {
ocf_log info "o2cb is now obsolete. Please remove the o2cb resource agent in your next maintenance window!"
return $OCF_SUCCESS
}
o2cb_stop() {
ocf_log info "o2cb is now obsolete. Please remove the o2cb resource agent in your next maintenance window!"
return $OCF_SUCCESS
}
o2cb_usage() {
echo "usage: $0 {start|stop|meta-data}"
return $OCF_SUCCESS
}
o2cb_monitor() {
return $OCF_SUCCESS
}
meta_data() {
cat <<END
<?xml version="1.0"?>
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
<resource-agent name="o2cb">
<version>1.0</version>
<shortdesc lang="en">OBSOLETE o2cb resource agent OBSOLETE</shortdesc>
<longdesc lang="en">
This is a o2cb Resource Agent. This is now obsolete!
</longdesc>
<parameters>
</parameters>
<actions>
<action name="start" timeout="90" />
<action name="stop" timeout="100" />
<action name="monitor" timeout="20" depth="0"/>
</actions>
</resource-agent>
END
}
case $__OCF_ACTION in
meta-data) meta_data
exit $OCF_SUCCESS
;;
start) o2cb_start
;;
stop) o2cb_stop
;;
monitor) o2cb_monitor
;;
usage|help) o2cb_usage
exit $OCF_SUCCESS
;;
*) o2cb_usage
exit $OCF_ERR_UNIMPLEMENTED
;;
esac
exit $?

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Nov 23 13:48:49 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
- Correct clearly invalid .changes timestamp
-------------------------------------------------------------------
Wed Nov 22 10:30:00 UTC 2017 - ghe@suse.com
- Remove o2cb resource agent which is obsolete (bsc#1069099)
-------------------------------------------------------------------
Mon Oct 23 14:25:30 UTC 2017 - ghe@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package ocfs2-tools
#
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,6 +16,11 @@
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
Name: ocfs2-tools
Version: 1.8.5
Release: 0
@ -24,8 +29,7 @@ License: GPL-2.0
Group: System/Filesystems
Url: https://ocfs2.wiki.kernel.org/
Source: ocfs2-tools-%{version}.tar.gz
Source1: o2cb.ocf
Source2: reflink.tar.bz2
Source1: reflink.tar.bz2
Patch001: auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
Patch103: debug-ocfs2_hb_ctl.patch
Patch105: bug-470741-debug_start_failures.patch
@ -133,7 +137,7 @@ This package contains the tools to manage the native o2cb stack for the
OCFS2 filesystem.
%prep
%setup -q -a 2
%setup -q -a 1
%patch001 -p1
%patch103 -p1
%patch105 -p1
@ -166,13 +170,10 @@ cd ..
%install
mkdir -p %{buildroot}/sbin
mkdir -p %{buildroot}%{_prefix}/bin
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
mkdir -p %{buildroot}%{_fillupdir}
mkdir -p %{buildroot}%{_udevrulesdir}
mkdir -p %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2
cp -f vendor/common/51-ocfs2.rules %{buildroot}%{_udevrulesdir}
cp -f $RPM_SOURCE_DIR/o2cb.ocf %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
chmod a+x %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
cp -f vendor/common/o2cb.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
cp -f vendor/common/o2cb.sysconfig %{buildroot}%{_fillupdir}/sysconfig.o2cb
%if %{systemd_enabled}
mkdir -p %{buildroot}/usr/lib/systemd/system
@ -244,10 +245,6 @@ python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}
%{_mandir}/man5/ocfs2.cluster.conf.5.gz
%{_mandir}/man7/ocfs2.7.gz
%{_mandir}/man1/o2info.1.gz
%dir %{_prefix}/lib/ocf
%dir %{_prefix}/lib/ocf/resource.d
%dir %{_prefix}/lib/ocf/resource.d/ocfs2
%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
%files -n ocfs2console
%defattr(-,root,root)
@ -274,7 +271,7 @@ python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}
%endif
%{_mandir}/man8/o2cb_ctl.8*
%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
%{_fillupdir}/sysconfig.o2cb
%{_mandir}/man7/o2cb.7.gz
%{_mandir}/man8/o2cb.8.gz