build: revert arrow package dependency

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 996a904f6106cbc316cca85eee49d6b1db5c7bfb..b704da2a31f97af5ef1064c21aee83b960e8ada5 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -24,7 +24,6 @@
 %bcond_with zbd
 %bcond_with cmake_verbose_logging
 %bcond_without ceph_test_package
-%bcond_without arrow_parquet
 %ifarch s390
 %bcond_with tcmalloc
 %else
@@ -233,10 +232,6 @@ BuildRequires:     xfsprogs-devel
 BuildRequires: xmlstarlet
 BuildRequires: nasm
 BuildRequires: lua-devel
-%if 0%{with arrow_parquet}
-BuildRequires: arrow-devel >= 4.0.0
-BuildRequires: parquet-devel
-%endif
 %if 0%{with seastar} || 0%{with jaeger}
 BuildRequires:  yaml-cpp-devel >= 0.6
 %endif

diff --git a/debian/control b/debian/control
index 96c902e560a6d7a0e048284f5c972f39da6c7865..1ae4f171c6e7c048a41e0b168e581d24f567715f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -108,8 +108,6 @@ Build-Depends: automake,
                xmlstarlet <pkg.ceph.check>,
                nasm [amd64],
                zlib1g-dev,
-              libarrow-dev (>= 4.0.0),
-              libparquet-dev (>= 4.0.0),
 Standards-Version: 4.4.0
 
 Package: ceph

diff --git a/install-deps.sh b/install-deps.sh
index 717e478d600c4bb2dec759e1c30596134bf47660..6f4cd178fb98554640f3c831972b34762e411131 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -356,28 +356,12 @@ else
            build_profiles+=",pkg.ceph.jaeger"
        fi
 
-       if [ "$(arch)" == "x86_64" ]; then
-               ARCH="amd64"
-       elif [ "$(arch)" == "aarch64" ]; then
-               ARCH="arm64"
-       fi
-
-       if [ -z ${ARCH+x} ]; then
-               echo "WARNING: $(arch) is not yet a supported architecture.  Can't install arrow."
-       else
-               wget -qO - https://dist.apache.org/repos/dist/dev/arrow/KEYS | $SUDO apt-key add -
-               echo "deb [arch=$ARCH] https://apache.jfrog.io/artifactory/arrow/ubuntu $(lsb_release -sc) main" | $SUDO tee /etc/apt/sources.list.d/arrow.list
-               $SUDO apt update
-       fi
-
        $SUDO env DEBIAN_FRONTEND=noninteractive mk-build-deps \
              --build-profiles "${build_profiles#,}" \
              --install --remove \
              --tool="apt-get -y --no-install-recommends $backports" $control || exit 1
        $SUDO env DEBIAN_FRONTEND=noninteractive apt-get -y remove ceph-build-deps
        if [ "$control" != "debian/control" ] ; then rm $control; fi
-       $SUDO rm -f /etc/apt/sources.list.d/arrow.list
-
         ;;
     centos|fedora|rhel|ol|virtuozzo)
         builddepcmd="dnf -y builddep --allowerasing"