View | Details | Raw Unified | Return to ticket 2092 | Differences between
and this patch

Collapse All | Expand All

(-)a/slurm.spec (-23 / +119 lines)
Lines 97-106 Source: %{name}-%{version}-%{release}.tgz Link Here
97
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
97
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
98
URL: http://slurm.schedmd.com/
98
URL: http://slurm.schedmd.com/
99
99
100
Requires: slurm-plugins
100
Requires: slurm-plugins = %{version}-%{release}
101
101
102
%ifos linux
102
%ifos linux
103
BuildRequires: python
103
BuildRequires: python
104
BuildRequires: libibmad-devel libibverbs-devel librdmacm-devel
105
BuildRequires: hwloc-devel rrdtool-devel freeipmi-devel
106
BuildRequires: gtk2-devel glib2-devel man
107
BuildRequires: numactl-devel hdf5-devel
108
BuildRequires: json-c-devel libcurl-devel
109
%if 0%{?rhel} >= 7
110
BuildRequires: systemd
111
Requires(post): systemd
112
Requires(preun): systemd
113
Requires(postun): systemd
114
%else
115
Requires(post): chkconfig
116
Requires(preun): chkconfig
117
Requires(postun): initscripts
118
%endif
104
%endif
119
%endif
105
120
106
%ifos solaris
121
%ifos solaris
Lines 244-250 scheduling and accounting modules Link Here
244
%package perlapi
259
%package perlapi
245
Summary: Perl API to Slurm
260
Summary: Perl API to Slurm
246
Group: Development/System
261
Group: Development/System
247
Requires: slurm
262
Requires: slurm = %{version}-%{release}
248
%description perlapi
263
%description perlapi
249
Perl API package for Slurm.  This package includes the perl API to provide a
264
Perl API package for Slurm.  This package includes the perl API to provide a
250
helpful interface to Slurm through Perl
265
helpful interface to Slurm through Perl
Lines 252-258 helpful interface to Slurm through Perl Link Here
252
%package devel
267
%package devel
253
Summary: Development package for Slurm
268
Summary: Development package for Slurm
254
Group: Development/System
269
Group: Development/System
255
Requires: slurm
270
Requires: slurm = %{version}-%{release}
256
%description devel
271
%description devel
257
Development package for Slurm.  This package includes the header files
272
Development package for Slurm.  This package includes the header files
258
and static libraries for the Slurm API
273
and static libraries for the Slurm API
Lines 261-267 and static libraries for the Slurm API Link Here
261
%package auth-none
276
%package auth-none
262
Summary: Slurm auth NULL implementation (no authentication)
277
Summary: Slurm auth NULL implementation (no authentication)
263
Group: System Environment/Base
278
Group: System Environment/Base
264
Requires: slurm
279
Requires: slurm = %{version}-%{release}
265
%description auth-none
280
%description auth-none
266
Slurm NULL authentication module
281
Slurm NULL authentication module
267
%endif
282
%endif
Lines 270-276 Slurm NULL authentication module Link Here
270
%package auth-authd
285
%package auth-authd
271
Summary: Slurm auth implementation using Brent Chun's authd
286
Summary: Slurm auth implementation using Brent Chun's authd
272
Group: System Environment/Base
287
Group: System Environment/Base
273
Requires: slurm authd
288
Requires: slurm = %{version}-%{release}, authd
274
%description auth-authd
289
%description auth-authd
275
Slurm authentication module for Brent Chun's authd. Used to
290
Slurm authentication module for Brent Chun's authd. Used to
276
authenticate user originating an RPC
291
authenticate user originating an RPC
Lines 282-288 authenticate user originating an RPC Link Here
282
%package munge
297
%package munge
283
Summary: Slurm authentication and crypto implementation using Munge
298
Summary: Slurm authentication and crypto implementation using Munge
284
Group: System Environment/Base
299
Group: System Environment/Base
285
Requires: slurm munge
300
Requires: slurm = %{version}-%{release}, munge
286
BuildRequires: munge-devel munge-libs
301
BuildRequires: munge-devel munge-libs
287
Obsoletes: slurm-auth-munge
302
Obsoletes: slurm-auth-munge
288
%description munge
303
%description munge
Lines 294-300 authenticate user originating an RPC, digitally sign and/or encrypt messages Link Here
294
%package bluegene
309
%package bluegene
295
Summary: Slurm interfaces to IBM Blue Gene system
310
Summary: Slurm interfaces to IBM Blue Gene system
296
Group: System Environment/Base
311
Group: System Environment/Base
297
Requires: slurm
312
Requires: slurm = %{version}-%{release}
298
%description bluegene
313
%description bluegene
299
Slurm plugin interfaces to IBM Blue Gene system
314
Slurm plugin interfaces to IBM Blue Gene system
300
%endif
315
%endif
Lines 302-308 Slurm plugin interfaces to IBM Blue Gene system Link Here
302
%package slurmdbd
317
%package slurmdbd
303
Summary: Slurm database daemon
318
Summary: Slurm database daemon
304
Group: System Environment/Base
319
Group: System Environment/Base
305
Requires: slurm-plugins slurm-sql
320
Requires: slurm-plugins = %{version}-%{release}, slurm-sql = %{version}-%{release}
306
%description slurmdbd
321
%description slurmdbd
307
Slurm database daemon. Used to accept and process database RPCs and upload
322
Slurm database daemon. Used to accept and process database RPCs and upload
308
database changes to slurmctld daemons on each cluster
323
database changes to slurmctld daemons on each cluster
Lines 325-338 are in other packages Link Here
325
%package torque
340
%package torque
326
Summary: Torque/PBS wrappers for transitition from Torque/PBS to Slurm
341
Summary: Torque/PBS wrappers for transitition from Torque/PBS to Slurm
327
Group: Development/System
342
Group: Development/System
328
Requires: slurm-perlapi
343
Requires: slurm-perlapi = %{version}-%{release}
329
%description torque
344
%description torque
330
Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm
345
Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm
331
346
332
%package sjobexit
347
%package sjobexit
333
Summary: Slurm job exit code management tools
348
Summary: Slurm job exit code management tools
334
Group: Development/System
349
Group: Development/System
335
Requires: slurm-perlapi
350
Requires: slurm-perlapi = %{version}-%{release}
336
%description sjobexit
351
%description sjobexit
337
Slurm job exit code management tools. Enables users to alter job exit code
352
Slurm job exit code management tools. Enables users to alter job exit code
338
information for completed jobs
353
information for completed jobs
Lines 340-346 information for completed jobs Link Here
340
%package slurmdb-direct
355
%package slurmdb-direct
341
Summary: Wrappers to write directly to the slurmdb
356
Summary: Wrappers to write directly to the slurmdb
342
Group: Development/System
357
Group: Development/System
343
Requires: slurm-perlapi
358
Requires: slurm-perlapi = %{version}-%{release}
344
%description slurmdb-direct
359
%description slurmdb-direct
345
Wrappers to write directly to the slurmdb
360
Wrappers to write directly to the slurmdb
346
361
Lines 348-354 Wrappers to write directly to the slurmdb Link Here
348
%package aix
363
%package aix
349
Summary: Slurm interfaces to IBM AIX
364
Summary: Slurm interfaces to IBM AIX
350
Group: System Environment/Base
365
Group: System Environment/Base
351
Requires: slurm
366
Requires: slurm = %{version}-%{release}
352
BuildRequires: proctrack >= 3
367
BuildRequires: proctrack >= 3
353
Obsoletes: slurm-aix-federation
368
Obsoletes: slurm-aix-federation
354
%description aix
369
%description aix
Lines 359-365 Slurm interfaces for IBM AIX systems Link Here
359
%package percs
374
%package percs
360
Summary: Slurm plugins to run on an IBM PERCS system
375
Summary: Slurm plugins to run on an IBM PERCS system
361
Group: System Environment/Base
376
Group: System Environment/Base
362
Requires: slurm nrt
377
Requires: slurm = %{version}-%{release}, nrt
363
BuildRequires: nrt
378
BuildRequires: nrt
364
%description percs
379
%description percs
365
Slurm plugins to run on an IBM PERCS system, POE interface and NRT switch plugin
380
Slurm plugins to run on an IBM PERCS system, POE interface and NRT switch plugin
Lines 370-376 Slurm plugins to run on an IBM PERCS system, POE interface and NRT switch plugin Link Here
370
%package proctrack-sgi-job
385
%package proctrack-sgi-job
371
Summary: Slurm process tracking plugin for SGI job containers
386
Summary: Slurm process tracking plugin for SGI job containers
372
Group: System Environment/Base
387
Group: System Environment/Base
373
Requires: slurm
388
Requires: slurm = %{version}-%{release}
374
BuildRequires: job
389
BuildRequires: job
375
%description proctrack-sgi-job
390
%description proctrack-sgi-job
376
Slurm process tracking plugin for SGI job containers
391
Slurm process tracking plugin for SGI job containers
Lines 381-387 Slurm process tracking plugin for SGI job containers Link Here
381
%package lua
396
%package lua
382
Summary: Slurm lua bindings
397
Summary: Slurm lua bindings
383
Group: System Environment/Base
398
Group: System Environment/Base
384
Requires: slurm lua
399
Requires: slurm = %{version}-%{release}, lua
385
BuildRequires: lua-devel
400
BuildRequires: lua-devel
386
%description lua
401
%description lua
387
Slurm lua bindings
402
Slurm lua bindings
Lines 391-397 Includes the Slurm proctrack/lua and job_submit/lua plugin Link Here
391
%package sjstat
406
%package sjstat
392
Summary: Perl tool to print Slurm job state information
407
Summary: Perl tool to print Slurm job state information
393
Group: Development/System
408
Group: Development/System
394
Requires: slurm
409
Requires: slurm = %{version}-%{release}
395
%description sjstat
410
%description sjstat
396
Perl tool to print Slurm job state information. The output is designed to give
411
Perl tool to print Slurm job state information. The output is designed to give
397
information on the resource usage and availablilty, as well as information
412
information on the resource usage and availablilty, as well as information
Lines 403-409 utilites will provide more information and greater depth of understanding Link Here
403
%package pam_slurm
418
%package pam_slurm
404
Summary: PAM module for restricting access to compute nodes via Slurm
419
Summary: PAM module for restricting access to compute nodes via Slurm
405
Group: System Environment/Base
420
Group: System Environment/Base
406
Requires: slurm
421
Requires: slurm = %{version}-%{release}
407
BuildRequires: pam-devel
422
BuildRequires: pam-devel
408
Obsoletes: pam_slurm
423
Obsoletes: pam_slurm
409
%description pam_slurm
424
%description pam_slurm
Lines 417-423 according to the Slurm Link Here
417
%package blcr
432
%package blcr
418
Summary: Allows Slurm to use Berkeley Lab Checkpoint/Restart
433
Summary: Allows Slurm to use Berkeley Lab Checkpoint/Restart
419
Group: System Environment/Base
434
Group: System Environment/Base
420
Requires: slurm
435
Requires: slurm = %{version}-%{release}
421
%description blcr
436
%description blcr
422
Gives the ability for Slurm to use Berkeley Lab Checkpoint/Restart
437
Gives the ability for Slurm to use Berkeley Lab Checkpoint/Restart
423
%endif
438
%endif
Lines 459-464 DESTDIR="$RPM_BUILD_ROOT" %__make install-contrib Link Here
459
%ifos aix5.3
474
%ifos aix5.3
460
   mv ${RPM_BUILD_ROOT}%{_bindir}/srun ${RPM_BUILD_ROOT}%{_sbindir}
