commit: 780631adde5c43c700a9c0d0f56466d882807cab
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 16:46:40 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 16:50:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=780631ad
sys-cluster/slurm: Drop old
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
sys-cluster/slurm/Manifest | 1 -
.../files/slurm-17.11.13.2-disable-sview.patch | 99 --------
sys-cluster/slurm/slurm-17.11.13.2.ebuild | 278 ---------------------
3 files changed, 378 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 5d692ad2b82..d61e5c59422 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,2 +1 @@
-DIST slurm-17.11.13-2.tar.bz2 6261416 BLAKE2B
bca7a06e703799371da11a7427ce009784c7236569f4b24b278078231192bb0e90604fb90a61f8269881ccacd154cbf03174b3e4600410a8c726beccf4aefd18
SHA512
d419984bfa1bf1be20d3439672eaf868e3e0c45549b8d696bb6f588a57e1bc1e765dbca8a9a62c54bf27c3dfbbd0f165f573459a22ef87d976bc511c22fde639
DIST slurm-18.08.7.tar.bz2 6186006 BLAKE2B
a5458f72cbe93bc1103c2c7f3d428ae14239cb092edad2c683e448dda35f3e108fef0d9a3a86599da6058c9c98a86dafed9a087ffe6e8d7425db9cdb879954b3
SHA512
d0047086f1b716877cc5bb39539bf96a8fd08b1851c85fd85112c6432c1ce2a0f29fc9dd8803094c8fa44d063cec5f417e6bed231b6d338934ff4b48424a5a93
diff --git a/sys-cluster/slurm/files/slurm-17.11.13.2-disable-sview.patch
b/sys-cluster/slurm/files/slurm-17.11.13.2-disable-sview.patch
deleted file mode 100644
index f7e2c5b2673..00000000000
--- a/sys-cluster/slurm/files/slurm-17.11.13.2-disable-sview.patch
+++ /dev/null
@@ -1,99 +0,0 @@
- configure.ac | 39 ---------------------------------------
- doc/man/man1/Makefile.am | 8 --------
- src/Makefile.am | 3 +--
- 3 files changed, 1 insertion(+), 49 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2f177ec..ff4d69b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -238,44 +238,6 @@ AC_SUBST(HAVE_SOME_CURSES)
- PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"],
[ac_have_check="no"])
- AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes")
-
--#
--# Tests for GTK+
--#
--
--# use the correct libs if running on 64bit
--if test -d "/usr/lib64/pkgconfig"; then
-- PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:$PKG_CONFIG_PATH"
--fi
--
--if test -d "/opt/gnome/lib64/pkgconfig"; then
-- PKG_CONFIG_PATH="/opt/gnome/lib64/pkgconfig/:$PKG_CONFIG_PATH"
--fi
--
--AM_PATH_GLIB_2_0([2.7.1], [ac_glib_test="yes"], [ac_glib_test="no"],
[gthread])
--
--if test ${glib_config_minor_version=0} -ge 32 ; then
-- AC_DEFINE([GLIB_NEW_THREADS], 1, [Define to 1 if using glib-2.32.0 or
higher])
--fi
--
--AM_PATH_GTK_2_0([2.7.1], [ac_gtk_test="yes"], [ac_gtk_test="no"], [gthread])
--if test ${gtk_config_minor_version=0} -ge 10 ; then
-- AC_DEFINE([GTK2_USE_RADIO_SET], 1, [Define to 1 if using gtk+-2.10.0
or higher])
--fi
--
--if test ${gtk_config_minor_version=0} -ge 12 ; then
-- AC_DEFINE([GTK2_USE_TOOLTIP], 1, [Define to 1 if using gtk+-2.12.0 or
higher])
--fi
--
--if test ${gtk_config_minor_version=0} -ge 14 ; then
-- AC_DEFINE([GTK2_USE_GET_FOCUS], 1, [Define to 1 if using gtk+-2.14.0
or higher])
--fi
--
--if test "x$ac_glib_test" != "xyes" -o "x$ac_gtk_test" != "xyes"; then
-- AC_MSG_WARN([cannot build sview without gtk library]);
--fi
--
--AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test
"x$ac_gtk_test" = "xyes"])
--
- dnl Cray ALPS/Basil support depends on mySQL
- X_AC_CRAY
-
-@@ -477,7 +439,6 @@ AC_CONFIG_FILES([Makefile
- src/sshare/Makefile
- src/sstat/Makefile
- src/strigger/Makefile
-- src/sview/Makefile
- src/plugins/Makefile
- src/plugins/accounting_storage/Makefile
- src/plugins/accounting_storage/common/Makefile
-diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am
-index 246f16d..ba39af2 100644
---- a/doc/man/man1/Makefile.am
-+++ b/doc/man/man1/Makefile.am
-@@ -29,10 +29,6 @@ if WITH_BLCR
- man1_MANS += srun_cr.1
- endif
-
--if BUILD_SVIEW
--man1_MANS += sview.1
--endif
--
- EXTRA_DIST = $(man1_MANS)
-
- if HAVE_MAN2HTML
-@@ -65,10 +61,6 @@ if WITH_BLCR
- html_DATA += srun_cr.html
- endif
-
--if BUILD_SVIEW
--html_DATA += sview.html
--endif
--
- MOSTLYCLEANFILES = ${html_DATA}
-
- EXTRA_DIST += $(html_DATA)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index bcd5aa7..a8cbf17 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -28,5 +28,4 @@ SUBDIRS = \
- srun_cr \
- sshare \
- sstat \
-- strigger \
-- sview
-+ strigger
diff --git a/sys-cluster/slurm/slurm-17.11.13.2.ebuild
b/sys-cluster/slurm/slurm-17.11.13.2.ebuild
deleted file mode 100644
index 1f9e31f2508..00000000000
--- a/sys-cluster/slurm/slurm-17.11.13.2.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/SchedMD/slurm.git";
- INHERIT_GIT="git-r3"
- SRC_URI=""
- KEYWORDS=""
- MY_P="${P}"
-else
- inherit eapi7-ver
- if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
- MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
- else
- MY_PV=$(ver_rs 3 '-') # stable releases
- fi
- MY_P="${PN}-${MY_PV}"
- INHERIT_GIT=""
- SRC_URI="https://download.schedmd.com/slurm/${MY_P}.tar.bz2";
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/${MY_P}"
-fi
-
-inherit autotools bash-completion-r1 eutils pam perl-module prefix
toolchain-funcs user systemd ${INHERIT_GIT}
-
-DESCRIPTION="A Highly Scalable Resource Manager"
-HOMEPAGE="https://www.schedmd.com";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa
ofed pam perl slurmdbd ssl static-libs torque X"
-
-CDEPEND="
- !sys-cluster/torque
- !net-analyzer/slurm
- !net-analyzer/sinfo
- || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
- mysql? (
- || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
- slurmdbd? ( || ( dev-db/mariadb dev-db/mysql ) )
- )
- munge? ( sys-auth/munge )
- pam? ( sys-libs/pam )
- ssl? ( dev-libs/openssl:0= )
- lua? ( dev-lang/lua:0= )
- !lua? ( !dev-lang/lua )
- ipmi? ( sys-libs/freeipmi )
- json? ( dev-libs/json-c:= )
- amd64? ( netloc? ( sys-apps/netloc ) )
- hdf5? ( sci-libs/hdf5:= )
- numa? ( sys-process/numactl )
- ofed? ( sys-fabric/ofed )
- X? ( net-libs/libssh2 )
- >=sys-apps/hwloc-1.1.1-r1
- sys-libs/ncurses:0=
- app-arch/lz4:0=
- sys-libs/readline:0="
-DEPEND="${CDEPEND}
- html? ( sys-apps/man2html )"
-RDEPEND="${CDEPEND}
- dev-libs/libcgroup"
-
-REQUIRED_USE="torque? ( perl )"
-
-LIBSLURM_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurmdb/perl"
-
-RESTRICT="primaryuri test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-disable-sview.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- if [[ ${PV} == *9999* ]]; then
- git-r3_src_unpack
- else
- default
- fi
-}
-
-pkg_setup() {
- enewgroup slurm 500
- enewuser slurm 500 -1 /var/spool/slurm slurm
-}
-
-src_prepare() {
- tc-ld-disable-gold
- default
-
- # pids should go to /var/run/slurm
- sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
- -e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
- -i "${S}/etc/slurm.conf.example" \
- || die "Can't sed for /var/run/slurmctld.pid"
- sed -i "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
- -i "${S}/etc/slurmdbd.conf.example" \
- || die "Can't sed for /var/run/slurmdbd.pid"
- # also state dirs are in /var/spool/slurm
- sed -e
"s:StateSaveLocation=*.:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
- -e
"s:SlurmdSpoolDir=*.:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
- -i "${S}/etc/slurm.conf.example" \
- || die "Can't sed ${S}/etc/slurm.conf.example for
StateSaveLocation=*. or SlurmdSpoolDir=*"
- # and tmp should go to /var/tmp/slurm
- sed -e 's:/tmp:/var/tmp:g' \
- -i "${S}/etc/slurm.conf.example" \
- || die "Can't sed for StateSaveLocation=*./tmp"
- # gentooify systemd services
- sed -e 's:sysconfig/.*:conf.d/slurm:g' \
- -e 's:var/run/:run/slurm/:g' \
- -i "${S}/etc"/*.service.in \
- || die "Can't sed systemd services for sysconfig or
var/run/"
-
- hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
- eautoreconf
-}
-
-src_configure() {
- use debug || myconf+=( --disable-debug )
- local myconf=(
- --sysconfdir="${EPREFIX}/etc/${PN}"
- --with-hwloc="${EPREFIX}/usr"
- --docdir="${EPREFIX}/usr/share/doc/${P}"
- --htmldir="${EPREFIX}/usr/share/doc/${P}"
- )
- use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
- use mysql || myconf+=( --without-mysql_config )
- use amd64 && myconf+=( $(use_with netloc) )
- econf "${myconf[@]}" \
- $(use_enable pam) \
- $(use_enable X x11) \
- $(use_with ssl) \
- $(use_with munge) \
- $(use_with json) \
- $(use_with hdf5) \
- $(use_with ofed) \
- $(use_enable static-libs static) \
- $(use_enable multiple-slurmd)
-
- # --htmldir does not seems to propagate... Documentations are installed
- # in /usr/share/doc/slurm-2.3.0/html
- # instead of /usr/share/doc/slurm-2.3.0.2/html
- sed \
- -e "s|htmldir = .*/html|htmldir =
\${prefix}/share/doc/slurm-${PVR}/html|g" \
- -i doc/html/Makefile || die
- if use perl ; then
- # small hack to make it compile
- mkdir -p "${S}/src/api/.libs" || die
- mkdir -p "${S}/src/db_api/.libs" || die
- touch "${S}/src/api/.libs/libslurm.so" || die
- touch "${S}/src/db_api/.libs/libslurmdb.so" || die
- cd "${LIBSLURM_PERL_S}" || die
- S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
- cd "${LIBSLURMDB_PERL_S}" || die
- S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
- cd "${S}" || die
- rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
- fi
-}
-
-src_compile() {
- default
- use pam && emake -C contribs/pam
- if use perl ; then
- cd "${LIBSLURM_PERL_S}" || die
- S="${LIBSLURM_PERL_S}" perl-module_src_compile
- cd "${LIBSLURMDB_PERL_S}" || die
- S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
- cd "${S}" || die
- fi
- use torque && emake -C contribs/torque
-}
-
-src_install() {
- default
- use pam && emake DESTDIR="${D}" -C contribs/pam install
- if use perl; then
- cd "${LIBSLURM_PERL_S}" || die
- S="${LIBSLURM_PERL_S}" perl-module_src_install
- cd "${LIBSLURMDB_PERL_S}" || die
- S="${LIBSLURMDB_PERL_S}" perl-module_src_install
- cd "${S}" || die
- fi
- if use torque; then
- emake DESTDIR="${D}" -C contribs/torque
- rm -f "${ED}/usr/bin/mpiexec" || die
- fi
- use static-libs || find "${ED}" -name '*.la' -exec rm {} +
- # install sample configs
- keepdir /etc/slurm
- insinto /etc/slurm
- doins \
- etc/bluegene.conf.example \
- etc/cgroup.conf.example \
- etc/cgroup_allowed_devices_file.conf.example \
- etc/slurm.conf.example \
- etc/slurmdbd.conf.example
- exeinto /etc/slurm
- doexe \
- etc/slurm.epilog.clean
- keepdir /etc/slurm/layouts.d
- insinto /etc/slurm/layouts.d
- newins etc/layouts.d.power.conf.example power.conf.example
- newins etc/layouts.d.power_cpufreq.conf.example
power_cpufreq.conf.example
- newins etc/layouts.d.unit.conf.example unit.conf.example
- # install init.d files
- newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
- newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
- newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
- # install conf.d files
- newconfd "${FILESDIR}/slurm.confd" slurm
- # install logrotate file
- insinto /etc/logrotate.d
- newins "${FILESDIR}/logrotate" slurm
- # install bashcomp
- newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
- bashcomp_alias scontrol \
- sreport sacctmgr squeue scancel sshare sbcast sinfo \
- sprio sacct salloc sbatch srun sattach sdiag sstat
- # install systemd files
- systemd_newtmpfilesd "${FILESDIR}/slurm.tmpfiles" slurm.conf
- systemd_dounit etc/slurmd.service etc/slurmctld.service
etc/slurmdbd.service
-}
-
-pkg_preinst() {
- if use munge; then
- sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${ED}"etc/conf.d/slurm
|| die
- fi
-}
-
-create_folders_and_fix_permissions() {
- einfo "Fixing permissions in ${@}"
- mkdir -p ${@} || die
- chown -R ${PN}:${PN} ${@} || die
-}
-
-pkg_postinst() {
- paths=(
- "${EROOT}"var/${PN}/checkpoint
- "${EROOT}"var/${PN}
- "${EROOT}"var/spool/${PN}/slurmd
- "${EROOT}"var/spool/${PN}
- "${EROOT}"var/log/${PN}
- /var/tmp/${PN}/${PN}d
- /var/tmp/${PN}
- /run/${PN}
- )
- local folder_path
- for folder_path in ${paths[@]}; do
- create_folders_and_fix_permissions $folder_path
- done
- echo
-
- elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
- elog "through a (javascript enabled) browser to create a configureation
file."
- elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including
the headnode) of your cluster."
- echo
- elog "For cgroup support, please see
https://www.schedmd.com/slurmdocs/cgroup.conf.html";
- elog "Your kernel must be compiled with the wanted cgroup feature:"
- elog " For the proctrack plugin:"
- elog " freezer"
- elog " For the task plugin:"
- elog " cpuset, memory, devices"
- elog " For the accounting plugin:"
- elog " cpuacct, memory, blkio"
- elog "Then, set these options in /etc/slurm/slurm.conf:"
- elog " ProctrackType=proctrack/cgroup"
- elog " TaskPlugin=task/cgroup"
- einfo
- ewarn "Paths were created for slurm. Please use these paths in
/etc/slurm/slurm.conf:"
- for folder_path in ${paths[@]}; do
- ewarn " ${folder_path}"
- done
-}
