From 9ffbf1a7d80b2f8fbd6a87130d3b127e7995dced Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jan 09 2023 10:53:45 +0000 Subject: Orphaned for 6+ weeks --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 01f4eb3..0000000 --- a/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/mesos-0.16.0-afe9947.tar.gz -/mesos-0.18.0-a411a4b.tar.gz -/mesos-0.18.2-453b973.tar.gz -/mesos-0.20.0-f421ffd.tar.gz -/mesos-0.21.0-ab8fa65.tar.gz -/mesos-0.22.0-c513126.tar.gz -/mesos-0.22.0-e890e24.tar.gz -/mesos-0.22.1-d6309f9.tar.gz -/mesos-0.23.0-4ce5475.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/disable-nvml-isolator.patch b/disable-nvml-isolator.patch deleted file mode 100644 index 41cab7e..0000000 --- a/disable-nvml-isolator.patch +++ /dev/null @@ -1,199 +0,0 @@ -diff -upNr mesos-1.8.1-vanilla/3rdparty/Makefile.am mesos-1.8.1/3rdparty/Makefile.am ---- mesos-1.8.1-vanilla/3rdparty/Makefile.am 2019-09-25 08:06:05.908901260 +0200 -+++ mesos-1.8.1/3rdparty/Makefile.am 2019-09-25 08:09:10.844387596 +0200 -@@ -381,10 +381,12 @@ $(LIBSECCOMP)-build-stamp: $(LIBSECCOMP) - ALL_LOCAL += $(LIB_LIBSECCOMP) - endif - -+if ENABLE_USE_NVML - if WITH_BUNDLED_NVML - $(NVML)/nvidia/gdk/nvml.h: $(NVML)-stamp - ALL_LOCAL += $(NVML)-stamp - endif -+endif - - if WITH_BUNDLED_PICOJSON - # Stout depends on . Install picojson.h into $PREFIX/include -diff -upNr mesos-1.8.1-vanilla/configure.ac mesos-1.8.1/configure.ac ---- mesos-1.8.1-vanilla/configure.ac 2019-09-25 08:06:05.909901274 +0200 -+++ mesos-1.8.1/configure.ac 2019-09-25 09:53:08.194845648 +0200 -@@ -268,6 +268,11 @@ AC_ARG_ENABLE([java], - [do not build Java bindings]), - [], [enable_java=yes]) - -+AC_ARG_ENABLE([use-nvml], -+ AS_HELP_STRING([--disable-use-nvml], -+ [do not use the NVML headers]), -+ [], [enable_use_nvml=yes]) -+ - # TODO(bevers): Eventually make this enabled by default. - AC_ARG_ENABLE([jemalloc-allocator], - AS_HELP_STRING([--enable-jemalloc-allocator], -@@ -1717,30 +1722,37 @@ AM_CONDITIONAL( - [ENABLE_LINUX_ROUTING], - [test "x$enable_network_ports_isolator" = "xyes" -o "x$enable_port_mapping_isolator" = "xyes"]) - -+AM_CONDITIONAL( -+ [ENABLE_USE_NVML], -+ [test "x$enable_use_nvml" = "xyes"]) -+ -+AM_COND_IF([ENABLE_USE_NVML], [AC_DEFINE([ENABLE_USE_NVML])]) - - # If the user has asked not to include the bundled NVML headers for - # Nvidia GPU support, check to see if the path to the NVML headers has - # been specified. If it has, make sure that the path is absolute. If - # everything is in order, add this path to the CPPFLAGS. --if test "x$without_bundled_nvml" = "xyes" || \ -- test "x$enable_bundled" != "xyes"; then -- if test -n "`echo $with_nvml`"; then -- if test "$with_nvml" = "${with_nvml#/}"; then -- AC_MSG_ERROR([The path passed to --with-nvml must be absolute.]) -- fi -- CPPFLAGS="-I${with_nvml} $CPPFLAGS" -- fi -+if test "x$enable_use_nvml" = "xyes"; then -+ if test "x$without_bundled_nvml" = "xyes" || \ -+ test "x$enable_bundled" != "xyes"; then -+ if test -n "`echo $with_nvml`"; then -+ if test "$with_nvml" = "${with_nvml#/}"; then -+ AC_MSG_ERROR([The path passed to --with-nvml must be absolute.]) -+ fi -+ CPPFLAGS="-I${with_nvml} $CPPFLAGS" -+ fi - -- AC_CHECK_HEADERS([nvidia/gdk/nvml.h], [], -+ AC_CHECK_HEADERS([nvidia/gdk/nvml.h], [], - [AC_MSG_ERROR([Cannot find the Nvidia NVML headers --------------------------------------------------------------------- --You have requested the use of a non-bundled NVML but no suitable --NVML headers could be found. Make sure these headers are either --installed on the system or the path passed via --with-nvml is correct. --------------------------------------------------------------------- -- ])]) --else -- with_bundled_nvml=yes -+ ------------------------------------------------------------------- -+ You have requested the use of a non-bundled NVML but no suitable -+ NVML headers could be found. Make sure these headers are either -+ installed on the system or the path passed via --with-nvml is correct. -+ ------------------------------------------------------------------- -+ ])]) -+ else -+ with_bundled_nvml=yes -+ fi - fi - - AM_CONDITIONAL([WITH_BUNDLED_NVML], -diff -upNr mesos-1.8.1-vanilla/src/Makefile.am mesos-1.8.1/src/Makefile.am ---- mesos-1.8.1-vanilla/src/Makefile.am 2019-07-10 18:31:21.066015412 +0200 -+++ mesos-1.8.1/src/Makefile.am 2019-09-25 09:27:32.364725665 +0200 -@@ -239,8 +239,10 @@ LIB_LIBSECCOMP = -lseccomp - endif - endif - --if WITH_BUNDLED_NVML --MESOS_CPPFLAGS += -I../$(NVML) -+if ENABLE_USE_NVML -+ if WITH_BUNDLED_NVML -+ MESOS_CPPFLAGS += -I../$(NVML) -+ endif - endif - - if WITH_BUNDLED_PICOJSON -diff -upNr mesos-1.8.1-vanilla/src/slave/containerizer/mesos/containerizer.cpp mesos-1.8.1/src/slave/containerizer/mesos/containerizer.cpp ---- mesos-1.8.1-vanilla/src/slave/containerizer/mesos/containerizer.cpp 2019-07-10 18:31:21.106015928 +0200 -+++ mesos-1.8.1/src/slave/containerizer/mesos/containerizer.cpp 2019-09-25 09:28:53.277789662 +0200 -@@ -103,7 +103,6 @@ - #include "slave/containerizer/mesos/isolators/docker/volume/isolator.hpp" - #include "slave/containerizer/mesos/isolators/filesystem/linux.hpp" - #include "slave/containerizer/mesos/isolators/filesystem/shared.hpp" --#include "slave/containerizer/mesos/isolators/gpu/nvidia.hpp" - #include "slave/containerizer/mesos/isolators/linux/capabilities.hpp" - #include "slave/containerizer/mesos/isolators/linux/devices.hpp" - #include "slave/containerizer/mesos/isolators/namespaces/ipc.hpp" -diff -upNr mesos-1.8.1-vanilla/src/slave/containerizer/mesos/isolators/gpu/nvml.cpp mesos-1.8.1/src/slave/containerizer/mesos/isolators/gpu/nvml.cpp ---- mesos-1.8.1-vanilla/src/slave/containerizer/mesos/isolators/gpu/nvml.cpp 2019-07-10 18:31:21.110015979 +0200 -+++ mesos-1.8.1/src/slave/containerizer/mesos/isolators/gpu/nvml.cpp 2019-09-25 09:31:45.561055131 +0200 -@@ -18,8 +18,6 @@ - - #include - --#include -- - #include - #include - -@@ -38,6 +36,14 @@ - - #include "slave/containerizer/mesos/isolators/gpu/nvml.hpp" - -+#ifndef ENABLE_USE_NVML -+ // We provide dummy types and variables in case we do not use the NVML headers. -+using nvmlReturn_t = int; -+constexpr bool NVML_SUCCESS = true; -+constexpr size_t NVML_SYSTEM_DRIVER_VERSION_BUFFER_SIZE = 1; -+constexpr nvmlReturn_t NVML_ERROR_INVALID_ARGUMENT{}; -+#endif // ENABLE_USE_NVML -+ - using process::Once; - - using std::map; -@@ -153,6 +159,10 @@ Try initialize() - - bool isAvailable() - { -+#ifndef ENABLE_USE_NVML -+ return false; -+#endif // ENABLE_USE_NVML -+ - // Unfortunately, there is no function available in `glibc` to check - // if a dynamic library is available to open with `dlopen()`. - // Instead, availability is determined by attempting to open a -diff -upNr mesos-1.8.1-vanilla/src/slave/containerizer/mesos/isolators/gpu/nvml.hpp mesos-1.8.1/src/slave/containerizer/mesos/isolators/gpu/nvml.hpp ---- mesos-1.8.1-vanilla/src/slave/containerizer/mesos/isolators/gpu/nvml.hpp 2019-07-10 18:31:21.110015979 +0200 -+++ mesos-1.8.1/src/slave/containerizer/mesos/isolators/gpu/nvml.hpp 2019-09-25 09:30:02.536700392 +0200 -@@ -17,7 +17,12 @@ - #ifndef __NVIDIA_NVML_HPP__ - #define __NVIDIA_NVML_HPP__ - --#include -+#ifdef ENABLE_USE_NVML -+ #include -+#else -+ // We provide dummy types in case we do not use the NVML headers. -+ using nvmlDevice_t = int; -+#endif // ENABLE_USE_NVML - - #include - -diff -upNr mesos-1.8.1-vanilla/src/tests/environment.cpp mesos-1.8.1/src/tests/environment.cpp ---- mesos-1.8.1-vanilla/src/tests/environment.cpp 2019-07-10 18:31:21.134016289 +0200 -+++ mesos-1.8.1/src/tests/environment.cpp 2019-09-25 09:34:03.386867517 +0200 -@@ -259,7 +259,19 @@ class NvidiaGpuFilter : public TestFilte - public: - NvidiaGpuFilter() - { -+#ifndef ENABLE_USE_NVML -+ nvidiaGpuError = true; -+ -+ std::cerr -+ << "-------------------------------------------------------------\n" -+ << "Linking against libnvml is disabled so\n" -+ << " no Nvidia GPU tests will be run\n" -+ << "-------------------------------------------------------------" -+ << std::endl; -+#else -+ - nvidiaGpuError = os::which("nvidia-smi").isNone(); -+ - if (nvidiaGpuError) { - std::cerr - << "-------------------------------------------------------------\n" -@@ -267,6 +279,7 @@ public: - << "-------------------------------------------------------------" - << std::endl; - } -+#endif // ENABLE_USE_NVML - } - - bool disable(const ::testing::TestInfo* test) const override diff --git a/mesos b/mesos deleted file mode 100644 index 2deb46e..0000000 --- a/mesos +++ /dev/null @@ -1,2 +0,0 @@ -LOGS=/var/log/mesos -ULIMIT="-n 16384" diff --git a/mesos-generate-tarball.sh b/mesos-generate-tarball.sh deleted file mode 100644 index 600e8cc..0000000 --- a/mesos-generate-tarball.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -usage() { - echo "Usage: $0 x.y.v" - exit 1 -} - -[[ $# -ne 1 ]] && usage - -VERSION=$1 - -tar -xzf mesos-$VERSION.tar.gz -rm -fv mesos-$VERSION/3rdparty/nvml-*.tar.gz - -tar -czf mesos-$VERSION-clean.tar.gz mesos-$VERSION -rm -f mesos-$VERSION.tar.gz - -echo "created mesos-$VERSION-clean.tar.gz file" diff --git a/mesos-init-wrapper b/mesos-init-wrapper deleted file mode 100755 index 1ec1921..0000000 --- a/mesos-init-wrapper +++ /dev/null @@ -1,177 +0,0 @@ -#!/bin/bash -set -o errexit -o nounset -o pipefail -function -h { -cat < /etc/mesos-agent/port - - To set the switch user flag: - - touch /etc/mesos-agent/?switch_user - - To explicitly disable it: - - touch /etc/mesos-agent/?no-switch_user - - Adding attributes and resources to the agents is slightly more granular. - Although you can pass them all at once with files called 'attributes' and - 'resources', you can also set them by creating files under directories - labeled 'attributes' or 'resources': - - echo north-west > /etc/mesos-agent/attributes/rack - - This is intended to allow easy addition and removal of attributes and - resources from the agent configuration. - -USAGE -}; function --help { -h ;} # A nice way to handle -h and --help -export LC_ALL=en_US.UTF-8 # A locale that works consistently - -function main { - err "Please use \`master' or \`agent'." -} - -function agent { - local etc_agent=/etc/mesos-agent - local args=() - local attributes=() - local resources=() - # Call mesosphere-dnsconfig if present on the system to generate config files. - [ -x /usr/bin/mesosphere-dnsconfig ] && mesosphere-dnsconfig -write -service=mesos-agent - set -o allexport - [[ ! -f /etc/default/mesos ]] || . /etc/default/mesos - [[ ! -f /etc/default/mesos-agent ]] || . /etc/default/mesos-agent - set +o allexport - [[ ! ${ULIMIT:-} ]] || ulimit $ULIMIT - [[ ! ${MASTER:-} ]] || args+=( --master="$MASTER" ) - [[ ! ${IP:-} ]] || args+=( --ip="$IP" ) - [[ ! ${LOGS:-} ]] || args+=( --log_dir="$LOGS" ) - [[ ! ${ISOLATION:-} ]] || args+=( --isolation="$ISOLATION" ) - for f in "$etc_agent"/* # attributes ip resources isolation &al. - do - if [[ -f $f ]] - then - local name="$(basename "$f")" - if [[ $name == '?'* ]] # Recognize flags (options without values) - then args+=( --"${name#'?'}" ) - else args+=( --"$name"="$(cat "$f")" ) - fi - fi - done - # We allow the great multitude of attributes and resources to be specified - # in directories, where the filename is the key and the contents its value. - for f in "$etc_agent"/attributes/* - do [[ ! -s $f ]] || attributes+=( "$(basename "$f")":"$(cat "$f")" ) - done - if [[ ${#attributes[@]} -gt 0 ]] - then - local formatted="$(printf ';%s' "${attributes[@]}")" - args+=( --attributes="${formatted:1}" ) # NB: Leading ';' is clipped - fi - for f in "$etc_agent"/resources/* - do [[ ! -s $f ]] || resources+=( "$(basename "$f")":"$(cat "$f")" ) - done - if [[ ${#resources[@]} -gt 0 ]] - then - local formatted="$(printf ';%s' "${resources[@]}")" - args+=( --resources="${formatted:1}" ) # NB: Leading ';' is clipped - fi - - if [[ "${args[@]:-}" == *'--no-logger'* ]] - then - local clean_args=() - for i in "${args[@]}"; do - if [[ "${i}" != "--no-logger" ]]; then - clean_args+=( "${i}" ) - fi - done - exec /usr/sbin/mesos-agent "${clean_args[@]}" - else - logged /usr/sbin/mesos-agent "${args[@]:-}" - fi -} - -function master { - local etc_master=/etc/mesos-master - local args=() - # Call mesosphere-dnsconfig if present on the system to generate config files. - [ -x /usr/bin/mesosphere-dnsconfig ] && mesosphere-dnsconfig -write -service=mesos-master - set -o allexport - [[ ! -f /etc/default/mesos ]] || . /etc/default/mesos - [[ ! -f /etc/default/mesos-master ]] || . /etc/default/mesos-master - set +o allexport - [[ ! ${ULIMIT:-} ]] || ulimit $ULIMIT - [[ ! ${ZK:-} ]] || args+=( --zk="$ZK" ) - [[ ! ${IP:-} ]] || args+=( --ip="$IP" ) - [[ ! ${PORT:-} ]] || args+=( --port="$PORT" ) - [[ ! ${CLUSTER:-} ]] || args+=( --cluster="$CLUSTER" ) - [[ ! ${LOGS:-} ]] || args+=( --log_dir="$LOGS" ) - for f in "$etc_master"/* # cluster log_dir port &al. - do - if [[ -f $f ]] - then - local name="$(basename "$f")" - if [[ $name == '?'* ]] # Recognize flags (options without values) - then args+=( --"${name#'?'}" ) - else args+=( --"$name"="$(cat "$f")" ) - fi - fi - done - - if [[ "${args[@]:-}" == *'--no-logger'* ]] - then - local clean_args=() - for i in "${args[@]}"; do - if [[ "${i}" != "--no-logger" ]]; then - clean_args+=( "${i}" ) - fi - done - exec /usr/sbin/mesos-master "${clean_args[@]}" - else - logged /usr/sbin/mesos-master "${args[@]:-}" - fi -} - -# Send all output to syslog and tag with PID and executable basename. -function logged { - local tag="${1##*/}[$$]" - exec 1> >(exec logger -p user.info -t "$tag") - exec 2> >(exec logger -p user.err -t "$tag") - exec "$@" -} - -function msg { out "$*" >&2 ;} -function err { local x=$? ; msg "$*" ; return $(( $x == 0 ? 1 : $x )) ;} -function out { printf '%s\n' "$*" ;} - -if [[ ${1:-} ]] && declare -F | cut -d' ' -f3 | fgrep -qx -- "${1:-}" -then "$@" -else main "$@" -fi diff --git a/mesos-master b/mesos-master deleted file mode 100644 index 37726ce..0000000 --- a/mesos-master +++ /dev/null @@ -1,2 +0,0 @@ -PORT=5050 -ZK=`cat /etc/mesos/zk` diff --git a/mesos-master.service b/mesos-master.service deleted file mode 100644 index 1f7a946..0000000 --- a/mesos-master.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Apache Mesos Master Daemon -Documentation=http://mesos.apache.org/documentation/latest/configuration/ -After=network.target -Wants=network.target - -[Service] -ExecStart=/usr/bin/mesos-init-wrapper master -Restart=always -RestartSec=20 -LimitNOFILE=16384 - -[Install] -WantedBy=multi-user.target diff --git a/mesos-slave b/mesos-slave deleted file mode 100644 index 326d90d..0000000 --- a/mesos-slave +++ /dev/null @@ -1 +0,0 @@ -MASTER=`cat /etc/mesos/zk` diff --git a/mesos-slave.service b/mesos-slave.service deleted file mode 100644 index 1b3070c..0000000 --- a/mesos-slave.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Apache Mesos Agent Daemon -Documentation=http://mesos.apache.org/documentation/latest/configuration/ -After=network.target -Wants=network.target - -[Service] -ExecStart=/usr/bin/mesos-init-wrapper agent -KillMode=process -Restart=always -RestartSec=20 -LimitNOFILE=16384 -CPUAccounting=true -MemoryAccounting=true - -[Install] -WantedBy=multi-user.target diff --git a/mesos-tmpfiles.conf b/mesos-tmpfiles.conf deleted file mode 100644 index 2d444e0..0000000 --- a/mesos-tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/run/mesos 0775 mesos mesos - diff --git a/mesos.spec b/mesos.spec deleted file mode 100644 index 87e1035..0000000 --- a/mesos.spec +++ /dev/null @@ -1,301 +0,0 @@ -%global skiptests 1 -%global mesos_user mesos -%global mesos_group mesos - -Name: mesos -Version: 1.8.1 -Release: 11%{?dist} -Summary: Cluster manager for sharing distributed application frameworks -# The entire source code is ASL 2.0 except: -# - ConcurrentQueue: Dual licensed with BSD License (two clause) and -# Boost Software License Version 1.0. -# - GoogleTest: BSD License (no advertising) -License: ASL 2.0 and BSD and Boost -URL: http://mesos.apache.org/ - -ExclusiveArch: x86_64 - -Source0: %{name}-%{version}-clean.tar.gz -# The upstream Apache Mesos source release -# https://dist.apache.org/repos/dist/release/mesos//mesos-.tar.gz -# contains non-free code that we cannot ship. Therefore we use -# this script to remove the non-free code before shipping it. -# Download the upstream tarball and invoke this script while in the -# tarball's directory: -# Usage: sh mesos-generate-tarball.sh MAJOR.MINOR.PATCH -# Usage example: sh mesos-generate-tarball.sh 1.8.1 -Source1: %{name}-tmpfiles.conf -Source2: %{name}-master.service -Source3: %{name}-slave.service -Source4: %{name}-master -Source5: %{name}-slave -Source6: %{name} -Source7: %{name}-init-wrapper -Source8: mesos-generate-tarball.sh - -Patch0: nobundled-integ.patch -Patch1: disable-nvml-isolator.patch - -BuildRequires: make -BuildRequires: apache-resource-bundles -BuildRequires: apr-devel -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: boost-devel -BuildRequires: codehaus-parent -BuildRequires: cyrus-sasl-devel -BuildRequires: cyrus-sasl-md5 -BuildRequires: elfio-devel -BuildRequires: exec-maven-plugin -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: gflags-devel -BuildRequires: glog-devel -BuildRequires: gmock-devel -BuildRequires: grpc-devel -BuildRequires: grpc-plugins -BuildRequires: gtest-devel -BuildRequires: http-parser-devel -BuildRequires: java-devel -BuildRequires: leveldb-devel -BuildRequires: libarchive-devel -BuildRequires: libcurl-devel -BuildRequires: libev-devel -BuildRequires: libevent-devel -BuildRequires: libev-source -BuildRequires: libtool -BuildRequires: maven-clean-plugin -BuildRequires: maven-dependency-plugin -BuildRequires: maven-local -BuildRequires: maven-plugin-build-helper -BuildRequires: maven-plugin-bundle -BuildRequires: maven-remote-resources-plugin -BuildRequires: maven-shade-plugin -BuildRequires: maven-source-plugin -BuildRequires: maven-wagon -BuildRequires: mojo-parent -BuildRequires: openssl-devel -BuildRequires: picojson-devel -BuildRequires: protobuf-devel -BuildRequires: protobuf-java -BuildRequires: python3-devel -BuildRequires: rapidjson-devel -BuildRequires: subversion-devel -BuildRequires: systemd -BuildRequires: systemd-rpm-macros -BuildRequires: which -BuildRequires: xfsprogs-devel -BuildRequires: zlib-devel -BuildRequires: zookeeper-devel - -Requires: cyrus-sasl-md5 -Requires: docker -Requires: ntpdate - -Requires(pre): shadow-utils - -# https://github.com/cameron314/concurrentqueue -Provides: bundled(concurrentqueue) = 7b69a8f -# Container Storage Interface (CSI) Specification -# https://github.com/container-storage-interface/spec/releases -Provides: bundled(csi-spec) = 1.1.0 - -%description -Apache Mesos is a cluster manager that provides efficient resource isolation and -sharing across distributed applications, or frameworks. It can run Hadoop, MPI, -Hypertable, Spark, and other applications on a dynamically shared pool of nodes. - -%package -n mesos-devel -Summary: Mesos developer package -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description -n mesos-devel -This package provides files for developing Apache Mesos frameworks/modules. - -%prep -%autosetup -p1 - -# - Google Test is used in build time for testing. This library is not bundled -# in this package. -# - Nvidia GPU deployment kit nvml.h header file. Not bundled in this package -# only for building time. - -cd 3rdparty -tar xzf concurrentqueue-7b69a8f.tar.gz -tar xzf googletest-release-1.8.0.tar.gz -cd .. - -%build -export MAVEN_HOME=/usr/share/xmvn -%pom_remove_plugin :maven-gpg-plugin src/java/mesos.pom.in - -autoreconf -vfi -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/src/.libs:`pwd`/3rdparty/libprocess/ -%configure \ - --disable-bundled \ - --with-concurrentqueue=${PWD}/3rdparty/concurrentqueue-7b69a8f \ - --with-gmock=${PWD}/3rdparty/googletest-release-1.8.0/googlemock \ - --with-libprocess=${PWD}/3rdparty/libprocess/include \ - --with-stout=${PWD}/3rdparty/stout/include \ - --with-nvml=${PWD}/3rdparty/nvml-352.79 \ - --enable-optimize \ - --enable-install-module-dependencies \ - --enable-launcher-sealing \ - --enable-libevent \ - --enable-ssl \ - --enable-hardening \ - --disable-use-nvml \ - --disable-python - -# Python build will be enabled when is ready this issue: -# https://issues.apache.org/jira/browse/MESOS-8882 - -%make_build V=1 - -%check -# Skipping tests, possible mock issues -%if ! %skiptests - export LD_LIBRARY_PATH=`pwd`/src/.libs - make check -%endif - -%install - -%make_install -# fedora guidelines no .a|.la -find %{buildroot} -name '*.a' -o -name '*.la' -delete - -# Remove help scripts based on Python2 -rm -f %{buildroot}%{_bindir}/mesos-cat -rm -f %{buildroot}%{_bindir}/mesos-ps -rm -f %{buildroot}%{_bindir}/mesos-scp -rm -f %{buildroot}%{_bindir}/mesos-tail - -mkdir -p -m0755 %{buildroot}%{_bindir} -mkdir -p -m0755 %{buildroot}%{_sysconfdir}/default -mkdir -p -m0755 %{buildroot}%{_sysconfdir}/%{name} -mkdir -p -m0755 %{buildroot}%{_sysconfdir}/%{name}-master -mkdir -p -m0755 %{buildroot}%{_sysconfdir}/%{name}-agent -mkdir -p -m0755 %{buildroot}%{_tmpfilesdir} -mkdir -p -m0755 %{buildroot}/%{_localstatedir}/log/%{name} -mkdir -p -m0755 %{buildroot}/%{_sharedstatedir}/%{name} -mkdir -p -m0755 %{buildroot}%{_unitdir}/ -mkdir -p -m0755 %{buildroot}%{_datadir}/java - -echo zk://localhost:2181/mesos > %{buildroot}%{_sysconfdir}/mesos/zk -echo %{_var}/lib/%{name} > %{buildroot}%{_sysconfdir}/mesos-master/work_dir -echo %{_var}/lib/%{name} > %{buildroot}%{_sysconfdir}/mesos-agent/work_dir -echo 1 > %{buildroot}%{_sysconfdir}/mesos-master/quorum - -install -p -m 0755 %{SOURCE7} %{buildroot}%{_bindir}/ -install -p -m 0644 %{SOURCE4} %{SOURCE5} %{SOURCE6} %{buildroot}%{_sysconfdir}/default -install -p -m 0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf -install -p -m 0644 %{SOURCE2} %{SOURCE3} %{buildroot}%{_unitdir}/ -install -p -m 0644 src/java/target/mesos-*.jar %{buildroot}%{_datadir}/java/ - -make clean -mkdir -p %{buildroot}%{_datadir}/%{name} -cp -raf src/examples/ %{buildroot}%{_datadir}/%{name} - -# Remove examples based on Python2 -find %{buildroot} -name '*.py' -delete - -# Some files got mangling shebang, we fix them after everything else is done -for i in $(find %{buildroot} -type f -exec grep -Iq . {} \; -print);do - for j in $(grep -l '^#!/usr/bin/env bash' $i);do - pathfix.py -pni "/usr/bin/bash" $j - done -done - -# remove shebang as in other template files. -sed -i 1d %{buildroot}/%{_sysconfdir}/%{name}/mesos-deploy-env.sh.template - -# remove zero length files -find %{buildroot} -size 0 -delete - -# remove build time templates -find %{buildroot} -name '*.in' -delete - -%files -%license LICENSE -%doc NOTICE -%{_libdir}/*.so -%{_libdir}/%{name}/modules/*.so -%{_bindir}/mesos* -%{_sbindir}/mesos-* -%{_datadir}/%{name}/ -%exclude %{_datadir}/%{name}/examples -%{_libexecdir}/%{name}/ -%{_tmpfilesdir}/%{name}.conf -%attr(0755,%{mesos_user},%{mesos_group}) %{_var}/log/%{name}/ -%attr(0755,%{mesos_user},%{mesos_group}) %{_var}/lib/%{name}/ -%config(noreplace) %{_sysconfdir}/%{name}* -%config(noreplace) %{_sysconfdir}/default/%{name}* -%{_unitdir}/%{name}*.service - -%files devel -%{_includedir}/%{name} -%{_includedir}/stout -%{_includedir}/process -%{_includedir}/csi -%{_libdir}/pkgconfig/%{name}.pc -%{_datadir}/java/%{name}-*.jar -%{_datadir}/%{name}/examples/* - -%pre -getent group %{mesos_group} >/dev/null || groupadd -r %{mesos_group} -getent passwd %{mesos_user} >/dev/null || \ - useradd -r -g %{mesos_group} -d %{_sharedstatedir}/%{name} -s /sbin/nologin \ - -c "%{name} daemon account" %{mesos_user} -exit 0 - -%post -%systemd_post %{name}-slave.service %{name}-master.service - -%preun -%systemd_preun %{name}-slave.service %{name}-master.service - -%postun -%systemd_postun_with_restart %{name}-slave.service %{name}-master.service - -%changelog -* Thu Jul 21 2022 Fedora Release Engineering - 1.8.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1.8.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.8.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.8.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1.8.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 1.8.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Sep 27 2019 Javi Roman - 1.8.1-5 -- Properly named mesos-generate-tarball ouput, and updated comment - for noticing non-free code. - -* Thu Sep 26 2019 Javi Roman - 1.8.1-4 -- Patent code sanity clean up with mesos-generate-tarball.sh helper - -* Wed Sep 25 2019 Javi Roman - 1.8.1-3 -- Disable nvml.h usage according MESOS-9978 - -* Tue Sep 24 2019 Javi Roman - 1.8.1-2 -- Remove obsolete maven plugins: site and pgp - -* Sat Sep 21 2019 Javi Roman - 1.8.1-1 -- Rebuilt for latest release, and rebooting the package with Apache Mesos - Release based on ASF's official release infrastructure. - -* Thu Feb 08 2018 Fedora Release Engineering - 0.23.0-0.4ce5475.11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Jan 20 2018 Björn Esser - 0.23.0-0.4ce5475.10 -- Rebuilt for switch to libxcrypt diff --git a/nobundled-integ.patch b/nobundled-integ.patch deleted file mode 100644 index 76bd623..0000000 --- a/nobundled-integ.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -upNr mesos-1.8.1-vanilla/3rdparty/Makefile.am mesos-1.8.1/3rdparty/Makefile.am ---- mesos-1.8.1-vanilla/3rdparty/Makefile.am 2019-07-10 18:31:20.842012525 +0200 -+++ mesos-1.8.1/3rdparty/Makefile.am 2019-09-02 17:14:10.697199843 +0200 -@@ -609,10 +609,6 @@ $(ZOOKEEPER)/src/c/libzookeeper_mt.la: $ - $(MAKE) $(AM_MAKEFLAGS) - - ALL_LOCAL += $(ZOOKEEPER)/src/c/libzookeeper_mt.la --else --# No matter what, we need to extract ZooKeeper so that we can run --# 'make check' (some of our tests need the ZooKeeper JAR). --ALL_LOCAL += $(ZOOKEEPER)-stamp - endif - - all-local: $(ALL_LOCAL) -diff -upNr mesos-1.8.1-vanilla/configure.ac mesos-1.8.1/configure.ac ---- mesos-1.8.1-vanilla/configure.ac 2019-07-10 18:31:21.022014845 +0200 -+++ mesos-1.8.1/configure.ac 2019-09-02 17:14:10.698199857 +0200 -@@ -1027,7 +1027,7 @@ if test "x$without_bundled_elfio" = "xye - CPPFLAGS="-I${with_elfio} $CPPFLAGS" - fi - -- AC_CHECK_HEADERS([elfio/elfio.h], [], -+ AC_CHECK_HEADERS([elfio/elfio.hpp], [], - [AC_MSG_ERROR([Cannot find the ELFIO headers - ------------------------------------------------------------------- - You have requested the use of a non-bundled ELFIO but no suitable -@@ -1587,6 +1587,8 @@ AM_CONDITIONAL([WITH_BUNDLED_LIBARCHIVE] - if test "x$without_bundled_libprocess" = "xyes" || \ - test "x$enable_bundled" != "xyes"; then - # Check if headers and library were located. -+ CPPFLAGS="$CPPFLAGS -I${with_libprocess} -I${with_stout}" -+ LDFLAGS="$LDFLAGS -L${with_libprocess}/../../../build/3rdparty/libprocess" - AC_CHECK_HEADERS([process/process.hpp], [found_libprocess=yes]) - - if test "x$found_libprocess" = "xyes"; then diff --git a/sources b/sources deleted file mode 100644 index bca9dde..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -8607f326732ed03f23ada06dcd393e4b88940a6af87b793b1c5a76645f8c6ba1f0bb3ce1cc765643056d84fe9e82501a4f2a752cbc37ee401e9ff14ded35b18f mesos-1.8.1-clean.tar.gz