[gridengine] Add sge_shadowd.service and move shadowd to qmaster package (bug #955768)
Orion Poplawski
orion at fedoraproject.org
Tue May 21 19:39:20 UTC 2013
commit a56c16cd86529fc25f26bb36608b5836dd0fe870
Author: Orion Poplawski <orion at nwra.com>
Date: Tue May 21 13:37:57 2013 -0600
Add sge_shadowd.service and move shadowd to qmaster package (bug #955768)
gridengine-ldflags.patch | 25 +++++++++++++++++++++++++
gridengine.spec | 27 +++++++++++++++++----------
sge_shadowd.service | 11 +++++++++++
3 files changed, 53 insertions(+), 10 deletions(-)
---
diff --git a/gridengine-ldflags.patch b/gridengine-ldflags.patch
index b5e3ac1..f35a29f 100644
--- a/gridengine-ldflags.patch
+++ b/gridengine-ldflags.patch
@@ -22,3 +22,28 @@ diff -up GE2011.11p1/source/clients/qmon/Makefile.ldflags GE2011.11p1/source/cli
############################################################################
# ListTree Demo prog
+--- GE2011.11p1/source/3rdparty/qtcsh/Makefile.in.ldflags 2012-05-23 13:04:53.000000000 -0600
++++ GE2011.11p1/source/3rdparty/qtcsh/Makefile.in 2013-05-21 12:19:25.286578827 -0600
+@@ -335,19 +335,19 @@
+
+ tcsh:$(P) ${OBJS}
+ rm -f tcsh core
+- ${CC} -o tcsh ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS}
++ ${CC} -o tcsh $(LDFLAGS) ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS}
+
+ # Purify
+ pure:$(P) ${OBJS}
+ rm -f tcsh core
+- purify `echo ${CC} | sed -e s,-B/bin/,,` -o tcsh ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS}
++ purify `echo ${CC} | sed -e s,-B/bin/,,` -o tcsh $(LDFLAGS) ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS}
+ # OS/2
+ tcsh.exe: tcsh
+ emxbind tcsh
+
+ gethost: gethost.c sh.err.h tc.const.h sh.h
+ rm -f gethost
+- ${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${EXTRAFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
++ ${CC} -o gethost $(LDFLAGS) ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${EXTRAFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
+
+ tc.defs.c: gethost host.defs
+ @rm -f $@
diff --git a/gridengine.spec b/gridengine.spec
index 424ee45..ecb646d 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -10,7 +10,7 @@
Name: gridengine
Version: 2011.11p1
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Grid Engine - Distributed Computing Management software
Group: Applications/System
@@ -30,6 +30,7 @@ Source4: sge.sh
%if 0%{?fedora} >= 15
Source5: sge_execd.service
Source6: sgemaster.service
+Source13: sge_shadowd.service
%else
Source5: sge_execd
Source6: sgemaster
@@ -189,7 +190,7 @@ Requires(postun): %{name} = %{version}-%{release}
Requires(preun): %{name} = %{version}-%{release}
%description qmaster
-Programs needed to run a grid engine qmaster host
+Programs needed to run a grid engine qmaster or shadowd host
%prep
@@ -395,7 +396,7 @@ install -p -m644 %SOURCE3 %SOURCE4 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
# Startup scripts
%if 0%{?fedora} >= 15
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -p -m755 %SOURCE5 %SOURCE6 $RPM_BUILD_ROOT%{_unitdir}
+install -p -m755 %SOURCE5 %SOURCE6 %SOURCE13 $RPM_BUILD_ROOT%{_unitdir}
%else
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
install -p -m755 %SOURCE5 %SOURCE6 $RPM_BUILD_ROOT%{_initrddir}
@@ -543,6 +544,7 @@ fi
%if 0%{?fedora}
%if 0%{?fedora} >= 18
%systemd_post sgemaster.service
+%systemd_post sge_shadowd.service
%else
if [ $1 -eq 1 ] ; then
# Initial installation
@@ -557,6 +559,7 @@ fi
%if 0%{?fedora}
%if 0%{?fedora} >= 18
%systemd_postun_with_restart sgemaster.service
+%systemd_postun_with_restart sge_shadowd.service
%else
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
@@ -575,6 +578,7 @@ fi
%if 0%{?fedora}
%if 0%{?fedora} >= 18
%systemd_preun sgemaster.service
+%systemd_preun sge_shadowd.service
%else
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
@@ -590,13 +594,6 @@ if [ $1 -eq 0 ] ; then
fi
%endif
-%if 0%{?fedora} >= 15
-%triggerun -- gridengine-qmaster < 6.2u5p2-2
-/usr/bin/systemd-sysv-convert --save sgemaster >/dev/null 2>&1 || :
-/sbin/chkconfig --del sgemaster >/dev/null 2>&1 || :
-/bin/systemctl try-restart sgemaster.service >/dev/null 2>&1 || :
-%endif
-
%files
%defattr(-,root,root,-)
@@ -612,6 +609,7 @@ fi
%exclude %{_bindir}/qmon
%exclude %{_bindir}/sge_execd
%exclude %{_bindir}/sge_qmaster
+%exclude %{_bindir}/sge_shadowd
%exclude %{_bindir}/sge_*shepherd
%{_libdir}/%{name}
%{_libdir}/libcore.so
@@ -627,6 +625,7 @@ fi
%exclude %{_datadir}/gridengine/bin/*/qmon
%exclude %{_datadir}/gridengine/bin/*/sge_execd
%exclude %{_datadir}/gridengine/bin/*/sge_qmaster
+%exclude %{_datadir}/gridengine/bin/*/sge_shadowd
%exclude %{_datadir}/gridengine/bin/*/sge_*shepherd
%{_datadir}/gridengine/ckpt
%attr(-,%username,%username) %ghost %{_datadir}/gridengine/default
@@ -648,6 +647,7 @@ fi
%{_mandir}/man5/*.5*
%{_mandir}/man8/*.8*
%exclude %{_mandir}/man8/sge_qmaster.8*
+%exclude %{_mandir}/man8/sge_shadowd.8*
%exclude %{_mandir}/man8/sge_execd.8*
%exclude %{_mandir}/man8/sge_*shepherd.8*
%attr(-,%username,%username) %dir %{_localstatedir}/spool/gridengine
@@ -689,16 +689,20 @@ fi
%defattr(-,root,root,-)
%if 0%{?fedora} >= 15
%{_unitdir}/sgemaster.service
+%{_unitdir}/sge_shadowd.service
%else
%{_initrddir}/sgemaster
%endif
%{_bindir}/qacct
%{_bindir}/sge_qmaster
+%{_bindir}/sge_shadowd
%{_datadir}/gridengine/bin/*/qacct
%{_datadir}/gridengine/bin/*/sge_qmaster
+%{_datadir}/gridengine/bin/*/sge_shadowd
%{_datadir}/gridengine/install_qmaster
%{_datadir}/gridengine/utilbin/db_*
%{_mandir}/man8/sge_qmaster.8*
+%{_mandir}/man8/sge_shadowd.8*
%attr(-,%username,%username) %dir %{_localstatedir}/sgeCA
%attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/qmaster
%attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/spool
@@ -706,6 +710,9 @@ fi
%changelog
+* Tue May 21 2013 Orion Poplwski <orion at cora.nwra.com> - 2011.11p1-13
+- Add sge_shadowd.service and move shadowd to qmaster package (bug #955768)
+
* Tue May 21 2013 Orion Poplwski <orion at cora.nwra.com> - 2011.11p1-12
- Add patch to add LDFLAGS to LFLAGS so _hardened_build actually works (bug #965479)
diff --git a/sge_shadowd.service b/sge_shadowd.service
new file mode 100644
index 0000000..4c5ec0b
--- /dev/null
+++ b/sge_shadowd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Gridengine shadow master daemon
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/sysconfig/gridengine
+ExecStart=/usr/bin/sge_shadowd
+
+[Install]
+WantedBy=multi-user.target
More information about the scm-commits
mailing list