Hello community, here is the log from the commit of package opensm for openSUSE:Factory checked in at 2015-03-11 09:57:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opensm (Old) and /work/SRC/openSUSE:Factory/.opensm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opensm" Changes: -------- --- /work/SRC/openSUSE:Factory/opensm/opensm.changes 2014-09-01 16:59:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.opensm.new/opensm.changes 2015-03-11 09:57:37.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Mar 8 10:26:43 UTC 2015 - [email protected] + +- Update to version 3.3.19 + * No concise list of changes present so see the file ChangeLog in + the package documentation directory. +- Move to systemd + * Replace opensmd with opensm.service + * Replace sldd.sh with opensm.launch + * Add systemd-rpm-macros and %{?systemd_requires} require + * Replace sysvinit post/postun macros with systemd one +- Use download Url as source +- Get rid of some extra stuff + +------------------------------------------------------------------- @@ -24 +38 @@ -- Update to 3.3.17 for fate#315488. No concise list of chabges +- Update to 3.3.17 for fate#315488. No concise list of changes Old: ---- opensm-3.3.17.tar.gz opensmd sldd.sh New: ---- opensm-3.3.19.tar.gz opensm.launch opensm.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensm.spec ++++++ --- /var/tmp/diff_new_pack.DmR4Im/_old 2015-03-11 09:57:38.000000000 +0100 +++ /var/tmp/diff_new_pack.DmR4Im/_new 2015-03-11 09:57:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package opensm # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products 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,46 +16,20 @@ # -%if %{?_with_console_socket:1}%{!?_with_console_socket:0} -%define _enable_console_socket --enable-console-socket -%endif -%if %{?_without_console_socket:1}%{!?_without_console_socket:0} -%define _disable_console_socket --disable-console-socket -%endif - -%if %{?_with_perf_mgr:1}%{!?_with_perf_mgr:0} -%define _enable_perf_mgr --enable-perf-mgr -%endif -%if %{?_without_perf_mgr:1}%{!?_without_perf_mgr:0} -%define _disable_perf_mgr --disable-perf-mgr -%endif - -%if %{?_with_event_plugin:1}%{!?_with_event_plugin:0} -%define _enable_event_plugin --enable-default-event-plugin -%endif -%if %{?_without_event_plugin:1}%{!?_without_event_plugin:0} -%define _disable_event_plugin --disable-default-event-plugin -%endif - -%if %{?_with_node_name_map:1}%{!?_with_node_name_map:0} -%define _enable_node_name_map --with-node-name-map%{?_with_node_name_map} -%endif - Name: opensm Summary: Infiniband Subnet Manager License: BSD-2-Clause or GPL-2.0 Group: Productivity/Networking/System -Version: 3.3.17 +Version: 3.3.19 Release: 0 -Source0: %{name}-%{version}.tar.gz +Source0: https://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz Source1: conf.sysconfig -Source2: sldd.sh -Source3: opensmd +Source2: %{name}.launch +Source3: opensm.service Source4: baselibs.conf Patch0: opensm-autotools.patch Patch1: opensm-type_punning.patch Url: http://www.openfabrics.org -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -64,8 +38,10 @@ BuildRequires: libibumad-devel BuildRequires: libibverbs-devel BuildRequires: libtool +BuildRequires: systemd-rpm-macros PreReq: %fillup_prereq Requires: logrotate +%{?systemd_requires} %define so_major 3 %define opensm_libname libs%{so_major} @@ -104,14 +80,7 @@ %build autoreconf -fi -%configure --disable-static \ - %{?_enable_console_socket} \ - %{?_disable_console_socket} \ - %{?_enable_perf_mgr} \ - %{?_disable_perf_mgr} \ - %{?_enable_event_plugin} \ - %{?_disable_event_plugin} \ - %{?_enable_node_name_map} +%configure --disable-static make %{?_smp_mflags} V=1 %install @@ -119,11 +88,11 @@ make DESTDIR=%{buildroot} install install -D -m 644 scripts/opensm.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/opensm -# get rid of the included init script because we bring our own one -rm %{buildroot}%_sysconfdir/init.d/opensmd -install -m 755 opensmd %{buildroot}%_sysconfdir/init.d/ -install -D sldd.sh %{buildroot}/%_bindir/sldd.sh -ln -s %_sysconfdir/init.d/opensmd %{buildroot}%{_sbindir}/rcopensmd +# get rid of the included init script because we use a systemd unit file instead +rm -rf %{buildroot}%_sysconfdir/init.d/ +install -Dm 644 %{SOURCE3} %{buildroot}%_unitdir/%{name}.service +install -D %{SOURCE2} %{buildroot}%{_libexecdir}/opensm-launch +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}d # install the sysconfig configuration file install -m 644 -D conf.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.%name @@ -135,17 +104,20 @@ #we don't package static libraries anymore. rm -f %{buildroot}%_libdir/lib{opensm,osmcomp,osmvendor}.la +%pre +%service_add_pre opensm.service + %post %{fillup_only} +%service_add_post opensm.service %post %{opensm_libname} -p /sbin/ldconfig %preun -%stop_on_removal opensmd +%service_del_preun opensm.service %postun -%restart_on_update opensmd -%insserv_cleanup +%service_del_postun opensm.service %postun %{opensm_libname} -p /sbin/ldconfig @@ -153,10 +125,10 @@ %defattr(-, root, root) %_sysconfdir/opensm.conf %doc COPYING -%_sysconfdir/init.d/opensmd +%_unitdir/opensm.service %config %_sysconfdir/logrotate.d/opensm -%_bindir/* %_sbindir/* +%{_libexecdir}/opensm-launch %_mandir/man5/torus-2QoS.conf.5.gz %_mandir/man8/torus-2QoS.8.gz %_mandir/man8/opensm.8.gz ++++++ opensm-3.3.17.tar.gz -> opensm-3.3.19.tar.gz ++++++ ++++ 12742 lines of diff (skipped) ++++++ opensm.launch ++++++ #!/bin/bash # # Launch the necessary OpenSM daemons for systemd # # sysconfig: /etc/sysconfig/opensm # config: /etc/rdma/opensm.conf # shopt -s nullglob prog=/usr/sbin/opensm [ -f /etc/sysconfig/opensm ] && . /etc/sysconfig/opensm [ -n "$PRIORITY" ] && prio="-p $PRIORITY" if [ -z "$GUIDS" ]; then CONFIGS="" CONFIG_CNT=0 for conf in /etc/rdma/opensm.conf.[0-9]*; do CONFIGS="$CONFIGS $conf" let CONFIG_CNT++ done else GUID_CNT=0 for guid in $GUIDS; do let GUID_CNT++ done fi # Start opensm if [ -n "$GUIDS" ]; then SUBNET_COUNT=0 for guid in $GUIDS; do SUBNET_PREFIX=`printf "0xfe800000000000%02d" $SUBNET_COUNT` (while true; do $prog $prio -g $guid --subnet_prefix $SUBNET_PREFIX; sleep 30; done) & let SUBNET_COUNT++ done elif [ -n "$CONFIGS" ]; then for config in $CONFIGS; do (while true; do $prog $prio -F $config; sleep 30; done) & done else (while true; do $prog $prio; sleep 30; done) & fi exit 0 ++++++ opensm.service ++++++ [Unit] Description=Starts the OpenSM InfiniBand fabric Subnet Manager Documentation=man:opensm DefaultDependencies=false Before=network.target remote-fs-pre.target Requires=rdma.service After=rdma.service [Service] Type=forking ExecStart=/usr/lib/opensm-launch [Install] WantedBy=network.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
