From 130adc86b9022d7ba41ff3ccd8a5ea3637f7a5ad Mon Sep 17 00:00:00 2001 From: Andrew Savchenko Date: Thu, 15 Jul 2021 10:41:01 +0300 Subject: sys-cluster/orangefs: drop old version Bug: https://bugs.gentoo.org/797016 Signed-off-by: Andrew Savchenko --- sys-cluster/orangefs/Manifest | 1 - .../orangefs/files/orangefs-2.8.6-layout.patch | 123 ----------- sys-cluster/orangefs/orangefs-2.8.7.ebuild | 233 --------------------- 3 files changed, 357 deletions(-) delete mode 100644 sys-cluster/orangefs/files/orangefs-2.8.6-layout.patch delete mode 100644 sys-cluster/orangefs/orangefs-2.8.7.ebuild diff --git a/sys-cluster/orangefs/Manifest b/sys-cluster/orangefs/Manifest index 48176d6..a860089 100644 --- a/sys-cluster/orangefs/Manifest +++ b/sys-cluster/orangefs/Manifest @@ -1,2 +1 @@ -DIST orangefs-2.8.7.tar.gz 2987688 SHA256 9a441af7ff2f47da816b1d458c52a60493edcdcfee50019a4ade4cdb14e2e57d SHA512 071c92dc93e2e1cd1db9808d22489b1b22eb2279836a6f91271a555fcf157ac7a9ebe6fdce714edb47ee34feea8ae0d11b40bf84788c37082ad6a956a87f8668 WHIRLPOOL b157dda9589cce9eebe9901a71001c859c5ba4bc803b17749a6fa5ec786f163562577d2553a13a1d5b40dddcafef61bc272c0fd7e2bd1b5a3f02c0f3ee834872 DIST orangefs-2.9beta.20130530.tar.gz 3396895 SHA256 1862b55eaa47c173497956a4f52a38fb2d854dd311d71d9cde2272406e35804c SHA512 f7015e78dfaf8bcc966325238066d18ec64ed21b2f966cdc4efa278cceacbee6f1eafd3db88c01af6e6d99b006c26d64564dc08f35b9ddb61b0e341405127b60 WHIRLPOOL faa49f609fd667d62ddfedba3b5815e591acb3b408dd1ebdc1f2f5a573d5790df8348e5a2969cb7d1f630177e5c8d991d4a6716d8a84e196e34b284c06b15d9f diff --git a/sys-cluster/orangefs/files/orangefs-2.8.6-layout.patch b/sys-cluster/orangefs/files/orangefs-2.8.6-layout.patch deleted file mode 100644 index 066ed58..0000000 --- a/sys-cluster/orangefs/files/orangefs-2.8.6-layout.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff -Naur orangefs-2.8.6.p1/src/client/sysint/sys-create.sm orangefs-2.8.6/src/client/sysint/sys-create.sm ---- orangefs-2.8.6.p1/src/client/sysint/sys-create.sm 2012-04-14 00:23:05.000000000 +0400 -+++ orangefs-2.8.6/src/client/sysint/sys-create.sm 2012-08-30 14:34:24.129659209 +0400 -@@ -144,6 +144,8 @@ - PVFS_error ret = -PVFS_EINVAL; - PINT_smcb *smcb = NULL; - PINT_client_sm *sm_p = NULL; -+ struct server_configuration_s *server_config = NULL; -+ enum PVFS_sys_layout_algorithm layout_algo = PVFS_SYS_LAYOUT_ROUND_ROBIN; - - gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_isys_create entered\n"); - -@@ -244,7 +246,17 @@ - } - else - { -- sm_p->u.create.layout.algorithm = PVFS_SYS_LAYOUT_ROUND_ROBIN; -+ sm_p->object_ref = parent_ref; -+ /* get default filesystem layout */ -+ server_config = PINT_get_server_config_struct(sm_p->parent_ref.fs_id); -+ if (server_config) -+ { -+ layout_algo = server_config->default_layout_algo; -+ /* Release the server config mutex */ -+ PINT_put_server_config_struct(server_config); -+ } -+ -+ sm_p->u.create.layout.algorithm = layout_algo; - } - - sm_p->object_ref = parent_ref; -diff -Naur orangefs-2.8.6.p1/src/common/misc/server-config.c orangefs-2.8.6/src/common/misc/server-config.c ---- orangefs-2.8.6.p1/src/common/misc/server-config.c 2012-06-12 13:08:33.000000000 +0400 -+++ orangefs-2.8.6/src/common/misc/server-config.c 2012-08-30 14:47:21.951009424 +0400 -@@ -125,6 +125,7 @@ - static DOTCONF_CB(directio_thread_num); - static DOTCONF_CB(directio_ops_per_queue); - static DOTCONF_CB(directio_timeout); -+static DOTCONF_CB(get_default_layout_algo); - static DOTCONF_CB(tree_width); - static DOTCONF_CB(tree_threshhold); - -@@ -1028,6 +1029,29 @@ - {"TreeThreshhold", ARG_INT, tree_threshhold, NULL, - CTX_FILESYSTEM, "2"}, - -+ /* Specifies the default data layout for a filesystem. -+ * Supported values are: -+ * -+ * none - PVFS_SYS_LAYOUT_NONE: -+ * servers are selected in the order listed in the configuration -+ * starting with the first one; -+ * -+ * random - PVFS_SYS_LAYOUT_RANDOM: -+ * servers are selected in random order but no server is used twice; -+ * -+ * round-robin - PVFS_SYS_LAYOUT_ROUND_ROBIN (default): -+ * servers are selected in the order listed in the configuration -+ * starting with a random one; -+ * -+ * local - PVFS_SYS_LAYOUT_LOCAL: -+ * puts a file on the server on the same node as the client, if there -+ * is one. Otherwise defaults to round_robin; -+ * -+ * PVFS_SYS_LAYOUT_LIST is currently not supported as a default value; -+ * */ -+ {"LayoutAlgo", ARG_STR, get_default_layout_algo, NULL, -+ CTX_DEFAULTS, "round-robin"}, -+ - LAST_OPTION - }; - -@@ -3072,6 +3096,37 @@ - return NULL; - } - -+DOTCONF_CB(get_default_layout_algo) -+{ -+ struct server_configuration_s *config_s = -+ (struct server_configuration_s *)cmd->context; -+ -+ enum PVFS_sys_layout_algorithm *algo = &config_s->default_layout_algo; -+ -+ if(!strcmp(cmd->data.str, "round-robin")) -+ { -+ *algo = PVFS_SYS_LAYOUT_ROUND_ROBIN; -+ } -+ else if(!strcmp(cmd->data.str, "random")) -+ { -+ *algo = PVFS_SYS_LAYOUT_RANDOM; -+ } -+ else if(!strcmp(cmd->data.str, "local")) -+ { -+ *algo = PVFS_SYS_LAYOUT_LOCAL; -+ } -+ else if(!strcmp(cmd->data.str, "none")) -+ { -+ *algo = PVFS_SYS_LAYOUT_NONE; -+ } -+ else -+ { -+ return "Error unknown LayoutAlgo option, valid values are:\n" -+ "local, none, random, round-robin\n"; -+ } -+ return NULL; -+} -+ - /* - * Function: PINT_config_release - * -diff -Naur orangefs-2.8.6.p1/src/common/misc/server-config.h orangefs-2.8.6/src/common/misc/server-config.h ---- orangefs-2.8.6.p1/src/common/misc/server-config.h 2012-04-19 18:01:24.000000000 +0400 -+++ orangefs-2.8.6/src/common/misc/server-config.h 2012-08-30 14:47:40.867360874 +0400 -@@ -201,6 +201,9 @@ - * be configurable. - */ - int trove_method; -+ -+ enum PVFS_sys_layout_algorithm default_layout_algo; /* Default data layout algorithm: -+ local, none, random, round-robin (default) */ - void *private_data; - int32_t tree_width; - int32_t tree_threshhold; diff --git a/sys-cluster/orangefs/orangefs-2.8.7.ebuild b/sys-cluster/orangefs/orangefs-2.8.7.ebuild deleted file mode 100644 index 2d62898..0000000 --- a/sys-cluster/orangefs/orangefs-2.8.7.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools linux-info linux-mod readme.gentoo-r1 - -DESCRIPTION="OrangeFS is a branch of PVFS2 cluster filesystem" -HOMEPAGE="http://www.orangefs.org/" -SRC_URI="http://orangefs.org/downloads/${PV}/source/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="aio apidocs debug doc examples fuse gtk infiniband kmod-threads memtrace -+mmap modules open-mx reset-file-pos secure sendfile +server ssl static -static-libs +tcp +threads +usrint usrint-cache +usrint-cwd usrint-kmount -valgrind" - -CDEPEND=" - dev-lang/perl - >=sys-libs/db-4.8.30:= - virtual/perl-Math-BigInt - fuse? ( sys-fs/fuse:0= ) - gtk? ( x11-libs/gtk+:2 ) - infiniband? ( sys-fabric/ofed ) - open-mx? ( sys-cluster/open-mx[static-libs?] ) - ssl? ( dev-libs/openssl[static-libs?] ) - valgrind? ( dev-util/valgrind ) -" -RDEPEND="${CDEPEND} - modules? ( virtual/modutils ) -" -DEPEND="${CDEPEND} - virtual/pkgconfig - >=sys-devel/autoconf-2.59 - sys-devel/bison - sys-devel/flex - apidocs? ( app-doc/doxygen ) - doc? ( dev-tex/latex2html ) - modules? ( virtual/linux-sources ) -" - -# aio and sendfile are only meaningful for kernel module; -# apidocs needs docs to be build first; -# kernel threads obviously needs kernel module and threads -# memtrace and valgrind witout debug info will be a pain; -# if both Myrinet and TCP interfaces are enabled in BMI, 5 sec delays will -# occur, though, at lest one of them must be enabled; -# static flag affects only server, so it must depend on it; -REQUIRED_USE=" - aio? ( modules ) - apidocs? ( doc ) - kmod-threads? ( modules threads ) - memtrace? ( debug ) - reset-file-pos? ( modules ) - sendfile? ( modules ) - static? ( server static-libs ) - tcp? ( !infiniband !open-mx ) - usrint-cache? ( usrint ) - usrint-cwd? ( usrint ) - usrint-kmount? ( usrint ) - valgrind? ( debug ) - || ( infiniband open-mx tcp ) -" - -BUILD_TARGETS="just_kmod" -MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.6)" - -pkg_setup() { - use modules && linux-mod_pkg_setup - if use modules && kernel_is -ge 3 4; then - eerror "Sorry, linux kernels >= 3.4 are not support yet." - eerror "(Well they are, but you'll have a dead lock.)" - eerror "You may disable modules use flag and use fuse client to mount filesystem." - eerror "PVFS2 server and ROMIO I/O API are still available too." - return 1 - fi -} - -src_prepare() { - # Upstream doesn't seem to want to apply this which makes - # sense as it probably only matters to us. Simple patch - # to split the installation of the module (which we use - # the eclass for) and the installation of the kernapps. - epatch "${FILESDIR}"/${PN}-2.8.5-split-kernapps.patch - - # Allow data layout control (proposed by upstream) - epatch "${FILESDIR}"/${PN}-2.8.6-layout.patch - - # Change defalt server logfile location to more appropriate value - # used by init script. - sed -i "s%/tmp/pvfs2-server.log%/var/log/pvfs2/server.log%g" \ - src/apps/admin/pvfs2-genconfig || die "sed on pvfs2-genconfig failed" - - AT_M4DIR=./maint/config eautoreconf -} - -src_configure() { - # VIS build is broken at this moment. - # Please add SDL dependency on reenable. - - local myconf="" - - use threads && use aio || myconf+=" --disable-aio-threaded-callbacks" - - # fast mode disables optimizations - use debug && myconf+=" --disable-fast --with-berkdb-debug" \ - || myconf+=" --enable-fast --without-berkdb-debug" - - use modules && myconf+=" --with-kernel=${KV_DIR}" - - # ARCH is used to define linux header path, should be not set. - unset ARCH - econf \ - --disable-nptl-workaround \ - --disable-redhat24 \ - --enable-epoll \ - --enable-shared \ - --enable-verbose-build \ - --sysconfdir="${EPREFIX}"/etc/pvfs2 \ - $(use_enable aio kernel-aio) \ - $(use_enable debug perf-counters) \ - $(use_enable debug segv-backtrace) \ - $(use_enable fuse) \ - $(use_enable gtk karma) \ - $(use_enable mmap mmap-racache) \ - $(use_enable kmod-threads threaded-kmod-helper) \ - $(use_enable reset-file-pos) \ - $(use_enable secure trusted-connections) \ - $(use_enable sendfile kernel-sendfile) \ - $(use_enable server) \ - $(use_enable static static-server) \ - $(use_enable static-libs static) \ - $(use_enable usrint) \ - $(use_enable usrint-cache ucache) \ - $(use_enable usrint-cwd) \ - $(use_enable usrint-kmount) \ - $(use_with infiniband openib "${EPREFIX}"/usr/) \ - $(use_with memtrace mtrace) \ - $(use_with open-mx mx "${EPREFIX}"/usr/) \ - $(use_with ssl openssl "${EPREFIX}"/usr/) \ - $(use_with tcp bmi-tcp) \ - $(use_with valgrind) \ - ${myconf} -} - -src_compile() { - emake all - if use modules; then - linux-mod_src_compile - emake kernapps - fi - - use doc && emake docs - if use apidocs; then - cd "${S}"/doc - doxygen doxygen/pvfs2-doxygen.conf || die "doxygen failed" - fi -} - -src_install() { - emake DESTDIR="${D}" install - if use modules; then - linux-mod_src_install - emake DESTDIR="${D}" kernapps_install - - newinitd "${FILESDIR}"/pvfs2-client-init.d pvfs2-client - newconfd "${FILESDIR}"/pvfs2-client-conf.d pvfs2-client - fi - - if use server; then - newinitd "${FILESDIR}"/pvfs2-server-init.d pvfs2-server - newconfd "${FILESDIR}"/pvfs2-server-conf.d pvfs2-server - fi - - keepdir /var/log/pvfs2 - - dodoc AUTHORS CREDITS ChangeLog INSTALL README - readme.gentoo_create_doc - - if use doc; then - dodoc doc/{coding/,}*.{pdf,txt} doc/random/*.pdf \ - doc/{coding/valgrind,add-client-syscall,add-server-req,REFERENCES.bib} - - if use apidocs; then - dohtml -A map -A md5 doc/doxygen/html/* - fi - - docinto design - dodoc doc/design/*.{pdf,txt} - fi - if use examples; then - docinto examples - dodoc -r examples/heartbeat examples/fs.conf - fi -} - -pkg_postinst() { - use modules && linux-mod_pkg_postinst - - readme.gentoo_print_elog - if ! use modules; then - ewarn - ewarn "Without modules support you wouldn't be able to use pvfs2-client and mount" - ewarn "partitions using kernel VFS. Though, you are still able to use libpvfs2," - ewarn "ROMIO interface, and FUSE client (if fuse use flag is enabled)." - fi - if use modules && kernel_is -ge 3 1; then - ewarn - ewarn "ACL support for 3.1 and 3.2 kernels is known to have bugs." - fi - if use sendfile; then - ewarn - ewarn "With sendfile enabled performance will be degraded for small access patterns." - fi -} - -pkg_config() { - local s - local f="$(source "${ROOT}"etc/conf.d/pvfs2-server; echo ${PVFS2_FS_CONF})" - [[ -z "${f}" ]] && f="${ROOT}etc/pvfs2/fs.conf" - if [[ -f "${f}" ]]; then - ewarn "Previous install detected." - ewarn "We're about to wipe out ${f} and replace it with" - ewarn "the file generated by running pvfs2-genconfig. If this is what" - ewarn "you want to do, hit any key to continue. Otherwise hit ctrl+C" - ewarn "to abort." - read s - fi - einfo "Creating unified configuration file" - [ ! -d "${ROOT}$(dirname "${f}")" ] && mkdir -p "${ROOT}$(dirname "${f}")" - "${ROOT}"usr/bin/pvfs2-genconfig "${f}" -} -- cgit v1.2.3-65-gdbad