1 |
commit: 759a83663940a35618f0ffbfae5911e1301f5963 |
2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 4 13:32:15 2018 +0000 |
4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 4 13:32:48 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=759a8366 |
7 |
|
8 |
sys-cluster/slurm: Drop old version |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
sys-cluster/slurm/Manifest | 1 - |
13 |
.../slurm/files/slurm-17.02.11-disable-sview.patch | 99 --------- |
14 |
sys-cluster/slurm/slurm-17.02.11.ebuild | 237 --------------------- |
15 |
3 files changed, 337 deletions(-) |
16 |
|
17 |
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest |
18 |
index 0dcf5c27a7f..ab80e3b9bdc 100644 |
19 |
--- a/sys-cluster/slurm/Manifest |
20 |
+++ b/sys-cluster/slurm/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST slurm-17.02.11.tar.bz2 6056931 BLAKE2B bce33aab9705dd95b60c42aba032d3f63b69c450e6093f10ac2cfab2b6028451f5659d6263aa2cafe76eb5f91b484e95d3dea388f32fd7472b0edd5ff33f4afe SHA512 f93f6afc0f6f37ba518644c52ff318ff9f3624a8326e795957f986c11ec72f1ee0dead1c7d49a1fb67df11a2f792c4ecc4f647bd3f824c8bfee1e2de0261f64c |
23 |
DIST slurm-17.11.9.tar.bz2 6258698 BLAKE2B 53f724dfdcaec4117eedcb187b0bfced41471fff667ea3f3452b35d80ed039c14c31a75672c304816af538861fccd0dcf37c0decd32521299db2162a30b8bba0 SHA512 281bda70695011bbc30f56738049b2b11866d6c266c6aa5590ffcbaaa748a02fc76cd2d03834cd90f0e1f4160ee0fb3c35a7c2e53819f5e21445748d4d437e6b |
24 |
|
25 |
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 |
26 |
deleted file mode 100644 |
27 |
index f7e2c5b2673..00000000000 |
28 |
--- a/sys-cluster/slurm/files/slurm-17.02.11-disable-sview.patch |
29 |
+++ /dev/null |
30 |
@@ -1,99 +0,0 @@ |
31 |
- configure.ac | 39 --------------------------------------- |
32 |
- doc/man/man1/Makefile.am | 8 -------- |
33 |
- src/Makefile.am | 3 +-- |
34 |
- 3 files changed, 1 insertion(+), 49 deletions(-) |
35 |
- |
36 |
-diff --git a/configure.ac b/configure.ac |
37 |
-index 2f177ec..ff4d69b 100644 |
38 |
---- a/configure.ac |
39 |
-+++ b/configure.ac |
40 |
-@@ -238,44 +238,6 @@ AC_SUBST(HAVE_SOME_CURSES) |
41 |
- PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"]) |
42 |
- AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes") |
43 |
- |
44 |
--# |
45 |
--# Tests for GTK+ |
46 |
--# |
47 |
-- |
48 |
--# use the correct libs if running on 64bit |
49 |
--if test -d "/usr/lib64/pkgconfig"; then |
50 |
-- PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:$PKG_CONFIG_PATH" |
51 |
--fi |
52 |
-- |
53 |
--if test -d "/opt/gnome/lib64/pkgconfig"; then |
54 |
-- PKG_CONFIG_PATH="/opt/gnome/lib64/pkgconfig/:$PKG_CONFIG_PATH" |
55 |
--fi |
56 |
-- |
57 |
--AM_PATH_GLIB_2_0([2.7.1], [ac_glib_test="yes"], [ac_glib_test="no"], [gthread]) |
58 |
-- |
59 |
--if test ${glib_config_minor_version=0} -ge 32 ; then |
60 |
-- AC_DEFINE([GLIB_NEW_THREADS], 1, [Define to 1 if using glib-2.32.0 or higher]) |
61 |
--fi |
62 |
-- |
63 |
--AM_PATH_GTK_2_0([2.7.1], [ac_gtk_test="yes"], [ac_gtk_test="no"], [gthread]) |
64 |
--if test ${gtk_config_minor_version=0} -ge 10 ; then |
65 |
-- AC_DEFINE([GTK2_USE_RADIO_SET], 1, [Define to 1 if using gtk+-2.10.0 or higher]) |
66 |
--fi |
67 |
-- |
68 |
--if test ${gtk_config_minor_version=0} -ge 12 ; then |
69 |
-- AC_DEFINE([GTK2_USE_TOOLTIP], 1, [Define to 1 if using gtk+-2.12.0 or higher]) |
70 |
--fi |
71 |
-- |
72 |
--if test ${gtk_config_minor_version=0} -ge 14 ; then |
73 |
-- AC_DEFINE([GTK2_USE_GET_FOCUS], 1, [Define to 1 if using gtk+-2.14.0 or higher]) |
74 |
--fi |
75 |
-- |
76 |
--if test "x$ac_glib_test" != "xyes" -o "x$ac_gtk_test" != "xyes"; then |
77 |
-- AC_MSG_WARN([cannot build sview without gtk library]); |
78 |
--fi |
79 |
-- |
80 |
--AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"]) |
81 |
-- |
82 |
- dnl Cray ALPS/Basil support depends on mySQL |
83 |
- X_AC_CRAY |
84 |
- |
85 |
-@@ -477,7 +439,6 @@ AC_CONFIG_FILES([Makefile |
86 |
- src/sshare/Makefile |
87 |
- src/sstat/Makefile |
88 |
- src/strigger/Makefile |
89 |
-- src/sview/Makefile |
90 |
- src/plugins/Makefile |
91 |
- src/plugins/accounting_storage/Makefile |
92 |
- src/plugins/accounting_storage/common/Makefile |
93 |
-diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am |
94 |
-index 246f16d..ba39af2 100644 |
95 |
---- a/doc/man/man1/Makefile.am |
96 |
-+++ b/doc/man/man1/Makefile.am |
97 |
-@@ -29,10 +29,6 @@ if WITH_BLCR |
98 |
- man1_MANS += srun_cr.1 |
99 |
- endif |
100 |
- |
101 |
--if BUILD_SVIEW |
102 |
--man1_MANS += sview.1 |
103 |
--endif |
104 |
-- |
105 |
- EXTRA_DIST = $(man1_MANS) |
106 |
- |
107 |
- if HAVE_MAN2HTML |
108 |
-@@ -65,10 +61,6 @@ if WITH_BLCR |
109 |
- html_DATA += srun_cr.html |
110 |
- endif |
111 |
- |
112 |
--if BUILD_SVIEW |
113 |
--html_DATA += sview.html |
114 |
--endif |
115 |
-- |
116 |
- MOSTLYCLEANFILES = ${html_DATA} |
117 |
- |
118 |
- EXTRA_DIST += $(html_DATA) |
119 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
120 |
-index bcd5aa7..a8cbf17 100644 |
121 |
---- a/src/Makefile.am |
122 |
-+++ b/src/Makefile.am |
123 |
-@@ -28,5 +28,4 @@ SUBDIRS = \ |
124 |
- srun_cr \ |
125 |
- sshare \ |
126 |
- sstat \ |
127 |
-- strigger \ |
128 |
-- sview |
129 |
-+ strigger |
130 |
|
131 |
diff --git a/sys-cluster/slurm/slurm-17.02.11.ebuild b/sys-cluster/slurm/slurm-17.02.11.ebuild |
132 |
deleted file mode 100644 |
133 |
index b52290725ed..00000000000 |
134 |
--- a/sys-cluster/slurm/slurm-17.02.11.ebuild |
135 |
+++ /dev/null |
136 |
@@ -1,237 +0,0 @@ |
137 |
-# Copyright 1999-2018 Gentoo Foundation |
138 |
-# Distributed under the terms of the GNU General Public License v2 |
139 |
- |
140 |
-EAPI=6 |
141 |
- |
142 |
-if [[ ${PV} == *9999* ]]; then |
143 |
- EGIT_REPO_URI="https://github.com/SchedMD/slurm.git" |
144 |
- INHERIT_GIT="git-r3" |
145 |
- SRC_URI="" |
146 |
- KEYWORDS="" |
147 |
-else |
148 |
- inherit versionator |
149 |
- if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then |
150 |
- MY_PV=$(replace_version_separator 3 '-0.') # pre-releases or release-candidate |
151 |
- else |
152 |
- MY_PV=$(replace_version_separator 3 '-') # stable releases |
153 |
- fi |
154 |
- MY_P="${PN}-${MY_PV}" |
155 |
- INHERIT_GIT="" |
156 |
- SRC_URI="https://www.schedmd.com/download/latest/${MY_P}.tar.bz2" |
157 |
- KEYWORDS="~amd64 ~x86" |
158 |
- S="${WORKDIR}/${MY_P}" |
159 |
-fi |
160 |
- |
161 |
-inherit autotools eutils pam perl-module prefix toolchain-funcs user ${INHERIT_GIT} |
162 |
- |
163 |
-DESCRIPTION="A Highly Scalable Resource Manager" |
164 |
-HOMEPAGE="https://www.schedmd.com" |
165 |
- |
166 |
-LICENSE="GPL-2" |
167 |
-SLOT="0" |
168 |
-IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque" |
169 |
- |
170 |
-DEPEND=" |
171 |
- !sys-cluster/torque |
172 |
- !net-analyzer/slurm |
173 |
- !net-analyzer/sinfo |
174 |
- !sys-cluster/pmix[pmi] |
175 |
- mysql? ( virtual/mysql ) |
176 |
- munge? ( sys-auth/munge ) |
177 |
- pam? ( virtual/pam ) |
178 |
- ssl? ( dev-libs/openssl:0= ) |
179 |
- lua? ( dev-lang/lua:0= ) |
180 |
- !lua? ( !dev-lang/lua ) |
181 |
- >=sys-apps/hwloc-1.1.1-r1" |
182 |
-RDEPEND="${DEPEND} |
183 |
- dev-libs/libcgroup" |
184 |
- |
185 |
-REQUIRED_USE="torque? ( perl )" |
186 |
- |
187 |
-LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl" |
188 |
-LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl" |
189 |
- |
190 |
-RESTRICT="primaryuri test" |
191 |
- |
192 |
-PATCHES=( |
193 |
- "${FILESDIR}"/${P}-disable-sview.patch |
194 |
-) |
195 |
- |
196 |
-src_unpack() { |
197 |
- if [[ ${PV} == *9999* ]]; then |
198 |
- git-2_src_unpack |
199 |
- else |
200 |
- default |
201 |
- fi |
202 |
-} |
203 |
- |
204 |
-pkg_setup() { |
205 |
- enewgroup slurm 500 |
206 |
- enewuser slurm 500 -1 /var/spool/slurm slurm |
207 |
-} |
208 |
- |
209 |
-src_prepare() { |
210 |
- tc-ld-disable-gold |
211 |
- default |
212 |
- |
213 |
- # pids should go to /var/run/slurm |
214 |
- sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/var/run/slurm/slurmctld.pid:g" \ |
215 |
- -e "s:/var/run/slurmd.pid:${EPREFIX}/var/run/slurm/slurmd.pid:g" \ |
216 |
- -i "${S}/etc/slurm.conf.example" \ |
217 |
- || die "Can't sed for /var/run/slurmctld.pid" |
218 |
- # also state dirs are in /var/spool/slurm |
219 |
- sed -e "s:StateSaveLocation=*.:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \ |
220 |
- -e "s:SlurmdSpoolDir=*.:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \ |
221 |
- -i "${S}/etc/slurm.conf.example" \ |
222 |
- || die "Can't sed ${S}/etc/slurm.conf.example for StateSaveLocation=*. or SlurmdSpoolDir=*" |
223 |
- # and tmp should go to /var/tmp/slurm |
224 |
- sed -e 's:/tmp:/var/tmp:g' \ |
225 |
- -i "${S}/etc/slurm.conf.example" \ |
226 |
- || die "Can't sed for StateSaveLocation=*./tmp" |
227 |
- |
228 |
- hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4 |
229 |
- eautoreconf |
230 |
-} |
231 |
- |
232 |
-src_configure() { |
233 |
- local myconf=( |
234 |
- --sysconfdir="${EPREFIX}/etc/${PN}" |
235 |
- --with-hwloc="${EPREFIX}/usr" |
236 |
- --docdir="${EPREFIX}/usr/share/doc/${P}" |
237 |
- --htmldir="${EPREFIX}/usr/share/doc/${P}" |
238 |
- ) |
239 |
- use debug || myconf+=( --disable-debug ) |
240 |
- use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) ) |
241 |
- use mysql || myconf+=( --without-mysql_config ) |
242 |
- econf "${myconf[@]}" \ |
243 |
- $(use_enable pam) \ |
244 |
- $(use_with ssl) \ |
245 |
- $(use_with munge) \ |
246 |
- $(use_enable static-libs static) \ |
247 |
- $(use_enable multiple-slurmd) |
248 |
- |
249 |
- # --htmldir does not seems to propagate... Documentations are installed |
250 |
- # in /usr/share/doc/slurm-2.3.0/html |
251 |
- # instead of /usr/share/doc/slurm-2.3.0.2/html |
252 |
- sed \ |
253 |
- -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \ |
254 |
- -i doc/html/Makefile || die |
255 |
- if use perl ; then |
256 |
- # small hack to make it compile |
257 |
- mkdir -p "${S}/src/api/.libs" || die |
258 |
- mkdir -p "${S}/src/db_api/.libs" || die |
259 |
- touch "${S}/src/api/.libs/libslurm.so" || die |
260 |
- touch "${S}/src/db_api/.libs/libslurmdb.so" || die |
261 |
- cd "${LIBSLURM_PERL_S}" || die |
262 |
- S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure |
263 |
- cd "${LIBSLURMDB_PERL_S}" || die |
264 |
- S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure |
265 |
- cd "${S}" || die |
266 |
- rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die |
267 |
- fi |
268 |
-} |
269 |
- |
270 |
-src_compile() { |
271 |
- default |
272 |
- use pam && emake -C contribs/pam |
273 |
- if use perl ; then |
274 |
- cd "${LIBSLURM_PERL_S}" || die |
275 |
- S="${LIBSLURM_PERL_S}" perl-module_src_compile |
276 |
- cd "${LIBSLURMDB_PERL_S}" || die |
277 |
- S="${LIBSLURMDB_PERL_S}" perl-module_src_compile |
278 |
- cd "${S}" || die |
279 |
- fi |
280 |
- use torque && emake -C contribs/torque |
281 |
-} |
282 |
- |
283 |
-src_install() { |
284 |
- default |
285 |
- use pam && emake DESTDIR="${D}" -C contribs/pam install |
286 |
- if use perl; then |
287 |
- cd "${LIBSLURM_PERL_S}" || die |
288 |
- S="${LIBSLURM_PERL_S}" perl-module_src_install |
289 |
- cd "${LIBSLURMDB_PERL_S}" || die |
290 |
- S="${LIBSLURMDB_PERL_S}" perl-module_src_install |
291 |
- cd "${S}" || die |
292 |
- fi |
293 |
- if use torque; then |
294 |
- emake DESTDIR="${D}" -C contribs/torque |
295 |
- rm -f "${ED}/usr/bin/mpiexec" || die |
296 |
- fi |
297 |
- use static-libs || find "${ED}" -name '*.la' -exec rm {} + |
298 |
- # install sample configs |
299 |
- keepdir /etc/slurm |
300 |
- insinto /etc/slurm |
301 |
- doins \ |
302 |
- etc/bluegene.conf.example \ |
303 |
- etc/cgroup.conf.example \ |
304 |
- etc/cgroup_allowed_devices_file.conf.example \ |
305 |
- etc/slurm.conf.example \ |
306 |
- etc/slurmdbd.conf.example |
307 |
- exeinto /etc/slurm |
308 |
- doexe \ |
309 |
- etc/slurm.epilog.clean |
310 |
- # install init.d files |
311 |
- newinitd "$(prefixify_ro ${FILESDIR}/slurmd.initd)" slurmd |
312 |
- newinitd "$(prefixify_ro ${FILESDIR}/slurmctld.initd)" slurmctld |
313 |
- newinitd "$(prefixify_ro ${FILESDIR}/slurmdbd.initd)" slurmdbd |
314 |
- # install conf.d files |
315 |
- newconfd "${FILESDIR}/slurm.confd" slurm |
316 |
- # Install logrotate file |
317 |
- insinto /etc/logrotate.d |
318 |
- newins "${FILESDIR}/logrotate" slurm |
319 |
-} |
320 |
- |
321 |
-pkg_preinst() { |
322 |
- if use munge; then |
323 |
- sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${ED}"etc/conf.d/slurm || die |
324 |
- fi |
325 |
-} |
326 |
- |
327 |
-create_folders_and_fix_permissions() { |
328 |
- einfo "Fixing permissions in ${@}" |
329 |
- mkdir -p ${@} |
330 |
- chown -R ${PN}:${PN} ${@} |
331 |
-} |
332 |
- |
333 |
-pkg_postinst() { |
334 |
- paths=( |
335 |
- "${EROOT}"var/${PN}/checkpoint |
336 |
- "${EROOT}"var/${PN} |
337 |
- "${EROOT}"var/spool/${PN}/slurmd |
338 |
- "${EROOT}"var/spool/${PN} |
339 |
- "${EROOT}"var/run/${PN} |
340 |
- "${EROOT}"var/log/${PN} |
341 |
- /var/tmp/${PN}/${PN}d |
342 |
- /var/tmp/${PN} |
343 |
- ) |
344 |
- for folder_path in ${paths[@]}; do |
345 |
- create_folders_and_fix_permissions $folder_path |
346 |
- done |
347 |
- echo |
348 |
- |
349 |
- elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html" |
350 |
- elog "through a (javascript enabled) browser to create a configureation file." |
351 |
- elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster." |
352 |
- echo |
353 |
- elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html" |
354 |
- elog "Your kernel must be compiled with the wanted cgroup feature:" |
355 |
- elog " General setup --->" |
356 |
- elog " [*] Control Group support --->" |
357 |
- elog " [*] Freezer cgroup subsystem" |
358 |
- elog " [*] Device controller for cgroups" |
359 |
- elog " [*] Cpuset support" |
360 |
- elog " [*] Simple CPU accounting cgroup subsystem" |
361 |
- elog " [*] Resource counters" |
362 |
- elog " [*] Memory Resource Controller for Control Groups" |
363 |
- elog " [*] Group CPU scheduler --->" |
364 |
- elog " [*] Group scheduling for SCHED_OTHER" |
365 |
- elog "Then, set these options in /etc/slurm/slurm.conf:" |
366 |
- elog " ProctrackType=proctrack/cgroup" |
367 |
- elog " TaskPlugin=task/cgroup" |
368 |
- einfo |
369 |
- ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:" |
370 |
- for folder_path in ${paths[@]}; do |
371 |
- ewarn " ${folder_path}" |
372 |
- done |
373 |
-} |