Skip to content

Commit

Permalink
tracing: pkg install from distro & vstart runtime setup
Browse files Browse the repository at this point in the history
- add packages that could be installed using distro package
	modified:   ceph.spec.in
	modified:   debian/control
- configure runtime path for finding jaeger dependencies in vstart.sh
        modified:   src/vstart.sh

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
  • Loading branch information
Deepika Upadhyay committed Apr 7, 2020
1 parent 7663acb commit c069c92
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
10 changes: 10 additions & 0 deletions ceph.spec.in
Expand Up @@ -127,6 +127,7 @@ Requires: ceph-mds = %{_epoch_prefix}%{version}-%{release}
Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
Requires: ceph-mon = %{_epoch_prefix}%{version}-%{release}
Requires(post): binutils
BuildRequires: bison
%if 0%{with cephfs_java}
BuildRequires: java-devel
BuildRequires: sharutils
Expand All @@ -143,6 +144,7 @@ BuildRequires: cmake > 3.5
%endif
BuildRequires: cryptsetup
BuildRequires: fuse-devel
BuildRequires: flex
%if 0%{?rhel} == 7
# devtoolset offers newer make and valgrind-devel, but the old ones are good
# enough.
Expand All @@ -157,13 +159,21 @@ BuildRequires: gperftools-devel >= 2.6.1
%endif
%if 0%{?suse_version}
BuildRequires: gperftools-devel >= 2.4
BuildRequires: git
%endif
%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: json-devel
%endif
%if 0%{?suse_version}
BuildRequires: nlohmann_json-devel
%endif
BuildRequires: leveldb-devel > 1.2
BuildRequires: libaio-devel
BuildRequires: libblkid-devel >= 2.17
BuildRequires: libcurl-devel
BuildRequires: libcap-ng-devel
BuildRequires: libevent-devel
BuildRequires: pkgconfig(libudev)
BuildRequires: libnl3-devel
BuildRequires: liboath-devel
Expand Down
7 changes: 6 additions & 1 deletion debian/control
Expand Up @@ -7,7 +7,9 @@ Vcs-Browser: https://github.com/ceph/ceph
Maintainer: Ceph Maintainers <ceph-maintainers@lists.ceph.com>
Uploaders: Ken Dreyer <kdreyer@redhat.com>,
Alfredo Deza <adeza@redhat.com>,
Build-Depends: cmake (>= 3.5),
Build-Depends: automake,
bison,
cmake (>= 3.5),
cpio,
cryptsetup-bin | cryptsetup,
cython,
Expand All @@ -17,6 +19,7 @@ Build-Depends: cmake (>= 3.5),
dh-exec,
dh-python,
dh-systemd,
flex,
git,
gperf,
g++ (>= 7),
Expand All @@ -32,6 +35,7 @@ Build-Depends: cmake (>= 3.5),
libcap-ng-dev,
libcunit1-dev,
libcurl4-openssl-dev,
libevent-dev,
libexpat1-dev,
libfuse-dev,
libgoogle-perftools-dev [i386 amd64 arm64],
Expand Down Expand Up @@ -65,6 +69,7 @@ Build-Depends: cmake (>= 3.5),
# Make-Check libxmlsec1-openssl,
# Make-Check libxmlsec1-dev,
lsb-release,
nlohmann-json-dev,
parted,
patch,
pkg-config,
Expand Down
6 changes: 4 additions & 2 deletions src/vstart.sh
Expand Up @@ -62,6 +62,7 @@ fi
if [ -n "$CEPH_BUILD_ROOT" ]; then
[ -z "$CEPH_BIN" ] && CEPH_BIN=$CEPH_BUILD_ROOT/bin
[ -z "$CEPH_LIB" ] && CEPH_LIB=$CEPH_BUILD_ROOT/lib
[ -z "$CEPH_EXT_LIB" ] && CEPH_EXT_LIB=$CEPH_BUILD_ROOT/external/lib
[ -z "$EC_PATH" ] && EC_PATH=$CEPH_LIB/erasure-code
[ -z "$OBJCLASS_PATH" ] && OBJCLASS_PATH=$CEPH_LIB/rados-classes
# make install should install python extensions into PYTHONPATH
Expand All @@ -72,6 +73,7 @@ elif [ -n "$CEPH_ROOT" ]; then
[ -z "$CEPH_ADM" ] && CEPH_ADM=$CEPH_BIN/ceph
[ -z "$INIT_CEPH" ] && INIT_CEPH=$CEPH_BIN/init-ceph
[ -z "$CEPH_LIB" ] && CEPH_LIB=$CEPH_BUILD_DIR/lib
[ -z "$CEPH_EXT_LIB" ] && CEPH_EXT_LIB=$CEPH_BUILD_DIR/external/lib
[ -z "$OBJCLASS_PATH" ] && OBJCLASS_PATH=$CEPH_LIB
[ -z "$EC_PATH" ] && EC_PATH=$CEPH_LIB
[ -z "$CEPH_PYTHON_COMMON" ] && CEPH_PYTHON_COMMON=$CEPH_ROOT/src/python-common
Expand All @@ -87,8 +89,8 @@ fi
CYTHON_PYTHONPATH="$CEPH_LIB/cython_modules/lib.3"
export PYTHONPATH=$PYBIND:$CYTHON_PYTHONPATH:$CEPH_PYTHON_COMMON$PYTHONPATH

export LD_LIBRARY_PATH=$CEPH_LIB:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=$CEPH_LIB:$DYLD_LIBRARY_PATH
export LD_LIBRARY_PATH=$CEPH_LIB:$CEPH_EXT_LIB:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=$CEPH_LIB:$CEPH_EXT_LIB:$DYLD_LIBRARY_PATH
# Suppress logging for regular use that indicated that we are using a
# development version. vstart.sh is only used during testing and
# development
Expand Down

0 comments on commit c069c92

Please sign in to comment.