475
   mv ${RPM_BUILD_ROOT}%{_bindir}/srun ${RPM_BUILD_ROOT}%{_sbindir}
461
%else
476
%else
477
%if 0%{?rhel} < 7 
462
   if [ -d /etc/init.d ]; then
478
   if [ -d /etc/init.d ]; then
463
      install -D -m755 etc/init.d.slurm    $RPM_BUILD_ROOT/etc/init.d/slurm
479
      install -D -m755 etc/init.d.slurm    $RPM_BUILD_ROOT/etc/init.d/slurm
464
      install -D -m755 etc/init.d.slurmdbd $RPM_BUILD_ROOT/etc/init.d/slurmdbd
480
      install -D -m755 etc/init.d.slurmdbd $RPM_BUILD_ROOT/etc/init.d/slurmdbd
Lines 466-477 DESTDIR="$RPM_BUILD_ROOT" %__make install-contrib Link Here
466
      ln -s ../../etc/init.d/slurm    $RPM_BUILD_ROOT/usr/sbin/rcslurm
482
      ln -s ../../etc/init.d/slurm    $RPM_BUILD_ROOT/usr/sbin/rcslurm
467
      ln -s ../../etc/init.d/slurmdbd $RPM_BUILD_ROOT/usr/sbin/rcslurmdbd
