ARROW-12353: [Packaging][deb] Rename -archive-keyring to -apt-source
Because lintian recommends that a package that puts files to
/etc/apt/sources.list.d/ uses -apt-source suffix.
See also: https://lintian.debian.net/tags/package-installs-apt-sources
This also changes repository URL to
https://apache.jfrog.io/artifactory/ from https://apache.bintray.com/ .
Closes #10006 from kou/packaging-linux-apt-source
Authored-by: Sutou Kouhei <kou@clear-code.com>
Signed-off-by: Sutou Kouhei <kou@clear-code.com>
diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb
index 53bd5e8..9e2a798 100644
--- a/dev/release/00-prepare-test.rb
+++ b/dev/release/00-prepare-test.rb
@@ -97,9 +97,9 @@
today = Time.now.utc.strftime("%a %b %d %Y")
expected_changes = [
{
- path: "#{base_dir}/apache-arrow-archive-keyring/debian/changelog",
+ path: "#{base_dir}/apache-arrow-apt-source/debian/changelog",
sampled_hunks: [
- "+apache-arrow-archive-keyring (#{@release_version}-1) " +
+ "+apache-arrow-apt-source (#{@release_version}-1) " +
"unstable; urgency=low",
],
},
diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt
index cee925c..ce32044 100644
--- a/dev/release/rat_exclude_files.txt
+++ b/dev/release/rat_exclude_files.txt
@@ -50,11 +50,11 @@
dev/archery/archery/crossbow/tests/fixtures/*
dev/release/rat_exclude_files.txt
dev/tasks/homebrew-formulae/apache-arrow.rb
-dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/apache-arrow-archive-keyring.install
-dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/compat
-dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/control
-dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/rules
-dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/source/format
+dev/tasks/linux-packages/apache-arrow-apt-source/debian/apache-arrow-apt-source.install
+dev/tasks/linux-packages/apache-arrow-apt-source/debian/compat
+dev/tasks/linux-packages/apache-arrow-apt-source/debian/control
+dev/tasks/linux-packages/apache-arrow-apt-source/debian/rules
+dev/tasks/linux-packages/apache-arrow-apt-source/debian/source/format
dev/tasks/linux-packages/apache-arrow/debian/compat
dev/tasks/linux-packages/apache-arrow/debian/control.in
dev/tasks/linux-packages/apache-arrow/debian/gir1.2-arrow-1.0.install
diff --git a/dev/release/verify-apt.sh b/dev/release/verify-apt.sh
index 57f44fa..e7b87a3 100755
--- a/dev/release/verify-apt.sh
+++ b/dev/release/verify-apt.sh
@@ -21,20 +21,16 @@
if [ $# -lt 2 ]; then
echo "Usage: $0 VERSION rc"
- echo " $0 VERSION rc BINTRAY_REPOSITORY"
echo " $0 VERSION release"
- echo " $0 VERSION release BINTRAY_REPOSITORY"
echo " $0 VERSION local"
echo " e.g.: $0 0.13.0 rc # Verify 0.13.0 RC"
echo " e.g.: $0 0.13.0 release # Verify 0.13.0"
- echo " e.g.: $0 0.13.0 rc kou/arrow # Verify 0.13.0 RC at https://bintray.com/kou/arrow"
echo " e.g.: $0 0.13.0-dev20210203 local # Verify 0.13.0-dev20210203 on local"
exit 1
fi
VERSION="$1"
TYPE="$2"
-BINTRAY_REPOSITORY="${3:-apache/arrow}"
local_prefix="/arrow/dev/tasks/linux-packages"
@@ -47,9 +43,9 @@
code_name="$(lsb_release --codename --short)"
distribution="$(lsb_release --id --short | tr 'A-Z' 'a-z')"
-bintray_base_url="https://dl.bintray.com/${BINTRAY_REPOSITORY}/${distribution}"
+artifactory_base_url="https://apache.jfrog.io/artifactory/arrow/${distribution}"
if [ "${TYPE}" = "rc" ]; then
- bintray_base_url="${bintray_base_url}-rc"
+ artifactory_base_url+="-rc"
fi
have_flight=yes
@@ -80,18 +76,18 @@
;;
esac
package_version+="-1"
- keyring_archive_path="${local_prefix}/apt/repositories"
- keyring_archive_path+="/${distribution}/pool/${code_name}/main"
- keyring_archive_path+="/a/apache-arrow-archive-keyring"
- keyring_archive_path+="/apache-arrow-archive-keyring_${package_version}_all.deb"
- apt install -y -V "${keyring_archive_path}"
+ apt_source_path="${local_prefix}/apt/repositories"
+ apt_source_path+="/${distribution}/pool/${code_name}/main"
+ apt_source_path+="/a/apache-arrow-apt-source"
+ apt_source_path+="/apache-arrow-apt-source_${package_version}_all.deb"
+ apt install -y -V "${apt_source_path}"
else
package_version="${VERSION}-1"
- keyring_archive_base_name="apache-arrow-archive-keyring-latest-${code_name}.deb"
+ apt_source_base_name="apache-arrow-apt-source-latest-${code_name}.deb"
curl \
- --output "${keyring_archive_base_name}" \
- "${bintray_base_url}/${keyring_archive_base_name}"
- apt install -y -V "./${keyring_archive_base_name}"
+ --output "${apt_source_base_name}" \
+ "${artifactory_base_url}/${apt_source_base_name}"
+ apt install -y -V "./${apt_source_base_name}"
fi
if [ "${TYPE}" = "local" ]; then
@@ -103,21 +99,14 @@
if [ -f "${keys}" ]; then
gpg \
--no-default-keyring \
- --keyring /usr/share/keyrings/apache-arrow-archive-keyring.gpg \
+ --keyring /usr/share/keyrings/apache-arrow-apt-source.gpg \
--import "${keys}"
fi
else
- if [ "${BINTRAY_REPOSITORY}" = "apache/arrow" ]; then
- if [ "${TYPE}" = "rc" ]; then
- sed \
- -i"" \
- -e "s,^URIs: \\(.*\\)/,URIs: \\1-rc/,g" \
- /etc/apt/sources.list.d/apache-arrow.sources
- fi
- else
+ if [ "${TYPE}" = "rc" ]; then
sed \
-i"" \
- -e "s,^URIs: .*,URIs: ${bintray_base_url}/,g" \
+ -e "s,^URIs: \\(.*\\)/,URIs: \\1-rc/,g" \
/etc/apt/sources.list.d/apache-arrow.sources
fi
fi
diff --git a/dev/tasks/linux-packages/Rakefile b/dev/tasks/linux-packages/Rakefile
index e45a56c..a84a43a 100644
--- a/dev/tasks/linux-packages/Rakefile
+++ b/dev/tasks/linux-packages/Rakefile
@@ -24,7 +24,7 @@
packages = [
"apache-arrow",
- "apache-arrow-archive-keyring",
+ "apache-arrow-apt-source",
"apache-arrow-release",
]
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/Rakefile b/dev/tasks/linux-packages/apache-arrow-apt-source/Rakefile
similarity index 92%
rename from dev/tasks/linux-packages/apache-arrow-archive-keyring/Rakefile
rename to dev/tasks/linux-packages/apache-arrow-apt-source/Rakefile
index 0f91e0a..210fa95 100644
--- a/dev/tasks/linux-packages/apache-arrow-archive-keyring/Rakefile
+++ b/dev/tasks/linux-packages/apache-arrow-apt-source/Rakefile
@@ -20,12 +20,12 @@
require_relative "../helper"
require_relative "../package-task"
-class ApacheArrowArchiveKeyringPackageTask < PackageTask
+class ApacheArrowAptSourcePackageTask < PackageTask
include Helper::ApacheArrow
def initialize
release_time = detect_release_time
- super("apache-arrow-archive-keyring",
+ super("apache-arrow-apt-source",
detect_version(release_time),
release_time,
:rc_build_type => :release)
@@ -60,5 +60,5 @@
end
end
-task = ApacheArrowArchiveKeyringPackageTask.new
+task = ApacheArrowAptSourcePackageTask.new
task.define
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/debian-bullseye/Dockerfile b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-bullseye/Dockerfile
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/debian-bullseye/Dockerfile
rename to dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-bullseye/Dockerfile
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/debian-buster/Dockerfile b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-buster/Dockerfile
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/debian-buster/Dockerfile
rename to dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-buster/Dockerfile
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/ubuntu-bionic/Dockerfile b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-bionic/Dockerfile
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/ubuntu-bionic/Dockerfile
rename to dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-bionic/Dockerfile
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/ubuntu-focal/Dockerfile b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-focal/Dockerfile
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/ubuntu-focal/Dockerfile
rename to dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-focal/Dockerfile
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/ubuntu-groovy/Dockerfile b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-groovy/Dockerfile
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/ubuntu-groovy/Dockerfile
rename to dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-groovy/Dockerfile
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/ubuntu-xenial/Dockerfile b/dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-xenial/Dockerfile
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow-archive-keyring/apt/ubuntu-xenial/Dockerfile
rename to dev/tasks/linux-packages/apache-arrow-apt-source/apt/ubuntu-xenial/Dockerfile
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/apache-arrow-archive-keyring.install b/dev/tasks/linux-packages/apache-arrow-apt-source/debian/apache-arrow-apt-source.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/apache-arrow-archive-keyring.install
rename to dev/tasks/linux-packages/apache-arrow-apt-source/debian/apache-arrow-apt-source.install
diff --git a/dev/tasks/linux-packages/apache-arrow-apt-source/debian/changelog b/dev/tasks/linux-packages/apache-arrow-apt-source/debian/changelog
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dev/tasks/linux-packages/apache-arrow-apt-source/debian/changelog
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/compat b/dev/tasks/linux-packages/apache-arrow-apt-source/debian/compat
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/compat
rename to dev/tasks/linux-packages/apache-arrow-apt-source/debian/compat
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/control b/dev/tasks/linux-packages/apache-arrow-apt-source/debian/control
similarity index 77%
rename from dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/control
rename to dev/tasks/linux-packages/apache-arrow-apt-source/debian/control
index 3855234..f54d52f 100644
--- a/dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/control
+++ b/dev/tasks/linux-packages/apache-arrow-apt-source/debian/control
@@ -1,4 +1,4 @@
-Source: apache-arrow-archive-keyring
+Source: apache-arrow-apt-source
Section: misc
Priority: important
Maintainer: Apache Arrow Developers <dev@arrow.apache.org>
@@ -9,9 +9,11 @@
Standards-Version: 3.9.7
Homepage: https://arrow.apache.org/
-Package: apache-arrow-archive-keyring
+Package: apache-arrow-apt-source
Section: misc
Architecture: all
+Replaces: apache-arrow-archive-keyring
+Breaks: apache-arrow-archive-keyring
Depends:
${misc:Depends},
apt-transport-https,
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/copyright b/dev/tasks/linux-packages/apache-arrow-apt-source/debian/copyright
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/copyright
rename to dev/tasks/linux-packages/apache-arrow-apt-source/debian/copyright
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/rules b/dev/tasks/linux-packages/apache-arrow-apt-source/debian/rules
similarity index 75%
rename from dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/rules
rename to dev/tasks/linux-packages/apache-arrow-apt-source/debian/rules
index ec0e386..bf7a85c 100755
--- a/dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/rules
+++ b/dev/tasks/linux-packages/apache-arrow-apt-source/debian/rules
@@ -12,22 +12,22 @@
override_dh_auto_build:
gpg \
--no-default-keyring \
- --keyring ./apache-arrow-archive-keyring.gpg \
+ --keyring ./apache-arrow-apt-source.gpg \
--import KEYS
( \
distribution=$$(lsb_release --id --short | tr 'A-Z' 'a-z'); \
code_name=$$(lsb_release --codename --short); \
echo "Types: deb deb-src"; \
- echo "URIs: https://apache.bintray.com/arrow/$${distribution}/"; \
+ echo "URIs: https://apache.jfrog.io/artifactory/arrow/$${distribution}/"; \
echo "Suites: $${code_name}"; \
echo "Components: main"; \
- echo "Signed-By: /usr/share/keyrings/apache-arrow-archive-keyring.gpg"; \
+ echo "Signed-By: /usr/share/keyrings/apache-arrow-apt-source.gpg"; \
) > apache-arrow.sources
override_dh_install:
install -d debian/tmp/usr/share/keyrings/
- install -m 0644 apache-arrow-archive-keyring.gpg \
+ install -m 0644 apache-arrow-apt-source.gpg \
debian/tmp/usr/share/keyrings/
install -d debian/tmp/etc/apt/sources.list.d/
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/source/format b/dev/tasks/linux-packages/apache-arrow-apt-source/debian/source/format
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/source/format
rename to dev/tasks/linux-packages/apache-arrow-apt-source/debian/source/format
diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/changelog b/dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/changelog
deleted file mode 100644
index 22fba76..0000000
--- a/dev/tasks/linux-packages/apache-arrow-archive-keyring/debian/changelog
+++ /dev/null
@@ -1,29 +0,0 @@
-apache-arrow-archive-keyring (3.0.0-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Krisztián Szűcs <szucs.krisztian@gmail.com> Mon, 18 Jan 2021 21:33:18 -0000
-
-apache-arrow-archive-keyring (2.0.0-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Krisztián Szűcs <szucs.krisztian@gmail.com> Mon, 12 Oct 2020 23:38:01 -0000
-
-apache-arrow-archive-keyring (1.0.0-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Krisztián Szűcs <szucs.krisztian@gmail.com> Mon, 20 Jul 2020 20:41:07 -0000
-
-apache-arrow-archive-keyring (0.17.0-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Krisztián Szűcs <szucs.krisztian@gmail.com> Thu, 16 Apr 2020 12:05:43 -0000
-
-apache-arrow-archive-keyring (0.16.0-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Krisztián Szűcs <szucs.krisztian@gmail.com> Thu, 30 Jan 2020 20:21:44 -0000
diff --git a/dev/tasks/linux-packages/travis.linux.arm64.yml b/dev/tasks/linux-packages/travis.linux.arm64.yml
index aba6041..cf8bed3 100644
--- a/dev/tasks/linux-packages/travis.linux.arm64.yml
+++ b/dev/tasks/linux-packages/travis.linux.arm64.yml
@@ -95,7 +95,7 @@
- rake version:update
- |
rake docker:pull || :
- - pushd apache-arrow-archive-keyring/apt
+ - pushd apache-arrow-apt-source/apt
- |
for target in debian-* ubuntu-*; do
cp -a ${target} ${target}-arm64
