[XrdSsi] Builds XRootD with SSI extensions from master branch

xroot_rpms/Dockerfile

@@ -44,21 +44,14 @@ RUN yum clean all && \
       vim \
       yum-utils
 
-# Get XRootD
+# Check out XRootD from master (includes SSIV2)
 
 RUN git clone https://github.com/xrootd/xrootd.git
-
-# Check out SSIV2
-
-RUN cd xrootd && git checkout xrdssiV2
-
-# Copy in patched xrootd.spec.in
-
-ADD xrootd.spec.in /xrootd/packaging/rhel/xrootd.spec.in
-RUN cp xrootd/packaging/rhel/xrootd.spec.in xrootd.spec
+RUN cd xrootd && git pull
 
 # Install all necessary build dependencies
 
+RUN cp xrootd/packaging/rhel/xrootd.spec.in xrootd.spec
 RUN yum-builddep -y xrootd.spec
 
 # Create XRootD source RPM

xroot_rpms/README.md

 # Build XRootD RPMs
 
-The version of xrootd.spec.in in the xrootd xrdssiV2 branch does not package the SSI library and header files.
-
-This is the temporary home for the patched version of xrootd.spec.in, until Michal or Andy can integrate it
-properly into the xrootd git respository.
-
-To build the RPMs:
+The XRootD SSI libraries and header files are now integrated into the master branch but are not part
+of any release. As we need to link against the SSI libraries, we need to build our own RPMs:
 ```
 ./build-rpms
 ```

xroot_rpms/build-rpms

 #!/bin/sh
 
+# Ensure Docker is running
+
+HAS_DOCKER=$(ps ax|grep dockerd-current|grep -v grep|wc -l)
+if [ $HAS_DOCKER -eq 0 ]
+then
+  echo -n Starting Docker...
+  sudo systemctl start docker
+  echo done.
+fi
+
 sudo docker build . -f ./Dockerfile -t buildxroot
 
 id=$(sudo docker create buildxroot bash)
 
+echo $id
+
 sudo docker cp ${id}:rpmbuild_xrootd/RPMS/noarch/ .
 sudo docker cp ${id}:rpmbuild_xrootd/RPMS/x86_64/ .
 
+# Clean up
+
 sudo docker rm -v ${id}