diff --git a/.github/workflows/package_linux.yml b/.github/workflows/package_linux.yml index d7054fdb97c1..dd5d5a4eaf3d 100644 --- a/.github/workflows/package_linux.yml +++ b/.github/workflows/package_linux.yml @@ -351,9 +351,10 @@ jobs: # inside its own tempdir and doesn't copy artifacts back, # so this is purely a verification step. reprotest \ - --vary=-fileordering \ --build-command \ "rake -C dev/tasks/linux-packages ${TASK_NAMESPACE}:build" \ + --no-diffoscope \ + --vary=-fileordering \ "${PWD}" \ "dev/tasks/linux-packages/*/apt/repositories/${DISTRIBUTION}/pool/${DISTRIBUTION_CODE_NAME}/*/*/*/*.deb" diff --git a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-bookworm/Dockerfile b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-bookworm/Dockerfile deleted file mode 100644 index 5251b18f59e7..000000000000 --- a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-bookworm/Dockerfile +++ /dev/null @@ -1,41 +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 debian:bookworm - -RUN \ - echo "debconf debconf/frontend select Noninteractive" | \ - debconf-set-selections - -RUN \ - echo 'APT::Install-Recommends "false";' > \ - /etc/apt/apt.conf.d/disable-install-recommends - -ARG DEBUG - -RUN \ - quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \ - apt update ${quiet} && \ - apt install -y -V ${quiet} \ - build-essential \ - debhelper \ - devscripts \ - fakeroot \ - gnupg \ - libfaketime \ - lsb-release && \ - apt clean diff --git a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-forky/Dockerfile b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-forky/Dockerfile index 10295623ebe6..7b71b7ae66a3 100644 --- a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-forky/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-forky/Dockerfile @@ -38,5 +38,6 @@ RUN \ fakeroot \ gnupg \ libfaketime \ + locales-all \ lsb-release && \ apt clean diff --git a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-trixie/Dockerfile b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-trixie/Dockerfile index e52c81360f5e..aae99ea8d486 100644 --- a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-trixie/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-trixie/Dockerfile @@ -38,5 +38,6 @@ RUN \ fakeroot \ gnupg \ libfaketime \ + locales-all \ lsb-release && \ apt clean diff --git a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-jammy/Dockerfile b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-jammy/Dockerfile index f16898d31269..ac0c61c41899 100644 --- a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-jammy/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-jammy/Dockerfile @@ -37,6 +37,7 @@ RUN \ fakeroot \ gnupg \ libfaketime \ + locales-all \ lsb-release && \ apt clean && \ rm -rf /var/lib/apt/lists/* diff --git a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-noble/Dockerfile b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-noble/Dockerfile index 5af76d13e34c..42c6652d198c 100644 --- a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-noble/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-noble/Dockerfile @@ -37,6 +37,7 @@ RUN \ fakeroot \ gnupg \ libfaketime \ + locales-all \ lsb-release && \ apt clean && \ rm -rf /var/lib/apt/lists/* diff --git a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-resolute/Dockerfile b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-resolute/Dockerfile index 25f750891a8f..68a5b1bcd799 100644 --- a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-resolute/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-resolute/Dockerfile @@ -37,6 +37,7 @@ RUN \ fakeroot \ gnupg \ libfaketime \ + locales-all \ lsb-release && \ apt clean && \ rm -rf /var/lib/apt/lists/* diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile index 5cea3ceb7ddd..674e16d705a8 100644 --- a/dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile @@ -71,6 +71,7 @@ RUN \ libxxhash-dev \ libzstd-dev \ llvm-dev \ + locales-all \ lsb-release \ meson \ ninja-build \ diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-trixie/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-trixie/Dockerfile index b51d7d5f9e7b..2c9927684181 100644 --- a/dev/tasks/linux-packages/apache-arrow/apt/debian-trixie/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/apt/debian-trixie/Dockerfile @@ -71,6 +71,7 @@ RUN \ libxxhash-dev \ libzstd-dev \ llvm-dev \ + locales-all \ lsb-release \ meson \ ninja-build \ diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile index 55203d862f55..644bc695bbd9 100644 --- a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile @@ -63,6 +63,7 @@ RUN \ libxxhash-dev \ libzstd-dev \ llvm-dev \ + locales-all \ lsb-release \ meson \ mold \ diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-noble/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-noble/Dockerfile index c1830cb426f0..496609a8925b 100644 --- a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-noble/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-noble/Dockerfile @@ -64,6 +64,7 @@ RUN \ libxxhash-dev \ libzstd-dev \ llvm-dev \ + locales-all \ lsb-release \ meson \ mold \ diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-resolute/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-resolute/Dockerfile index 322cf2373956..19f1434b7f6d 100644 --- a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-resolute/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-resolute/Dockerfile @@ -64,6 +64,7 @@ RUN \ libxxhash-dev \ libzstd-dev \ llvm-dev \ + locales-all \ lsb-release \ meson \ mold \