Skip to content

Commit a70ac2d

Browse files
authored
GH-45476: [Packaging][Linux] Drop support for Ubuntu 20.04 (#45477)
### Rationale for this change Ubuntu 20.04 will reach EOL on 2025-05. ### What changes are included in this PR? Remove Ubuntu 20.04 related codes. ### Are these changes tested? Yes. ### Are there any user-facing changes? Yes. * GitHub Issue: #45476 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent 53c404c commit a70ac2d

File tree

9 files changed

+13
-184
lines changed

9 files changed

+13
-184
lines changed

dev/release/binary-task.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,6 @@ def available_apt_targets
10861086
[
10871087
["debian", "bookworm", "main"],
10881088
["debian", "trixie", "main"],
1089-
["ubuntu", "focal", "main"],
10901089
["ubuntu", "jammy", "main"],
10911090
["ubuntu", "noble", "main"],
10921091
]
@@ -2105,8 +2104,6 @@ def apt_test_targets_default
21052104
# "debian-bookworm-arm64",
21062105
"debian-trixie",
21072106
# "debian-trixie-arm64",
2108-
"ubuntu-focal",
2109-
# "ubuntu-focal-arm64",
21102107
"ubuntu-jammy",
21112108
# "ubuntu-jammy-arm64",
21122109
"ubuntu-noble",

dev/release/verify-release-candidate.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ test_apt() {
186186
if [ "$(arch)" = "x86_64" ]; then
187187
for target in "debian:bookworm" \
188188
"debian:trixie" \
189-
"ubuntu:focal" \
190189
"ubuntu:jammy" \
191190
"ubuntu:noble"; do \
192191
if ! docker run \
@@ -207,7 +206,6 @@ test_apt() {
207206
if [ "$(arch)" = "aarch64" -o -e /usr/bin/qemu-aarch64-static ]; then
208207
for target in "arm64v8/debian:bookworm" \
209208
"arm64v8/debian:trixie" \
210-
"arm64v8/ubuntu:focal" \
211209
"arm64v8/ubuntu:jammy" \
212210
"arm64v8/ubuntu:noble"; do \
213211
if ! docker run \

dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-focal/Dockerfile

Lines changed: 0 additions & 41 deletions
This file was deleted.

dev/tasks/linux-packages/apache-arrow/Rakefile

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -96,31 +96,9 @@ class ApacheArrowPackageTask < PackageTask
9696
control.gsub(/@CUDA_ARCHITECTURE@/, cuda_architecture)
9797
end
9898

99-
def apt_prepare_debian_control_grpc(control, target)
100-
case target
101-
when /\Aubuntu-focal/
102-
use_system_grpc = "#"
103-
else
104-
use_system_grpc = ""
105-
end
106-
control.gsub(/@USE_SYSTEM_GRPC@/, use_system_grpc)
107-
end
108-
109-
def apt_prepare_debian_control_protobuf(control, target)
110-
case target
111-
when /\Aubuntu-focal/
112-
use_system_protobuf = "#"
113-
else
114-
use_system_protobuf = ""
115-
end
116-
control.gsub(/@USE_SYSTEM_PROTOBUF@/, use_system_protobuf)
117-
end
118-
11999
def apt_prepare_debian_control(control_in, target)
120100
control = control_in.dup
121101
control = apt_prepare_debian_control_cuda_architecture(control, target)
122-
control = apt_prepare_debian_control_grpc(control, target)
123-
control = apt_prepare_debian_control_protobuf(control, target)
124102
control
125103
end
126104
end

dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal-arm64/from

Lines changed: 0 additions & 18 deletions
This file was deleted.

dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile

Lines changed: 0 additions & 81 deletions
This file was deleted.

dev/tasks/linux-packages/apache-arrow/debian/control.in

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ Maintainer: Apache Arrow Developers <[email protected]>
55
Build-Depends:
66
cmake,
77
debhelper (>= 12),
8-
# TODO: Enable this after we drop support for Ubuntu 20.04.
9-
# gi-docgen,
8+
gi-docgen,
109
git,
1110
gobject-introspection,
1211
libboost-filesystem-dev,
@@ -17,11 +16,11 @@ Build-Depends:
1716
libcurl4-openssl-dev,
1817
libgirepository1.0-dev,
1918
libgoogle-glog-dev,
20-
@USE_SYSTEM_GRPC@ libgrpc++-dev,
19+
libgrpc++-dev,
2120
libgtest-dev,
2221
liblz4-dev,
23-
@USE_SYSTEM_PROTOBUF@ libprotobuf-dev,
24-
@USE_SYSTEM_PROTOBUF@ libprotoc-dev,
22+
libprotobuf-dev,
23+
libprotoc-dev,
2524
libre2-dev,
2625
libsnappy-dev,
2726
libssl-dev,
@@ -34,10 +33,10 @@ Build-Depends:
3433
nlohmann-json-dev | nlohmann-json3-dev,
3534
nvidia-cuda-toolkit [!arm64],
3635
pkg-config,
37-
@USE_SYSTEM_PROTOBUF@ protobuf-compiler,
38-
@USE_SYSTEM_GRPC@ protobuf-compiler-grpc,
39-
valac,
36+
protobuf-compiler,
37+
protobuf-compiler-grpc,
4038
tzdata,
39+
valac,
4140
zlib1g-dev
4241
Build-Depends-Indep: libglib2.0-doc
4342
Standards-Version: 3.9.8
@@ -140,23 +139,23 @@ Architecture: any
140139
Multi-Arch: same
141140
Depends:
142141
${misc:Depends},
142+
libabsl-dev,
143143
libarrow2000 (= ${binary:Version}),
144-
@USE_SYSTEM_GRPC@ libabsl-dev,
145144
libbrotli-dev,
146145
libbz2-dev,
146+
libc-ares-dev,
147147
libcurl4-openssl-dev,
148148
liblz4-dev,
149-
libc-ares-dev,
150-
@USE_SYSTEM_PROTOBUF@ libprotobuf-dev,
151-
@USE_SYSTEM_PROTOBUF@ libprotoc-dev,
149+
libprotobuf-dev,
150+
libprotoc-dev,
152151
libre2-dev,
153152
libsnappy-dev,
154153
libssl-dev,
155154
libutf8proc-dev,
156155
libxxhash-dev,
157156
libzstd-dev,
158157
nlohmann-json-dev | nlohmann-json3-dev,
159-
@USE_SYSTEM_GRPC@ protobuf-compiler-grpc,
158+
protobuf-compiler-grpc,
160159
zlib1g-dev
161160
Description: Apache Arrow is a data processing library for analysis
162161
.
@@ -208,7 +207,7 @@ Depends:
208207
libarrow-dev (= ${binary:Version}),
209208
libarrow-flight2000 (= ${binary:Version}),
210209
libc-ares-dev,
211-
@USE_SYSTEM_GRPC@ libgrpc++-dev
210+
libgrpc++-dev
212211
Description: Apache Arrow is a data processing library for analysis
213212
.
214213
This package provides C++ header files for Flight RPC system.

dev/tasks/linux-packages/package-task.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,6 @@ def apt_targets_default
271271
# "debian-bookworm-arm64",
272272
"debian-trixie",
273273
# "debian-trixie-arm64",
274-
"ubuntu-focal",
275-
# "ubuntu-focal-arm64",
276274
"ubuntu-jammy",
277275
# "ubuntu-jammy-arm64",
278276
"ubuntu-noble",

dev/tasks/tasks.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,6 @@ tasks:
465465

466466
{% for target in ["debian-bookworm",
467467
"debian-trixie",
468-
"ubuntu-focal",
469468
"ubuntu-jammy",
470469
"ubuntu-noble"] %}
471470
{% for architecture in ["amd64", "arm64"] %}

0 commit comments

Comments
 (0)