You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2023/06/26 05:59:47 UTC
[arrow] branch main updated: GH-36241: [Packaging] Drop support for Amazon Linux 2 (#36282)
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 781907a868 GH-36241: [Packaging] Drop support for Amazon Linux 2 (#36282)
781907a868 is described below
commit 781907a868025932a786a0a42430ec9739e820b6
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Mon Jun 26 14:59:41 2023 +0900
GH-36241: [Packaging] Drop support for Amazon Linux 2 (#36282)
### Rationale for this change
We want to require CMake 3.16 or later. (GH-34921)
If we drop support for Amazon Linux 2, we can require CMake 3.16 or later.
### What changes are included in this PR?
Remove Amazon Linux 2 related codes.
### Are these changes tested?
Yes.
### Are there any user-facing changes?
Yes.
* Closes: #36241
Authored-by: Sutou Kouhei <ko...@clear-code.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
dev/release/binary-task.rb | 5 +-
dev/release/verify-release-candidate.sh | 1 -
dev/release/verify-yum.sh | 18 +------
.../apache-arrow-release/yum/Apache-Arrow.repo | 7 ---
.../yum/amazon-linux-2/Dockerfile | 26 ----------
.../yum/apache-arrow-release.spec.in | 2 -
.../apache-arrow/yum/amazon-linux-2-aarch64/from | 18 -------
.../apache-arrow/yum/amazon-linux-2/Dockerfile | 57 ----------------------
.../linux-packages/apache-arrow/yum/arrow.spec.in | 10 ----
dev/tasks/linux-packages/package-task.rb | 2 -
dev/tasks/tasks.yml | 1 -
11 files changed, 3 insertions(+), 144 deletions(-)
diff --git a/dev/release/binary-task.rb b/dev/release/binary-task.rb
index 8da8a47186..c56fda5e0b 100644
--- a/dev/release/binary-task.rb
+++ b/dev/release/binary-task.rb
@@ -1461,7 +1461,6 @@ APT::FTPArchive::Release::Description "#{apt_repository_description}";
["almalinux", "9"],
["almalinux", "8"],
["amazon-linux", "2023"],
- ["amazon-linux", "2"],
["centos", "9-stream"],
["centos", "8-stream"],
["centos", "7"],
@@ -2165,8 +2164,8 @@ class LocalBinaryTask < BinaryTask
# "almalinux-9-aarch64",
"almalinux-8",
# "almalinux-8-aarch64",
- "amazon-linux-2",
- # "amazon-linux-2-aarch64",
+ "amazon-linux-2023",
+ # "amazon-linux-2023-aarch64",
"centos-9-stream",
# "centos-9-stream-aarch64",
"centos-8-stream",
diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh
index 3a316749b7..4b905d48d9 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -233,7 +233,6 @@ test_yum() {
"almalinux:8" \
"arm64v8/almalinux:8" \
"amazonlinux:2023" \
- "amazonlinux:2" \
"quay.io/centos/centos:stream9" \
"quay.io/centos/centos:stream8" \
"centos:7"; do
diff --git a/dev/release/verify-yum.sh b/dev/release/verify-yum.sh
index cd7ac94083..03aa8e9dcc 100755
--- a/dev/release/verify-yum.sh
+++ b/dev/release/verify-yum.sh
@@ -78,23 +78,7 @@ case "${distribution}-${distribution_version}" in
distribution_prefix="almalinux"
ruby_devel_packages+=(redhat-rpm-config)
;;
- amzn-2)
- distribution_prefix="amazon-linux"
- cmake_package=cmake3
- cmake_command=cmake3
- if [ "$(arch)" != "aarch64" ]; then
- have_arrow_libs=yes
- fi
- have_flight=no
- have_gandiva=no
- have_ruby=no
- install_command="yum install -y"
- uninstall_command="yum remove -y"
- clean_command="yum clean"
- info_command="yum info"
- amazon-linux-extras install epel -y
- ;;
- amzn-2023)
+ amzn-*)
distribution_prefix="amazon-linux"
enablerepo_epel=""
install_command="dnf install -y"
diff --git a/dev/tasks/linux-packages/apache-arrow-release/yum/Apache-Arrow.repo b/dev/tasks/linux-packages/apache-arrow-release/yum/Apache-Arrow.repo
index 66641942fa..c98c434bd9 100644
--- a/dev/tasks/linux-packages/apache-arrow-release/yum/Apache-Arrow.repo
+++ b/dev/tasks/linux-packages/apache-arrow-release/yum/Apache-Arrow.repo
@@ -22,13 +22,6 @@ gpgcheck=1
enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow
-[apache-arrow-amazon-linux]
-name=Apache Arrow for Amazon Linux $releasever - $basearch
-baseurl=https://apache.jfrog.io/artifactory/arrow/amazon-linux/$releasever/$basearch/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow
-
[apache-arrow-amazon-linux-2023]
name=Apache Arrow for Amazon Linux 2023 - $basearch
baseurl=https://apache.jfrog.io/artifactory/arrow/amazon-linux/2023/$basearch/
diff --git a/dev/tasks/linux-packages/apache-arrow-release/yum/amazon-linux-2/Dockerfile b/dev/tasks/linux-packages/apache-arrow-release/yum/amazon-linux-2/Dockerfile
deleted file mode 100644
index 800df6c68e..0000000000
--- a/dev/tasks/linux-packages/apache-arrow-release/yum/amazon-linux-2/Dockerfile
+++ /dev/null
@@ -1,26 +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 amazonlinux:2
-
-ARG DEBUG
-
-RUN \
- quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
- yum install -y ${quiet} \
- rpmdevtools && \
- yum clean ${quiet} all
diff --git a/dev/tasks/linux-packages/apache-arrow-release/yum/apache-arrow-release.spec.in b/dev/tasks/linux-packages/apache-arrow-release/yum/apache-arrow-release.spec.in
index 1b99796c1f..0155a54c44 100644
--- a/dev/tasks/linux-packages/apache-arrow-release/yum/apache-arrow-release.spec.in
+++ b/dev/tasks/linux-packages/apache-arrow-release/yum/apache-arrow-release.spec.in
@@ -89,8 +89,6 @@ rm -rf $RPM_BUILD_ROOT
%post
if grep -q 'Amazon Linux release 2023' /etc/system-release 2>/dev/null; then
%{yum_repository_enable apache-arrow-amazon-linux-2023}
-elif grep -q 'Amazon Linux release 2' /etc/system-release 2>/dev/null; then
- %{yum_repository_enable apache-arrow-amazon-linux}
elif grep -q 'Red Hat Enterprise Linux Server release 7' /etc/system-release 2>/dev/null; then
%{yum_repository_enable apache-arrow-rhel7}
elif grep -q 'Red Hat Enterprise Linux' /etc/system-release 2>/dev/null; then
diff --git a/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2-aarch64/from b/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2-aarch64/from
deleted file mode 100644
index ea38a8d421..0000000000
--- a/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2-aarch64/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/amazonlinux:2
diff --git a/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2/Dockerfile
deleted file mode 100644
index 68d604d64e..0000000000
--- a/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2/Dockerfile
+++ /dev/null
@@ -1,57 +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=amazonlinux:2
-FROM ${FROM}
-
-ARG DEBUG
-
-RUN \
- quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
- yum update -y ${quiet} && \
- amazon-linux-extras install -y epel && \
- yum install -y ${quiet} \
- bison \
- brotli-devel \
- bzip2-devel \
- ccache \
- cmake3 \
- curl-devel \
- flex \
- gcc-c++ \
- git \
- glog-devel \
- gobject-introspection-devel \
- gtk-doc \
- json-devel \
- lz4-devel \
- make \
- openssl-devel \
- pkg-config \
- rapidjson-devel \
- rpmdevtools \
- snappy-devel \
- tar \
- thrift-devel \
- utf8proc-devel \
- vala \
- zlib-devel && \
- # Install ninja-build dependencies in amzn2-core
- yum install -y ${quiet} ninja-build && \
- # Install ninja-build from EPEL because ninja-build in amzn2-core is old.
- yum install -y ${quiet} --disablerepo=amzn2-core ninja-build && \
- yum clean ${quiet} all
diff --git a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
index 0eb6253598..67e0f8db8a 100644
--- a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
+++ b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
@@ -61,7 +61,6 @@
%define gcc_package gcc
%endif
-%define use_boost (%{_amzn} != 2)
%define use_flight (%{_rhel} >= 8 || %{_amzn} >= 2023)
%define use_gandiva (%{_rhel} >= 8 || %{_amzn} >= 2023)
%define use_gcs (%{_rhel} >= 8)
@@ -82,7 +81,6 @@
%define have_re2 (%{_rhel} >= 8 || %{_amzn} >= 2023)
%define have_thrift (%{_rhel} >= 8)
%define have_utf8proc (%{_rhel} >= 9 || %{_amzn} >= 2023)
-%define have_zstd (%{_amzn} != 2)
Name: @PACKAGE@
Version: @VERSION@
@@ -94,9 +92,7 @@ URL: https://arrow.apache.org/
Source0: https://dist.apache.org/repos/dist/release/@PACKAGE@/@PACKAGE@-%{version}/apache-@PACKAGE@-%{version}.tar.gz
BuildRequires: bison
-%if %{use_boost}
BuildRequires: boost%{boost_version}-devel
-%endif
BuildRequires: brotli-devel
BuildRequires: bzip2-devel
%if %{use_flight}
@@ -120,9 +116,7 @@ BuildRequires: grpc-plugins
%if %{use_gcs}
BuildRequires: json-devel
%endif
-%if %{have_zstd}
BuildRequires: libzstd-devel
-%endif
BuildRequires: lz4-devel %{lz4_requirement}
BuildRequires: ninja-build
BuildRequires: openssl-devel
@@ -251,9 +245,7 @@ Requires: gflags
%if %{use_glog}
Requires: glog
%endif
-%if %{have_zstd}
Requires: libzstd
-%endif
%if %{have_lz4_libs}
Requires: lz4-libs %{lz4_requirement}
%else
@@ -308,9 +300,7 @@ Requires: grpc-plugins
%if %{use_gcs}
Requires: json-devel
%endif
-%if %{have_zstd}
Requires: libzstd-devel
-%endif
Requires: lz4-devel %{lz4_requirement}
Requires: openssl-devel
%if %{have_rapidjson}
diff --git a/dev/tasks/linux-packages/package-task.rb b/dev/tasks/linux-packages/package-task.rb
index e0f4a828b5..bb5d70b64f 100644
--- a/dev/tasks/linux-packages/package-task.rb
+++ b/dev/tasks/linux-packages/package-task.rb
@@ -417,8 +417,6 @@ VERSION=#{@deb_upstream_version}
# "almalinux-8-arch64",
"amazon-linux-2023",
# "amazon-linux-2023-arch64",
- "amazon-linux-2",
- # "amazon-linux-2-arch64",
"centos-9-stream",
# "centos-9-stream-aarch64",
"centos-8-stream",
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 583e1f6aa5..edb92eb613 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -600,7 +600,6 @@ tasks:
{% for target in ["almalinux-9",
"almalinux-8",
"amazon-linux-2023",
- "amazon-linux-2",
"centos-9-stream",
"centos-8-stream",
"centos-7"] %}