Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
2b94a25c
Commit
2b94a25c
authored
11 years ago
by
Morris Jette
Browse files
Options
Downloads
Patches
Plain Diff
Some slurm.spec changes to address rpmlint warning
Related to bug 326
parent
902abaa5
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
etc/init.d.slurm.in
+1
-1
1 addition, 1 deletion
etc/init.d.slurm.in
etc/init.d.slurmdbd.in
+1
-1
1 addition, 1 deletion
etc/init.d.slurmdbd.in
slurm.spec
+38
-10
38 additions, 10 deletions
slurm.spec
with
40 additions
and
12 deletions
etc/init.d.slurm.in
+
1
−
1
View file @
2b94a25c
...
@@ -286,7 +286,7 @@ case "$1" in
...
@@ -286,7 +286,7 @@ case "$1" in
done
done
fi
fi
;;
;;
reconfig
)
reconfig
|reload
)
for
prog
in
`
$BINDIR
/scontrol show daemons
`
;
do
for
prog
in
`
$BINDIR
/scontrol show daemons
`
;
do
echo
-n
$"Reloading
$prog
daemon configuration: "
echo
-n
$"Reloading
$prog
daemon configuration: "
killproc
$prog
-HUP
killproc
$prog
-HUP
...
...
This diff is collapsed.
Click to expand it.
etc/init.d.slurmdbd.in
+
1
−
1
View file @
2b94a25c
...
@@ -178,7 +178,7 @@ case "$1" in
...
@@ -178,7 +178,7 @@ case "$1" in
start slurmdbd
start slurmdbd
fi
fi
;;
;;
reconfig
)
reconfig
|reload
)
echo
-n
$"Reloading slurmdbd daemon configuration: "
echo
-n
$"Reloading slurmdbd daemon configuration: "
killproc slurmdbd
-HUP
killproc slurmdbd
-HUP
echo
echo
...
...
This diff is collapsed.
Click to expand it.
slurm.spec
+
38
−
10
View file @
2b94a25c
...
@@ -317,7 +317,7 @@ SLURM job exit code management tools. Enables users to alter job exit code
...
@@ -317,7 +317,7 @@ SLURM job exit code management tools. Enables users to alter job exit code
information for completed jobs
information for completed jobs
%package slurmdb-direct
%package slurmdb-direct
Summary: Wrappers to write directly to the slurmdb
.
Summary: Wrappers to write directly to the slurmdb
Group: Development/System
Group: Development/System
Requires: slurm-perlapi
Requires: slurm-perlapi
%description slurmdb-direct
%description slurmdb-direct
...
@@ -440,12 +440,14 @@ DESTDIR="$RPM_BUILD_ROOT" make install-contrib
...
@@ -440,12 +440,14 @@ DESTDIR="$RPM_BUILD_ROOT" make install-contrib
if [ -d /etc/init.d ]; then
if [ -d /etc/init.d ]; then
install -D -m755 etc/init.d.slurm $RPM_BUILD_ROOT/etc/init.d/slurm
install -D -m755 etc/init.d.slurm $RPM_BUILD_ROOT/etc/init.d/slurm
install -D -m755 etc/init.d.slurmdbd $RPM_BUILD_ROOT/etc/init.d/slurmdbd
install -D -m755 etc/init.d.slurmdbd $RPM_BUILD_ROOT/etc/init.d/slurmdbd
ln -s ../../etc/init.d/slurm $RPM_BUILD_ROOT/usr/sbin/rcslurm
ln -s ../../etc/init.d/slurmdbd $RPM_BUILD_ROOT/usr/sbin/rcslurmdbd
fi
fi
%endif
%endif
%if %{slurm_with cray}
%if %{slurm_with cray}
if [ -d /opt/modulefiles ]; then
if [ -d /opt/modulefiles ]; then
install -D -m
755
contribs/cray/opt_modulefiles_slurm $RPM_BUILD_ROOT/opt/modulefiles/slurm/opt_modulefiles_slurm
install -D -m
644
contribs/cray/opt_modulefiles_slurm $RPM_BUILD_ROOT/opt/modulefiles/slurm/opt_modulefiles_slurm
fi
fi
%else
%else
rm -f contribs/cray/opt_modulefiles_slurm
rm -f contribs/cray/opt_modulefiles_slurm
...
@@ -453,7 +455,7 @@ DESTDIR="$RPM_BUILD_ROOT" make install-contrib
...
@@ -453,7 +455,7 @@ DESTDIR="$RPM_BUILD_ROOT" make install-contrib
install -D -m644 etc/slurm.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/slurm.conf.example
install -D -m644 etc/slurm.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/slurm.conf.example
install -D -m644 etc/cgroup.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/cgroup.conf.example
install -D -m644 etc/cgroup.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/cgroup.conf.example
install -D -m
755
etc/cgroup_allowed_devices_file.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/cgroup_allowed_devices_file.conf.example
install -D -m
644
etc/cgroup_allowed_devices_file.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/cgroup_allowed_devices_file.conf.example
install -D -m755 etc/cgroup.release_common.example ${RPM_BUILD_ROOT}%{_sysconfdir}/cgroup.release_common.example
install -D -m755 etc/cgroup.release_common.example ${RPM_BUILD_ROOT}%{_sysconfdir}/cgroup.release_common.example
install -D -m755 etc/cgroup.release_common.example ${RPM_BUILD_ROOT}%{_sysconfdir}/cgroup/release_freezer
install -D -m755 etc/cgroup.release_common.example ${RPM_BUILD_ROOT}%{_sysconfdir}/cgroup/release_freezer
install -D -m755 etc/cgroup.release_common.example ${RPM_BUILD_ROOT}%{_sysconfdir}/cgroup/release_cpuset
install -D -m755 etc/cgroup.release_common.example ${RPM_BUILD_ROOT}%{_sysconfdir}/cgroup/release_cpuset
...
@@ -462,7 +464,22 @@ install -D -m644 etc/slurmdbd.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/slurm
...
@@ -462,7 +464,22 @@ install -D -m644 etc/slurmdbd.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/slurm
install -D -m755 etc/slurm.epilog.clean ${RPM_BUILD_ROOT}%{_sysconfdir}/slurm.epilog.clean
install -D -m755 etc/slurm.epilog.clean ${RPM_BUILD_ROOT}%{_sysconfdir}/slurm.epilog.clean
install -D -m755 contribs/sjstat ${RPM_BUILD_ROOT}%{_bindir}/sjstat
install -D -m755 contribs/sjstat ${RPM_BUILD_ROOT}%{_bindir}/sjstat
# Correct some file permissions
test -f $RPM_BUILD_ROOT/%{_libdir}/libpmi.la &&
chmod 644 $RPM_BUILD_ROOT/%{_libdir}/libpmi.la
test -f $RPM_BUILD_ROOT/%{_libdir}/libslurm.la &&
chmod 644 $RPM_BUILD_ROOT/%{_libdir}/libslurm.la
test -f $RPM_BUILD_ROOT/%{_libdir}/libslurmdb.la
chmod 644 $RPM_BUILD_ROOT/%{_libdir}/libslurmdb.la
# Delete unpackaged files:
# Delete unpackaged files:
test -f %{_perldir}/auto/Slurm/Slurm.bs &&
test -z %{_perldir}/auto/Slurm/Slurm.bs &&
rm -f %{_perldir}/auto/Slurm/Slurm.bs
test -f %{_perldir}/auto/Slurmdb/Slurmdb.bs &&
test -z %{_perldir}/auto/Slurmdb/Slurmdb.bs &&
rm -f %{_perldir}/auto/Slurmdb/Slurmdb.bs
rm -f $RPM_BUILD_ROOT/%{_libdir}/libpmi.a
rm -f $RPM_BUILD_ROOT/%{_libdir}/libpmi.a
rm -f $RPM_BUILD_ROOT/%{_libdir}/libpmi2.a
rm -f $RPM_BUILD_ROOT/%{_libdir}/libpmi2.a
rm -f $RPM_BUILD_ROOT/%{_libdir}/libslurm.a
rm -f $RPM_BUILD_ROOT/%{_libdir}/libslurm.a
...
@@ -523,6 +540,8 @@ LIST=./slurm.files
...
@@ -523,6 +540,8 @@ LIST=./slurm.files
touch $LIST
touch $LIST
test -f $RPM_BUILD_ROOT/etc/init.d/slurm &&
test -f $RPM_BUILD_ROOT/etc/init.d/slurm &&
echo /etc/init.d/slurm >> $LIST
echo /etc/init.d/slurm >> $LIST
test -f $RPM_BUILD_ROOT/usr/sbin/rcslurm &&
echo /usr/sbin/rcslurm >> $LIST
test -f $RPM_BUILD_ROOT/opt/modulefiles/slurm/opt_modulefiles_slurm &&
test -f $RPM_BUILD_ROOT/opt/modulefiles/slurm/opt_modulefiles_slurm &&
echo /opt/modulefiles/slurm/opt_modulefiles_slurm >> $LIST
echo /opt/modulefiles/slurm/opt_modulefiles_slurm >> $LIST
...
@@ -565,8 +584,10 @@ test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/launch_poe.so &&
...
@@ -565,8 +584,10 @@ test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/launch_poe.so &&
LIST=./slurmdbd.files
LIST=./slurmdbd.files
touch $LIST
touch $LIST
test -f $RPM_BUILD_ROOT/etc/init.d/slurm &&
test -f $RPM_BUILD_ROOT/etc/init.d/slurmdbd &&
echo /etc/init.d/slurmdbd >> $LIST
echo /etc/init.d/slurmdbd >> $LIST
test -f $RPM_BUILD_ROOT/usr/sbin/rcslurmdbd &&
echo /usr/sbin/rcslurmdbd >> $LIST
LIST=./sql.files
LIST=./sql.files
touch $LIST
touch $LIST
...
@@ -579,7 +600,15 @@ test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/jobcomp_mysql.so &&
...
@@ -579,7 +600,15 @@ test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/jobcomp_mysql.so &&
test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/jobcomp_pgsql.so &&
test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/jobcomp_pgsql.so &&
echo %{_libdir}/slurm/jobcomp_pgsql.so >> $LIST
echo %{_libdir}/slurm/jobcomp_pgsql.so >> $LIST
LIST=./perlapi.files
touch $LIST
test -f %{_perldir}/auto/Slurm/Slurm.bs &&
echo %{_perldir}/auto/Slurm/Slurm.bs >> $LIST
test -f %{_perldir}/auto/Slurmdb/Slurmdb.bs &&
echo %{_perldir}/auto/Slurmdb/Slurmdb.bs >> $LIST
LIST=./plugins.files
LIST=./plugins.files
touch $LIST
test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/acct_gather_energy_ipmi.so &&
test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/acct_gather_energy_ipmi.so &&
echo %{_libdir}/slurm/acct_gather_energy_ipmi.so >> $LIST
echo %{_libdir}/slurm/acct_gather_energy_ipmi.so >> $LIST
test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/acct_gather_energy_rapl.so &&
test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/acct_gather_energy_rapl.so &&
...
@@ -720,7 +749,7 @@ rm -rf $RPM_BUILD_ROOT
...
@@ -720,7 +749,7 @@ rm -rf $RPM_BUILD_ROOT
%endif
%endif
#############################################################################
#############################################################################
%files perlapi
%files
-f perlapi.files
perlapi
%defattr(-,root,root)
%defattr(-,root,root)
%{_perldir}/Slurm.pm
%{_perldir}/Slurm.pm
%{_perldir}/Slurm/Bitstr.pm
%{_perldir}/Slurm/Bitstr.pm
...
@@ -728,10 +757,8 @@ rm -rf $RPM_BUILD_ROOT
...
@@ -728,10 +757,8 @@ rm -rf $RPM_BUILD_ROOT
%{_perldir}/Slurm/Hostlist.pm
%{_perldir}/Slurm/Hostlist.pm
%{_perldir}/Slurm/Stepctx.pm
%{_perldir}/Slurm/Stepctx.pm
%{_perldir}/auto/Slurm/Slurm.so
%{_perldir}/auto/Slurm/Slurm.so
%{_perldir}/auto/Slurm/Slurm.bs
%{_perldir}/Slurmdb.pm
%{_perldir}/Slurmdb.pm
%{_perldir}/auto/Slurmdb/Slurmdb.so
%{_perldir}/auto/Slurmdb/Slurmdb.so
%{_perldir}/auto/Slurmdb/Slurmdb.bs
%{_perldir}/auto/Slurmdb/autosplit.ix
%{_perldir}/auto/Slurmdb/autosplit.ix
%{_perlman3dir}/Slurm*
%{_perlman3dir}/Slurm*
...
@@ -942,9 +969,10 @@ if [ "$1" = 0 ]; then
...
@@ -942,9 +969,10 @@ if [ "$1" = 0 ]; then
/sbin/ldconfig %{_libdir}
/sbin/ldconfig %{_libdir}
fi
fi
fi
fi
%insserv_cleanup
#############################################################################
#############################################################################
%changelog
%changelog
*
Tue Feb 14
20
06
Morris Jette <jette
1@llnl.gov>
*
Wed Jun 26
20
13
Morris Jette <jette
@schedmd.com> 13.12.0-0pre1
- See the NEWS file for update detail
s
Various cosmetic fixes for rpmlint error
s
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment