Skip to content

Commit

Permalink
apacheGH-36241: [Packaging] Drop support for Amazon Linux 2
Browse files Browse the repository at this point in the history
We want to require CMake 3.16 or later. (apacheGH-34921)
If we drop support for Amazon Linux 2, we can require CMake 3.16 or later.
  • Loading branch information
kou committed Jun 25, 2023
1 parent 10eedbe commit 44a2e88
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 147 deletions.
13 changes: 6 additions & 7 deletions dev/release/binary-task.rb
Expand Up @@ -1461,7 +1461,6 @@ def available_yum_targets
["almalinux", "9"],
["almalinux", "8"],
["amazon-linux", "2023"],
["amazon-linux", "2"],
["centos", "9-stream"],
["centos", "8-stream"],
["centos", "7"],
Expand Down Expand Up @@ -2105,16 +2104,16 @@ def apt_test_targets_default
# Disable arm64 targets by default for now
# because they require some setups on host.
[
"debian-buster",
# "debian-buster-arm64",
"debian-bullseye",
# "debian-bullseye-arm64",
"debian-bookworm",
# "debian-bookworm-arm64",
"ubuntu-focal",
# "ubuntu-focal-arm64",
"ubuntu-impish",
# "ubuntu-impish-arm64",
"ubuntu-jammy",
# "ubuntu-jammy-arm64",
"ubuntu-lunar",
# "ubuntu-lunar-arm64",
]
end

Expand Down Expand Up @@ -2165,8 +2164,8 @@ def yum_test_targets_default
# "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",
Expand Down
18 changes: 1 addition & 17 deletions dev/release/verify-yum.sh
Expand Up @@ -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"
Expand Down
Expand Up @@ -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/
Expand Down

This file was deleted.

Expand Up @@ -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
Expand Down

This file was deleted.

This file was deleted.

10 changes: 0 additions & 10 deletions dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
Expand Up @@ -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)
Expand All @@ -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@
Expand All @@ -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}
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 0 additions & 2 deletions dev/tasks/linux-packages/package-task.rb
Expand Up @@ -417,8 +417,6 @@ def yum_targets_default
# "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",
Expand Down
1 change: 0 additions & 1 deletion dev/tasks/tasks.yml
Expand Up @@ -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"] %}
Expand Down

0 comments on commit 44a2e88

Please sign in to comment.