This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 20c5c6c ARROW-10814: [Packaging][deb] Remove support for Debian
GNU/Linux Stretch
20c5c6c is described below
commit 20c5c6cb9f760bbb23e335c986aadcd9c9f09181
Author: Sutou Kouhei <[email protected]>
AuthorDate: Sun Dec 6 15:05:05 2020 +0900
ARROW-10814: [Packaging][deb] Remove support for Debian GNU/Linux Stretch
It reached EOL at 2020-07-06.
See also: https://wiki.debian.org/DebianReleases
Closes #8841 from kou/packaging-apt-remove-debian-stretch
Authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
---
dev/release/verify-apt.sh | 17 +--
dev/release/verify-release-candidate.sh | 8 +-
.../apt/debian-stretch/Dockerfile | 41 -------
.../apache-arrow/apt/debian-buster-arm64/from | 18 ---
.../apache-arrow/apt/debian-buster/Dockerfile | 85 --------------
.../apt/debian-buster/qemu-dummy-static | 33 ------
dev/tasks/linux-packages/apache-arrow/debian/rules | 7 +-
dev/tasks/linux-packages/package-task.rb | 2 -
dev/tasks/tasks.yml | 128 ---------------------
9 files changed, 6 insertions(+), 333 deletions(-)
diff --git a/dev/release/verify-apt.sh b/dev/release/verify-apt.sh
index 0d54642..2719a84 100755
--- a/dev/release/verify-apt.sh
+++ b/dev/release/verify-apt.sh
@@ -49,18 +49,8 @@ if [ "${IS_RC}" = "yes" ]; then
fi
have_flight=yes
-have_gandiva=yes
have_plasma=yes
case "${distribution}-${code_name}" in
- debian-stretch)
- sed \
- -i"" \
- -e "s/ main$/ main contrib non-free/g" \
- /etc/apt/sources.list
- cat <<APT_LINE > /etc/apt/sources.list.d/backports.list
-deb http://deb.debian.org/debian ${code_name}-backports main
-APT_LINE
- ;;
debian-buster)
sed \
-i"" \
@@ -72,7 +62,6 @@ APT_LINE
;;
esac
if [ "$(arch)" = "aarch64" ]; then
- have_gandiva=no
have_plasma=no
fi
@@ -127,10 +116,8 @@ if [ "${have_plasma}" = "yes" ]; then
apt install -y -V plasma-store-server=${deb_version}
fi
-if [ "${have_gandiva}" = "yes" ]; then
- apt install -y -V libgandiva-glib-dev=${deb_version}
- apt install -y -V libgandiva-glib-doc=${deb_version}
-fi
+apt install -y -V libgandiva-glib-dev=${deb_version}
+apt install -y -V libgandiva-glib-doc=${deb_version}
apt install -y -V libparquet-glib-dev=${deb_version}
apt install -y -V libparquet-glib-doc=${deb_version}
diff --git a/dev/release/verify-release-candidate.sh
b/dev/release/verify-release-candidate.sh
index 295ebde..1bc5a2a 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -135,9 +135,7 @@ test_binary() {
}
test_apt() {
- for target in "debian:stretch" \
- "arm64v8/debian:stretch" \
- "debian:buster" \
+ for target in "debian:buster" \
"arm64v8/debian:buster" \
"ubuntu:xenial" \
"arm64v8/ubuntu:xenial" \
@@ -154,7 +152,7 @@ test_apt() {
fi
;;
esac
- if ! docker run -v "${SOURCE_DIR}"/../..:/arrow:delegated \
+ if ! docker run --rm -v "${SOURCE_DIR}"/../..:/arrow:delegated \
"${target}" \
/arrow/dev/release/verify-apt.sh \
"${VERSION}" \
@@ -180,7 +178,7 @@ test_yum() {
fi
;;
esac
- if ! docker run -v "${SOURCE_DIR}"/../..:/arrow:delegated \
+ if ! docker run --rm -v "${SOURCE_DIR}"/../..:/arrow:delegated \
"${target}" \
/arrow/dev/release/verify-yum.sh \
"${VERSION}" \
diff --git
a/dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/debian-stretch/Dockerfile
b/dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/debian-stretch/Dockerfile
deleted file mode 100644
index 2d9d8ca..0000000
---
a/dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/debian-stretch/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-FROM debian:stretch
-
-RUN \
- echo "debconf debconf/frontend select Noninteractive" | \
- debconf-set-selections
-
-RUN \
- echo 'APT::Install-Recommends "false";' > \
- /etc/apt/apt.conf.d/disable-install-recommends
-
-ARG DEBUG
-
-RUN \
- quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \
- apt update ${quiet} && \
- apt install -y -V ${quiet} \
- build-essential \
- debhelper \
- devscripts \
- fakeroot \
- gnupg \
- lsb-release && \
- apt clean && \
- rm -rf /var/lib/apt/lists/*
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-buster-arm64/from
b/dev/tasks/linux-packages/apache-arrow/apt/debian-buster-arm64/from
deleted file mode 100644
index 8da222b..0000000
--- a/dev/tasks/linux-packages/apache-arrow/apt/debian-buster-arm64/from
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-arm64v8/debian:buster
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile
b/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile
deleted file mode 100644
index c6268f6..0000000
--- a/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile
+++ /dev/null
@@ -1,85 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-ARG FROM=debian:buster
-FROM ${FROM}
-
-COPY qemu-* /usr/bin/
-
-RUN \
- echo "debconf debconf/frontend select Noninteractive" | \
- debconf-set-selections
-
-RUN \
- echo 'APT::Install-Recommends "false";' > \
- /etc/apt/apt.conf.d/disable-install-recommends
-
-RUN sed -i'' -e 's/main$/main contrib non-free/g' /etc/apt/sources.list
-
-RUN \
- echo "deb http://deb.debian.org/debian buster-backports main" > \
- /etc/apt/sources.list.d/backports.list
-
-ARG DEBUG
-RUN \
- quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \
- apt update ${quiet} && \
- apt install -y -V ${quiet} \
- build-essential \
- cmake \
- debhelper \
- devscripts \
- git \
- gtk-doc-tools \
- libboost-filesystem-dev \
- libboost-regex-dev \
- libboost-system-dev \
- libbrotli-dev \
- libbz2-dev \
- libc-ares-dev \
- libcurl4-openssl-dev \
- libgirepository1.0-dev \
- libglib2.0-doc \
- libgmock-dev \
- libgoogle-glog-dev \
- libgtest-dev \
- liblz4-dev \
- libre2-dev \
- libsnappy-dev \
- libssl-dev \
- libthrift-dev \
- libutf8proc-dev \
- libzstd-dev \
- lsb-release \
- ninja-build \
- pkg-config \
- python3-dev \
- python3-numpy \
- python3-pip \
- rapidjson-dev \
- tzdata \
- zlib1g-dev && \
- apt install -y -V -t buster-backports ${quiet} \
- clang-8 \
- llvm-8-dev && \
- if apt list | grep '^nvidia-cuda-toolkit/'; then \
- apt install -y -V ${quiet} nvidia-cuda-toolkit; \
- fi && \
- pip3 install --upgrade meson && \
- ln -s /usr/local/bin/meson /usr/bin/ && \
- apt clean && \
- rm -rf /var/lib/apt/lists/*
diff --git
a/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/qemu-dummy-static
b/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/qemu-dummy-static
deleted file mode 100755
index c42e096..0000000
--- a/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/qemu-dummy-static
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Do nothing. This exists only for not requiring qemu-aarch64-static copy.
-# Recent Debian (buster or later) and Ubuntu (18.10 or later) on amd64 hosts or
-# arm64 host don't require qemu-aarch64-static in Docker image. But old Debian
-# and Ubuntu hosts on amd64 require qemu-aarch64-static in Docker image.
-#
-# We use "COPY qemu* /usr/bin/" in Dockerfile. If we don't put any "qemnu*",
-# the "COPY" is failed. It means that we always require "qemu*" even if we
-# use recent Debian/Ubuntu or arm64 host. If we have this dummy "qemu*" file,
-# the "COPY" isn't failed. It means that we can copy "qemu*" only when we
-# need.
-#
-# See also "script" in dev/tasks/linux-packages/azure.linux.arm64.yml.
-# Azure Pipelines uses old Ubuntu (18.04).
-# So we need to put "qemu-aarch64-static" into this directory.
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/rules
b/dev/tasks/linux-packages/apache-arrow/debian/rules
index 4a3ae3f..94e113e 100755
--- a/dev/tasks/linux-packages/apache-arrow/debian/rules
+++ b/dev/tasks/linux-packages/apache-arrow/debian/rules
@@ -21,11 +21,6 @@ override_dh_auto_configure:
ARROW_CUDA=OFF; \
ARROW_PLASMA=OFF; \
fi; \
- if dpkg -l | grep -q clang-; then \
- ARROW_GANDIVA=ON; \
- else \
- ARROW_GANDIVA=OFF; \
- fi; \
dh_auto_configure \
--sourcedirectory=cpp \
--builddirectory=cpp_build \
@@ -33,7 +28,7 @@ override_dh_auto_configure:
-- \
-DARROW_CUDA=$${ARROW_CUDA} \
-DARROW_FLIGHT=ON \
- -DARROW_GANDIVA=$${ARROW_GANDIVA} \
+ -DARROW_GANDIVA=ON \
-DARROW_GANDIVA_JAVA=OFF \
-DARROW_ORC=ON \
-DARROW_PARQUET=ON \
diff --git a/dev/tasks/linux-packages/package-task.rb
b/dev/tasks/linux-packages/package-task.rb
index 712a690..0413ede 100644
--- a/dev/tasks/linux-packages/package-task.rb
+++ b/dev/tasks/linux-packages/package-task.rb
@@ -231,8 +231,6 @@ class PackageTask
# Disable arm64 targets by default for now
# because they require some setups on host.
[
- "debian-stretch",
- # "debian-stretch-arm64",
"debian-buster",
# "debian-stretch-arm64",
"ubuntu-xenial",
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 41477ba..0c80ea0 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -514,134 +514,6 @@ tasks:
############################## Linux PKGS
####################################
- debian-stretch-amd64:
- ci: github
- template: linux-packages/github.linux.amd64.yml
- params:
- build_task: "apt:build"
- target: "debian-stretch"
- upload_extensions:
- - .ddeb
- - .deb
- - .debian.tar.xz
- - .dsc
- - .orig.tar.gz
- artifacts:
- - apache-arrow-archive-keyring_{no_rc_version}-1.debian.tar.xz
- - apache-arrow-archive-keyring_{no_rc_version}-1.dsc
- - apache-arrow-archive-keyring_{no_rc_version}-1_all.deb
- - apache-arrow-archive-keyring_{no_rc_version}.orig.tar.gz
- - apache-arrow_{no_rc_version}-1.debian.tar.xz
- - apache-arrow_{no_rc_version}-1.dsc
- - apache-arrow_{no_rc_version}.orig.tar.gz
- - gir1.2-arrow-1.0_{no_rc_version}-1_[a-z0-9]+.deb
- - gir1.2-arrow-cuda-1.0_{no_rc_version}-1_[a-z0-9]+.deb
- - gir1.2-gandiva-1.0_{no_rc_version}-1_[a-z0-9]+.deb
- - gir1.2-parquet-1.0_{no_rc_version}-1_[a-z0-9]+.deb
- - gir1.2-plasma-1.0_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-glib300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow-glib300_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-cuda-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-cuda-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-cuda-glib300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow-cuda-glib300_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-cuda300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow-cuda300_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-dataset-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-dataset-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-dataset-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-dataset-glib300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow-dataset-glib300_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-dataset300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow-dataset300_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-flight-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-flight300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow-flight300_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-python-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-python300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow-python300_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow300_{no_rc_version}-1_[a-z0-9]+.deb
- - libgandiva-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libgandiva-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libgandiva-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
- - libgandiva-glib300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libgandiva-glib300_{no_rc_version}-1_[a-z0-9]+.deb
- - libgandiva300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libgandiva300_{no_rc_version}-1_[a-z0-9]+.deb
- - libparquet-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libparquet-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libparquet-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
- - libparquet-glib300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libparquet-glib300_{no_rc_version}-1_[a-z0-9]+.deb
- - libparquet300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libparquet300_{no_rc_version}-1_[a-z0-9]+.deb
- - libplasma-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libplasma-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libplasma-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
- - libplasma-glib300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libplasma-glib300_{no_rc_version}-1_[a-z0-9]+.deb
- - libplasma300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libplasma300_{no_rc_version}-1_[a-z0-9]+.deb
- - plasma-store-server-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - plasma-store-server_{no_rc_version}-1_[a-z0-9]+.deb
-
- debian-stretch-arm64:
- ci: travis
- template: linux-packages/travis.linux.arm64.yml
- params:
- build_task: "apt:build"
- target: "debian-stretch-arm64"
- upload_extensions:
- - .ddeb
- - .deb
- - .debian.tar.xz
- - .dsc
- - .orig.tar.gz
- artifacts:
- - apache-arrow_{no_rc_version}-1.debian.tar.xz
- - apache-arrow_{no_rc_version}-1.dsc
- - apache-arrow_{no_rc_version}.orig.tar.gz
- - gir1.2-arrow-1.0_{no_rc_version}-1_[a-z0-9]+.deb
- - gir1.2-parquet-1.0_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-dataset-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-dataset-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-dataset-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-dataset-glib300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow-dataset-glib300_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-dataset300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow-dataset300_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-flight-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-flight300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow-flight300_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-glib300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow-glib300_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-python-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow-python300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow-python300_{no_rc_version}-1_[a-z0-9]+.deb
- - libarrow300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libarrow300_{no_rc_version}-1_[a-z0-9]+.deb
- - libgandiva-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libgandiva-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libgandiva-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
- - libgandiva-glib300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libgandiva-glib300_{no_rc_version}-1_[a-z0-9]+.deb
- - libgandiva300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libgandiva300_{no_rc_version}-1_[a-z0-9]+.deb
- - libparquet-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libparquet-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
- - libparquet-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
- - libparquet-glib300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libparquet-glib300_{no_rc_version}-1_[a-z0-9]+.deb
- - libparquet300-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
- - libparquet300_{no_rc_version}-1_[a-z0-9]+.deb
-
debian-buster-amd64:
ci: github
template: linux-packages/github.linux.amd64.yml
