diff options
author | Alexey Shvetsov <alexxy@gentoo.org> | 2018-09-04 16:32:15 +0300 |
---|---|---|
committer | Alexey Shvetsov <alexxy@gentoo.org> | 2018-09-04 16:32:48 +0300 |
commit | 759a83663940a35618f0ffbfae5911e1301f5963 (patch) | |
tree | 2b3829eb9a61f893ac59ddf4cb543e4c159689df /sys-cluster | |
parent | sys-cluster/slurm: enhance ebuild and migrate to eapi6 and eapi7_ver (diff) | |
download | gentoo-759a83663940a35618f0ffbfae5911e1301f5963.tar.gz gentoo-759a83663940a35618f0ffbfae5911e1301f5963.tar.bz2 gentoo-759a83663940a35618f0ffbfae5911e1301f5963.zip |
sys-cluster/slurm: Drop old version
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/slurm/Manifest | 1 | ||||
-rw-r--r-- | sys-cluster/slurm/files/slurm-17.02.11-disable-sview.patch | 99 | ||||
-rw-r--r-- | sys-cluster/slurm/slurm-17.02.11.ebuild | 237 |
3 files changed, 0 insertions, 337 deletions
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 0dcf5c27a7ff..ab80e3b9bdc8 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,2 +1 @@ -DIST slurm-17.02.11.tar.bz2 6056931 BLAKE2B bce33aab9705dd95b60c42aba032d3f63b69c450e6093f10ac2cfab2b6028451f5659d6263aa2cafe76eb5f91b484e95d3dea388f32fd7472b0edd5ff33f4afe SHA512 f93f6afc0f6f37ba518644c52ff318ff9f3624a8326e795957f986c11ec72f1ee0dead1c7d49a1fb67df11a2f792c4ecc4f647bd3f824c8bfee1e2de0261f64c DIST slurm-17.11.9.tar.bz2 6258698 BLAKE2B 53f724dfdcaec4117eedcb187b0bfced41471fff667ea3f3452b35d80ed039c14c31a75672c304816af538861fccd0dcf37c0decd32521299db2162a30b8bba0 SHA512 281bda70695011bbc30f56738049b2b11866d6c266c6aa5590ffcbaaa748a02fc76cd2d03834cd90f0e1f4160ee0fb3c35a7c2e53819f5e21445748d4d437e6b diff --git a/sys-cluster/slurm/files/slurm-17.02.11-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.02.11-disable-sview.patch deleted file mode 100644 index f7e2c5b26739..000000000000 --- a/sys-cluster/slurm/files/slurm-17.02.11-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.02.11.ebuild b/sys-cluster/slurm/slurm-17.02.11.ebuild deleted file mode 100644 index b52290725ed8..000000000000 --- a/sys-cluster/slurm/slurm-17.02.11.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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="" -else - inherit versionator - if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then - MY_PV=$(replace_version_separator 3 '-0.') # pre-releases or release-candidate - else - MY_PV=$(replace_version_separator 3 '-') # stable releases - fi - MY_P="${PN}-${MY_PV}" - INHERIT_GIT="" - SRC_URI="https://www.schedmd.com/download/latest/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_P}" -fi - -inherit autotools eutils pam perl-module prefix toolchain-funcs user ${INHERIT_GIT} - -DESCRIPTION="A Highly Scalable Resource Manager" -HOMEPAGE="https://www.schedmd.com" - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque" - -DEPEND=" - !sys-cluster/torque - !net-analyzer/slurm - !net-analyzer/sinfo - !sys-cluster/pmix[pmi] - mysql? ( virtual/mysql ) - munge? ( sys-auth/munge ) - pam? ( virtual/pam ) - ssl? ( dev-libs/openssl:0= ) - lua? ( dev-lang/lua:0= ) - !lua? ( !dev-lang/lua ) - >=sys-apps/hwloc-1.1.1-r1" -RDEPEND="${DEPEND} - dev-libs/libcgroup" - -REQUIRED_USE="torque? ( perl )" - -LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl" -LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl" - -RESTRICT="primaryuri test" - -PATCHES=( - "${FILESDIR}"/${P}-disable-sview.patch -) - -src_unpack() { - if [[ ${PV} == *9999* ]]; then - git-2_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}/var/run/slurm/slurmctld.pid:g" \ - -e "s:/var/run/slurmd.pid:${EPREFIX}/var/run/slurm/slurmd.pid:g" \ - -i "${S}/etc/slurm.conf.example" \ - || die "Can't sed for /var/run/slurmctld.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" - - hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4 - eautoreconf -} - -src_configure() { - local myconf=( - --sysconfdir="${EPREFIX}/etc/${PN}" - --with-hwloc="${EPREFIX}/usr" - --docdir="${EPREFIX}/usr/share/doc/${P}" - --htmldir="${EPREFIX}/usr/share/doc/${P}" - ) - use debug || myconf+=( --disable-debug ) - use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) ) - use mysql || myconf+=( --without-mysql_config ) - econf "${myconf[@]}" \ - $(use_enable pam) \ - $(use_with ssl) \ - $(use_with munge) \ - $(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 - # 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 -} - -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 ${@} - chown -R ${PN}:${PN} ${@} -} - -pkg_postinst() { - paths=( - "${EROOT}"var/${PN}/checkpoint - "${EROOT}"var/${PN} - "${EROOT}"var/spool/${PN}/slurmd - "${EROOT}"var/spool/${PN} - "${EROOT}"var/run/${PN} - "${EROOT}"var/log/${PN} - /var/tmp/${PN}/${PN}d - /var/tmp/${PN} - ) - 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 " General setup --->" - elog " [*] Control Group support --->" - elog " [*] Freezer cgroup subsystem" - elog " [*] Device controller for cgroups" - elog " [*] Cpuset support" - elog " [*] Simple CPU accounting cgroup subsystem" - elog " [*] Resource counters" - elog " [*] Memory Resource Controller for Control Groups" - elog " [*] Group CPU scheduler --->" - elog " [*] Group scheduling for SCHED_OTHER" - 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 -} |