correcting rpmbuild

SLURM_INFOS

@@ -8,7 +8,7 @@ export SLURM_URL="https://github.com/SchedMD/slurm"
 export SLURM_DEST_ARCH="x86_64"
 export SLURM_OPTIONS=""
 export SLURM_BUILD_DEP_OPTIONS='--define="_with_hdf5 1" --define="_with_hwloc 1" --define="_with_lua 1" --define="_with_mysql 1" --define="_with_numa 1" --define="_with_openssl 1"'
-export SLURM_BUILD_OPTIONS='--with-hdf5=1 --with-hwloc=1 --with-lua=1 --with-mysql=1 --with-numa=1 --with-openssl=1'
+export SLURM_BUILD_OPTIONS='--with hdf5 --with hwloc --with lua --with mysql --with numa --with openssl'
 
 #
 # MUNGE RELATED
@@ -20,7 +20,7 @@ export MUNGE_DEST_ARCH="x86_64"
 export MUNGE_OPTIONS=''
 
 #
-# SLURM_PAM RELATED
+# SLURM_PAM RELATED | Should not be needed as it's compiled with slurm
 #
 export COMPILE_SLURM_PAM=0
 export SLURM_PAM_VERSION="1.6"
@@ -35,4 +35,5 @@ export COMPILE_AUKS=1
 export AUKS_VERSION="0.4.4"
 export AUKS_URL="https://github.com/hautreux/auks/"
 export AUKS_DEST_ARCH="x86_64"
-export AUKS_OPTIONS='--define="_with_systemd 1"'
\ No newline at end of file
+export AUKS_BUILD_DEP_OPTIONS='--define="_with_systemd 1"'
+export AUKS_BUILD_OPTIONS='--with systemd'
\ No newline at end of file

compile_auks.sh

@@ -9,16 +9,16 @@
 /usr/bin/git checkout tags/${AUKS_VERSION}
 /usr/bin/cd ${TOP_DIR}
 /usr/bin/cp ${TOP_DIR}/SOURCES/auks-${AUKS_VERSION}/auks.spec ${TOP_DIR}/SPECS/auks.spec
-tar --exclude-vcs --totals --create --verbose --xz --file  ${TOP_DIR}/SOURCES/auks-${AUKS_VERSION}.tar.xz -C ${TOP_DIR}/SOURCES/ auks-${AUKS_VERSION}
+tar --exclude-vcs --totals --create --verbose --gz --file  ${TOP_DIR}/SOURCES/auks-${AUKS_VERSION}.tar.gz -C ${TOP_DIR}/SOURCES/ auks-${AUKS_VERSION}
 
 # installing dependencies
 /bin/yum makecache fast
 /usr/bin/touch /var/lib/rpm/*
-/bin/yum-builddep -y ${TOP_DIR}/SPECS/auks.spec
+/usr/bin/echo "${AUKS_BUILD_DEP_OPTIONS}" | /usr/bin/xargs /bin/yum-builddep -y ${TOP_DIR}/SPECS/auks.spec
 /usr/bin/cp ${TOP_DIR}/rpmmacros ~/.rpmmacros
 
 # compiling rpm
-/usr/bin/rpmbuild --clean --target=${AUKS_DEST_ARCH} ${AUKS_OPTIONS} -ba ${TOP_DIR}/SPECS/auks.spec
+/usr/bin/echo "${AUKS_BUILD_OPTIONS}" | /usr/bin/xargs -I% /usr/bin/rpmbuild --clean --target=${SLURM_DEST_ARCH} % -ba ${TOP_DIR}/SPECS/auks.spec
 
 # moving rpms to artifacts directories
 /usr/bin/find ${TOP_DIR}/RPMS/ -type f -exec /usr/bin/cp -v {} ${TOP_DIR}/ARTIFACTS/ \;

compile_slurm.sh

@@ -34,8 +34,8 @@ fi
 /usr/bin/echo "${SLURM_BUILD_DEP_OPTIONS}" | /usr/bin/xargs /bin/yum-builddep -y ${TOP_DIR}/SPECS/slurm.spec
 /usr/bin/cp ${TOP_DIR}/rpmmacros ~/.rpmmacros
 
-/usr/bin/yum install -y jsoncpp-devel json-c-devel json-parser-devel hdf5-devel pmix-devel freeipmi-devel rrdtool-devel man2html man2html-core libcurl-devel glib2-devel hwloc-devel gtk2-devel lua-devel numactl-devel\
-						jsoncpp json-c json-parser hdf5 pmix freeipmi rrdtool man2html man2html-core libcurl glib2 hwloc gtk2 lua numactl numactl-libs numad
+/usr/bin/yum install -y jsoncpp-devel json-c-devel json-parser-devel hdf5-devel pmix-devel freeipmi-devel rrdtool-devel man2html man2html-core libcurl-devel glib2-devel hwloc-devel gtk2-devel lua-devel numactl-devel lz4-devel \
+						jsoncpp json-c json-parser hdf5 pmix freeipmi rrdtool man2html man2html-core libcurl glib2 hwloc gtk2 lua numactl numactl-libs numad lz4
 /usr/bin/yum --setopt=group_package_types=optional groupinstall -y "Infiniband Support"
 
 # compiling rpm