From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E5EF71382C5 for ; Fri, 22 May 2020 10:39:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26F35E08AA; Fri, 22 May 2020 10:39:46 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 023F1E08AA for ; Fri, 22 May 2020 10:39:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F194734EFEE for ; Fri, 22 May 2020 10:39:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A657223E for ; Fri, 22 May 2020 10:39:43 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1590143966.6d359ca848d188d27a64405a2b7ddfe5672f7fdc.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/slurm/Manifest sys-cluster/slurm/slurm-20.02.2.1.ebuild X-VCS-Directories: sys-cluster/slurm/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 6d359ca848d188d27a64405a2b7ddfe5672f7fdc X-VCS-Branch: master Date: Fri, 22 May 2020 10:39:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7cbaf95e-6bf5-40bb-ab40-aec1c1d1633b X-Archives-Hash: 0bcb902a9823070c27d073cf467fcb1b commit: 6d359ca848d188d27a64405a2b7ddfe5672f7fdc Author: Mikle Kolyada gentoo org> AuthorDate: Fri May 22 10:39:26 2020 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Fri May 22 10:39:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d359ca8 sys-cluster/slurm: Drop old Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 - sys-cluster/slurm/slurm-20.02.2.1.ebuild | 263 ------------------------------- 2 files changed, 264 deletions(-) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 03b6460a4c5..35918cfdb8f 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,2 +1 @@ -DIST slurm-20-02-2-1.tar.gz 8680227 BLAKE2B 9058c5161a3e087201b17484fbb8430d2af392b4abec4cfea3b6a882609bb978987a8e6aeda512b08def8010403c9f0893827632358225c15c374d15a583432f SHA512 6ed8628be442138c90f0f497846679eb2a4ea8e2c612d31c1276cc451333663bf310719a8f823dc873536343065186dc5f26871ce80340c0bdb71ab564620513 DIST slurm-20-02-3-1.tar.gz 8686608 BLAKE2B bbb1776c6c39ea81d636f0bf8f8534c508c1842e93d5bd70e49f8b63cf78b9d7be46f6cf2855517ebaaf294d00048f65b17dba91f2316ab0706342f68f7c2c3a SHA512 4c9f847b18052f9373694f91346eb8e0532c3a71060e5b8e4fd837534014ad5813adb93d2b60f7047e355f57919f2bef59b10c6540e13576aaa47ee0ba2b5a22 diff --git a/sys-cluster/slurm/slurm-20.02.2.1.ebuild b/sys-cluster/slurm/slurm-20.02.2.1.ebuild deleted file mode 100644 index a2a4e4bd829..00000000000 --- a/sys-cluster/slurm/slurm-20.02.2.1.ebuild +++ /dev/null @@ -1,263 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/SchedMD/slurm.git" - INHERIT_GIT="git-r3" - MY_P="${P}" -else - if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then - MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate - else - MY_PV=$(ver_rs 1-3 '-') # stable releases - fi - MY_P="${PN}-${MY_PV}" - INHERIT_GIT="" - SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} - -DESCRIPTION="A Highly Scalable Resource Manager" -HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm" - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X" - -COMMON_DEPEND=" - !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 ) - 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 ) - ucx? ( sys-cluster/ucx ) - X? ( net-libs/libssh2 ) - >=sys-apps/hwloc-1.1.1-r1 - sys-libs/ncurses:0= - app-arch/lz4:0= - sys-libs/readline:0=" -DEPEND="${COMMON_DEPEND} - html? ( sys-apps/man2html )" -RDEPEND="${OMMON_DEPEND} - acct-user/slurm - acct-group/slurm - dev-libs/libcgroup" - -REQUIRED_USE="torque? ( perl )" - -S="${WORKDIR}/${PN}-${MY_P}" - -LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl" -LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl" - -RESTRICT="test" - -src_unpack() { - if [[ ${PV} == *9999* ]]; then - git-r3_src_unpack - else - default - fi -} - -src_prepare() { - tc-ld-disable-gold - default - - # pids should go to /var/run/slurm - sed \ - -e 's:/tmp:/var/tmp:g' \ - -e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \ - -e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \ - -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 for /var/run/slurmctld.pid" - sed \ - -e "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" - # gentooify systemd services - sed \ - -e 's:sysconfig/.*:conf.d/slurm:g' \ - -e 's:var/run/:run/slurm/:g' \ - -e '/^EnvironmentFile=.*/d' \ - -i "${S}/etc"/*.service.in \ - || die "Can't sed systemd services for sysconfig or var/run/" - - sed -e '/AM_PATH_GTK_2_0/d' -i configure.ac || die - - hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4 - eautoreconf -} - -src_configure() { - local myconf=( - --sysconfdir="${EPREFIX}/etc/${PN}" - --with-hwloc="${EPREFIX}/usr" - --htmldir="${EPREFIX}/usr/share/doc/${PF}" - ) - 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 debug) \ - $(use_enable pam) \ - $(use_enable X x11) \ - $(use_with munge) \ - $(use_with json) \ - $(use_with hdf5) \ - $(use_with ofed) \ - $(use_with ucx) \ - $(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 "${D}"/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/prolog.example \ - etc/cgroup.conf.example \ - etc/slurm.conf.example \ - etc/slurmdbd.conf.example - exeinto /etc/slurm - 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,' "${D}"/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 -}