Skip to content

Commit a987357

Browse files
koukou
committed
ARROW-12593: [Packaging][Ubuntu] Add support for Ubuntu 21.04
Closes apache#10192 from kou/packaging-ubuntu-21.04 Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent a7f2d81 commit a987357

25 files changed

Lines changed: 193 additions & 757 deletions

File tree

‎dev/release/01-prepare-test.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,8 +779,8 @@ def test_deb_package_names
779779
},
780780
{
781781
sampled_diff: [
782-
"- - libarrow-glib#{@so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb",
783-
"+ - libarrow-glib#{@next_so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb",
782+
"- - libarrow-dataset-glib#{@so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb",
783+
"+ - libarrow-dataset-glib#{@next_so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb",
784784
],
785785
path: "dev/tasks/tasks.yml",
786786
},

‎dev/release/binary-task.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -868,6 +868,7 @@ def available_apt_targets
868868
["ubuntu", "bionic", "main"],
869869
["ubuntu", "focal", "main"],
870870
["ubuntu", "groovy", "main"],
871+
["ubuntu", "hirsute", "main"],
871872
]
872873
end
873874

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
FROM ubuntu:hirsute
19+
20+
RUN \
21+
echo "debconf debconf/frontend select Noninteractive" | \
22+
debconf-set-selections
23+
24+
RUN \
25+
echo 'APT::Install-Recommends "false";' > \
26+
/etc/apt/apt.conf.d/disable-install-recommends
27+
28+
ARG DEBUG
29+
30+
RUN \
31+
quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \
32+
apt update ${quiet} && \
33+
apt install -y -V ${quiet} \
34+
build-essential \
35+
debhelper \
36+
devscripts \
37+
fakeroot \
38+
gnupg \
39+
lsb-release && \
40+
apt clean && \
41+
rm -rf /var/lib/apt/lists/*

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ class ApacheArrowPackageTask < PackageTask
8484
end
8585

8686
def apt_arm64_cuda_available_target?(target)
87-
# ubuntu-20.10 has navidia-cuda-toolkit but not libcuda1.
88-
# ubuntu-21.04 may support this.
8987
false
9088
end
9189

‎dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
ARG FROM=debian:bullseye
1919
FROM ${FROM}
2020

21-
COPY qemu-* /usr/bin/
22-
2321
RUN \
2422
echo "debconf debconf/frontend select Noninteractive" | \
2523
debconf-set-selections
@@ -56,6 +54,8 @@ RUN \
5654
libgrpc++-dev \
5755
libgtest-dev \
5856
liblz4-dev \
57+
libprotoc-dev \
58+
libprotobuf-dev \
5959
libre2-dev \
6060
libsnappy-dev \
6161
libssl-dev \

‎dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/qemu-dummy-static‎

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

‎dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
ARG FROM=debian:buster
1919
FROM ${FROM}
2020

21-
COPY qemu-* /usr/bin/
22-
2321
RUN \
2422
echo "debconf debconf/frontend select Noninteractive" | \
2523
debconf-set-selections

‎dev/tasks/linux-packages/apache-arrow/apt/debian-buster/qemu-dummy-static‎

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

‎dev/tasks/linux-packages/apache-arrow/apt/ubuntu-bionic/Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
ARG FROM=ubuntu:bionic
1919
FROM ${FROM}
2020

21-
COPY qemu-* /usr/bin/
22-
2321
RUN \
2422
echo "debconf debconf/frontend select Noninteractive" | \
2523
debconf-set-selections

‎dev/tasks/linux-packages/apache-arrow/apt/ubuntu-bionic/qemu-dummy-static‎

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

0 commit comments

Comments
 (0)