483
      ln -s ../../etc/init.d/slurmdbd $RPM_BUILD_ROOT/usr/sbin/rcslurmdbd
468
   fi
484
   fi
485
%else
469
   if [ -d /usr/lib/systemd/system ]; then
486
   if [ -d /usr/lib/systemd/system ]; then
470
      install -D -m644 etc/slurmctld.service $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmctld.service
487
      install -D -m644 etc/slurmctld.service $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmctld.service
471
      install -D -m644 etc/slurmd.service    $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmd.service
488
      install -D -m644 etc/slurmd.service    $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmd.service
472
      install -D -m644 etc/slurmdbd.service  $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmdbd.service
489
      install -D -m644 etc/slurmdbd.service  $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmdbd.service
473
   fi
490
   fi
474
%endif
491
%endif
492
%endif
475
493
476
# Do not package Slurm's version of libpmi on Cray systems.
494
# Do not package Slurm's version of libpmi on Cray systems.
477
# Cray's version of libpmi should be used.
495
# Cray's version of libpmi should be used.
Lines 772-777 touch $LIST Link Here
772
%endif
790
%endif
773
#############################################################################
791
#############################################################################
774
792
793
mkdir -p $RPM_BUILD_ROOT/var/spool/{slurmd,slurmctld}
794
mkdir -p $RPM_BUILD_ROOT/var/log/slurm
795
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
796
%if 0%{?rhel} < 7
797
cat >$RPM_BUILD_ROOT/etc/logrotate.d/slurm <<ENDLOGROTATE
798
/var/log/slurm/*log {
799
    compress
800
    missingok
801
    nocopytruncate
802
    nocreate
803
    delaycompress
804
    nomail
805
    notifempty
806
    noolddir
807
    rotate 10
808
    sharedscripts
809
    size=5M
810
    create 640 slurm root
811
    postrotate
812
    /etc/init.d/slurm reconfig
813
    endscript
814
}
815
ENDLOGROTATE
816
%else
817
for s in slurmd slurmctld slurmdbd; do
818
cat >$RPM_BUILD_ROOT/etc/logrotate.d/$s <<ENDINDIVIDUALROTATE
819
/var/log/slurm/${s}*log {
820
    compress
821
    missingok 
822
    nocopytruncate
823
    nocreate
824
    delaycompress
825
    nomail
826
    notifempty
827
    noolddir
828
    rotate 10
829
    sharedscripts
830
    size=5M
831
    create 640 slurm root
832
    postrotate
833
    /usr/bin/systemctl reload ${s}.service
834
    endscript
835
}
836
ENDINDIVIDUALROTATE
837
done
838
%endif
775
%clean
839
%clean
776
rm -rf $RPM_BUILD_ROOT
840
rm -rf $RPM_BUILD_ROOT
777
#############################################################################
841
#############################################################################
Lines 833-838 rm -rf $RPM_BUILD_ROOT Link Here
833
%exclude %{_mandir}/man1/srun_cr*
897
%exclude %{_mandir}/man1/srun_cr*
834
%exclude %{_bindir}/srun_cr
898
%exclude %{_bindir}/srun_cr
835
%endif
899
%endif
900
%attr(700,root,root) /var/spool/slurmd
901
%attr(700,slurm,slurm) /var/spool/slurmctld
902
%attr(770,root,slurm) /var/log/slurm
903
%if 0%{?rhel} < 7
904
/etc/logrotate.d/slurm
905
%else
906
/etc/logrotate.d/slurmd
907
/etc/logrotate.d/slurmctld
908
%endif
836
#############################################################################
909
#############################################################################
837
910
838
%files -f devel.files devel
911
%files -f devel.files devel
Lines 903-908 rm -rf $RPM_BUILD_ROOT Link Here
903
%{_mandir}/man5/slurmdbd.*
976
%{_mandir}/man5/slurmdbd.*
904
%{_mandir}/man8/slurmdbd.*
977
%{_mandir}/man8/slurmdbd.*
905
%config %{_sysconfdir}/slurmdbd.conf.example
978
%config %{_sysconfdir}/slurmdbd.conf.example
979
%if 0%{?rhel} >= 7
980
/etc/logrotate.d/slurmdbd
981
%endif
906
#############################################################################
982
#############################################################################
907
983
908
%files -f sql.files sql
984
%files -f sql.files sql
Lines 1066-1071 rm -rf $RPM_BUILD_ROOT Link Here
1066
#############################################################################
1142
#############################################################################
1067
1143
1068
%pre
1144
%pre
1145
/usr/sbin/groupadd -g 123 slurm > /dev/null 2>&1 || :
1146
/usr/sbin/useradd -M -o -u 123 -g slurm -d /var/spool/slurm -s /sbin/nologin -c "SLURM User" slurm > /dev/null 2>&1 || :
1069
#if [ -x /etc/init.d/slurm ]; then
1147
#if [ -x /etc/init.d/slurm ]; then
1070
#    if /etc/init.d/slurm status | grep -q running; then
1148
#    if /etc/init.d/slurm status | grep -q running; then
1071
#        /etc/init.d/slurm stop
1149
#        /etc/init.d/slurm stop
Lines 1078-1089 rm -rf $RPM_BUILD_ROOT Link Here
1078
#fi
1156
#fi
1079
1157
1080
%post
1158
%post
1081
if [ -x /sbin/ldconfig ]; then
1159
[ -x /sbin/ldconfig ] && /sbin/ldconfig %{_libdir}
1082
    /sbin/ldconfig %{_libdir}
1160
%if 0%{?rhel} >= 7
1083
    if [ $1 = 1 ]; then
1161
    %systemd_post slurmd.service slurmctld.service
1084
	[ -x /sbin/chkconfig ] && /sbin/chkconfig --add slurm
1162
%else
1085
    fi
1163
if [ $1 = 1 ]; then
1164
    [ -x /sbin/chkconfig ] && /sbin/chkconfig --add slurm
1086
fi
1165
fi
1166
%endif
1087
1167
1088
%if %{slurm_with bluegene}
1168
%if %{slurm_with bluegene}
1089
%post bluegene
1169
%post bluegene
Lines 1093-1098 fi Link Here
1093
%endif
1173
%endif
1094
1174
1095
%preun
1175
%preun
1176
%if 0%{?rhel} >= 7
1177
    %systemd_preun slurmd.service slurmctld.service
1178
%else
1096
if [ "$1" -eq 0 ]; then
1179
if [ "$1" -eq 0 ]; then
1097
    if [ -x /etc/init.d/slurm ]; then
1180
    if [ -x /etc/init.d/slurm ]; then
1098
	[ -x /sbin/chkconfig ] && /sbin/chkconfig --del slurm
1181
	[ -x /sbin/chkconfig ] && /sbin/chkconfig --del slurm
Lines 1101-1108 if [ "$1" -eq 0 ]; then Link Here
1101
	fi
1184
	fi
1102
    fi
1185
    fi
1103
fi
1186
fi
1187
%endif
1104
1188
1105
%preun slurmdbd
1189
%preun slurmdbd
1190
%if 0%{?rhel} >= 7
1191
    %systemd_preun slurmdbd.service
1192
%else
1106
if [ "$1" -eq 0 ]; then
1193
if [ "$1" -eq 0 ]; then
1107
    if [ -x /etc/init.d/slurmdbd ]; then
1194
    if [ -x /etc/init.d/slurmdbd ]; then
1108
	[ -x /sbin/chkconfig ] && /sbin/chkconfig --del slurmdbd
1195
	[ -x /sbin/chkconfig ] && /sbin/chkconfig --del slurmdbd
Lines 1111-1118 if [ "$1" -eq 0 ]; then Link Here
1111
	fi
1198
	fi
1112
    fi
1199
    fi
1113
fi
1200
fi
1201
%endif
1114
1202
1115
%postun
1203
%postun
1204
%if 0%{?rhel} >= 7
1205
    %systemd_postun_with_restart slurmd.service slurmctld.service
1206
%else
1116
if [ "$1" -gt 1 ]; then
1207
if [ "$1" -gt 1 ]; then
1117
    /etc/init.d/slurm condrestart
1208
    /etc/init.d/slurm condrestart
1118
elif [ "$1" -eq 0 ]; then
1209
elif [ "$1" -eq 0 ]; then
Lines 1120-1133 elif [ "$1" -eq 0 ]; then Link Here
1120
	/sbin/ldconfig %{_libdir}
1211
	/sbin/ldconfig %{_libdir}
1121
    fi
1212
    fi
1122
fi
1213
fi
1214
%endif
1123
%if %{?insserv_cleanup:1}0
1215
%if %{?insserv_cleanup:1}0
1124
%insserv_cleanup
1216
%insserv_cleanup
1125
%endif
1217
%endif
1126
1218
1127
%postun slurmdbd
1219
%postun slurmdbd
1220
%if 0%{?rhel} >= 7
1221
%systemd_postun_with_restart slurmdbd.service
1222
%else
1128
if [ "$1" -gt 1 ]; then
1223
if [ "$1" -gt 1 ]; then
1129
    /etc/init.d/slurmdbd condrestart
1224
    /etc/init.d/slurmdbd condrestart
1130
fi
1225
fi
1226
%endif
1131
1227
1132
#############################################################################
1228
#############################################################################
1133
1229

Return to ticket 2092