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/27 00:18:08 UTC
[arrow] branch main updated: GH-36234: [Packaging][Debian] Add support for Debian GNU/Linux trixie (13) (#36285)
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 2b9138c37b GH-36234: [Packaging][Debian] Add support for Debian GNU/Linux trixie (13) (#36285)
2b9138c37b is described below
commit 2b9138c37b234c13c45addd035a0e0bffdc4c925
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Tue Jun 27 09:18:01 2023 +0900
GH-36234: [Packaging][Debian] Add support for Debian GNU/Linux trixie (13) (#36285)
### Rationale for this change
It's a new testing.
### What changes are included in this PR?
Added it.
### Are these changes tested?
Yes.
### Are there any user-facing changes?
Yes.
* Closes: #36234
Authored-by: Sutou Kouhei <ko...@clear-code.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
dev/release/binary-task.rb | 11 +++--
dev/release/verify-apt.sh | 7 +--
dev/release/verify-release-candidate.sh | 2 +
.../apt/debian-trixie}/Dockerfile | 55 +++-------------------
.../apache-arrow/apt/debian-bookworm/Dockerfile | 1 +
.../apache-arrow/apt/debian-trixie-arm64/from | 18 +++++++
.../{debian-bookworm => debian-trixie}/Dockerfile | 4 +-
dev/tasks/tasks.yml | 1 +
8 files changed, 42 insertions(+), 57 deletions(-)
diff --git a/dev/release/binary-task.rb b/dev/release/binary-task.rb
index c56fda5e0b..f3fab8e945 100644
--- a/dev/release/binary-task.rb
+++ b/dev/release/binary-task.rb
@@ -1085,6 +1085,7 @@ class BinaryTask
[
["debian", "bullseye", "main"],
["debian", "bookworm", "main"],
+ ["debian", "trixie", "main"],
["ubuntu", "focal", "main"],
["ubuntu", "jammy", "main"],
["ubuntu", "lunar", "main"],
@@ -2104,16 +2105,18 @@ class LocalBinaryTask < BinaryTask
# 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",
+ "debian-trixie",
+ # "debian-trixie-arm64",
"ubuntu-focal",
# "ubuntu-focal-arm64",
- "ubuntu-impish",
- # "ubuntu-impish-arm64",
+ "ubuntu-jammy",
+ # "ubuntu-jammy-arm64",
+ "ubuntu-lunar",
+ # "ubuntu-lunar-arm64",
]
end
diff --git a/dev/release/verify-apt.sh b/dev/release/verify-apt.sh
index 3d02f123a0..187482cbf5 100755
--- a/dev/release/verify-apt.sh
+++ b/dev/release/verify-apt.sh
@@ -49,6 +49,7 @@ APT_INSTALL="apt install -y -V --no-install-recommends"
apt update
${APT_INSTALL} \
+ base-files \
ca-certificates \
curl \
lsb-release
@@ -65,17 +66,17 @@ esac
workaround_missing_packages=()
case "${distribution}-${code_name}" in
- debian-bookworm)
+ debian-bullseye)
sed \
-i"" \
-e "s/ main$/ main contrib non-free/g" \
- /etc/apt/sources.list.d/debian.sources
+ /etc/apt/sources.list
;;
debian-*)
sed \
-i"" \
-e "s/ main$/ main contrib non-free/g" \
- /etc/apt/sources.list
+ /etc/apt/sources.list.d/debian.sources
;;
esac
diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh
index 4b905d48d9..8c5de9bda8 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -189,6 +189,8 @@ test_apt() {
"arm64v8/debian:bullseye" \
"debian:bookworm" \
"arm64v8/debian:bookworm" \
+ "debian:trixie" \
+ "arm64v8/debian:trixie" \
"ubuntu:focal" \
"arm64v8/ubuntu:focal" \
"ubuntu:jammy" \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-bookworm/Dockerfile b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-trixie/Dockerfile
similarity index 54%
copy from dev/tasks/linux-packages/apache-arrow/apt/debian-bookworm/Dockerfile
copy to dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-trixie/Dockerfile
index 6ac032739b..1cab2169f4 100644
--- a/dev/tasks/linux-packages/apache-arrow/apt/debian-bookworm/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-trixie/Dockerfile
@@ -15,8 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-ARG FROM=debian:bookworm
-FROM ${FROM}
+FROM debian:trixie
RUN \
echo "debconf debconf/frontend select Noninteractive" | \
@@ -26,59 +25,17 @@ 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.d/debian.sources
-
ARG DEBUG
+
RUN \
quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \
apt update ${quiet} && \
apt install -y -V ${quiet} \
+ base-files \
build-essential \
- clang \
- cmake \
debhelper \
devscripts \
- git \
- gtk-doc-tools \
- libboost-filesystem-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 \
- libgrpc++-dev \
- libgtest-dev \
- liblz4-dev \
- libprotobuf-dev \
- libprotoc-dev \
- libre2-dev \
- libsnappy-dev \
- libssl-dev \
- libthrift-dev \
- libutf8proc-dev \
- libzstd-dev \
- llvm-dev \
- lsb-release \
- meson \
- ninja-build \
- nlohmann-json3-dev \
- pkg-config \
- protobuf-compiler-grpc \
- python3-dev \
- python3-pip \
- rapidjson-dev \
- tzdata \
- valac \
- zlib1g-dev && \
- if apt list | grep '^nvidia-cuda-toolkit/'; then \
- apt install -y -V ${quiet} nvidia-cuda-toolkit; \
- fi && \
+ fakeroot \
+ gnupg \
+ lsb-release && \
apt clean
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-bookworm/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-bookworm/Dockerfile
index 6ac032739b..762bc909e1 100644
--- a/dev/tasks/linux-packages/apache-arrow/apt/debian-bookworm/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/apt/debian-bookworm/Dockerfile
@@ -57,6 +57,7 @@ RUN \
libgrpc++-dev \
libgtest-dev \
liblz4-dev \
+ libmimalloc-dev \
libprotobuf-dev \
libprotoc-dev \
libre2-dev \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-trixie-arm64/from b/dev/tasks/linux-packages/apache-arrow/apt/debian-trixie-arm64/from
new file mode 100644
index 0000000000..e2455893c4
--- /dev/null
+++ b/dev/tasks/linux-packages/apache-arrow/apt/debian-trixie-arm64/from
@@ -0,0 +1,18 @@
+# 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:trixie
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-bookworm/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-trixie/Dockerfile
similarity index 97%
copy from dev/tasks/linux-packages/apache-arrow/apt/debian-bookworm/Dockerfile
copy to dev/tasks/linux-packages/apache-arrow/apt/debian-trixie/Dockerfile
index 6ac032739b..70289e9af7 100644
--- a/dev/tasks/linux-packages/apache-arrow/apt/debian-bookworm/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/apt/debian-trixie/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-ARG FROM=debian:bookworm
+ARG FROM=debian:trixie
FROM ${FROM}
RUN \
@@ -37,6 +37,7 @@ RUN \
quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \
apt update ${quiet} && \
apt install -y -V ${quiet} \
+ base-files \
build-essential \
clang \
cmake \
@@ -57,6 +58,7 @@ RUN \
libgrpc++-dev \
libgtest-dev \
liblz4-dev \
+ libmimalloc-dev \
libprotobuf-dev \
libprotoc-dev \
libre2-dev \
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index edb92eb613..ccbd11d92b 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -501,6 +501,7 @@ tasks:
{% for target in ["debian-bullseye",
"debian-bookworm",
+ "debian-trixie",
"ubuntu-focal",
"ubuntu-jammy",
"ubuntu-lunar"] %}