From dbf4d13907e6287113f20b0bee9b4f1f0e325481 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 4 Aug 2020 11:46:27 +0200 Subject: [PATCH] treewide: avoid "More than one maintainer" error (MR 1480) Alpine's abuild is soon going to complain if an APKBUILD has more than one "Maintainer:" listed. Work around it by renaming the additional maintainers to "Co-Maintainer:". While at it, move the devicepkg reference link to the top in device-xiaomi-santoni for consistency. In postmarketOS, we require at least two maintainers for devices in main, therefore it does not make sense to drop additional maintainers from the file. In Alpine, this change was made because pkgs.alpinelinux.org apparently can't handle more than one maintainer. I looked into it, and it would require a database change to add it there, so it does not seem worth the effort. I also thought about extending abuild to add an environment variable to skip the check, but then the package would not build with plain abuild without using the env var. Related: https://gitlab.alpinelinux.org/alpine/abuild/-/commit/dd4cd9d606f5e28f382414e258af562e346c6ab5 [ci:skip-build] [ci:skip-vercheck] --- device/community/device-bq-paella/APKBUILD | 2 +- device/community/device-motorola-harpia/APKBUILD | 2 +- device/community/device-nokia-n900/APKBUILD | 2 +- device/community/device-pine64-pinephone/APKBUILD | 4 ++-- device/community/device-samsung-a3ulte/APKBUILD | 2 +- device/community/device-samsung-a5lte/APKBUILD | 2 +- device/community/device-wileyfox-crackling/APKBUILD | 2 +- device/main/device-qemu-aarch64/APKBUILD | 2 +- device/main/device-qemu-amd64/APKBUILD | 2 +- device/testing/device-samsung-a3lte/APKBUILD | 2 +- device/testing/device-xiaomi-santoni/APKBUILD | 5 ++--- 11 files changed, 13 insertions(+), 14 deletions(-) diff --git a/device/community/device-bq-paella/APKBUILD b/device/community/device-bq-paella/APKBUILD index 940b31351..cde5ff23f 100644 --- a/device/community/device-bq-paella/APKBUILD +++ b/device/community/device-bq-paella/APKBUILD @@ -1,6 +1,6 @@ # Reference: # Maintainer: Jonathan Albrieux -# Maintainer: Minecrell +# Co-Maintainer: Minecrell pkgname=device-bq-paella pkgdesc="BQ Aquaris X5" pkgver=3 diff --git a/device/community/device-motorola-harpia/APKBUILD b/device/community/device-motorola-harpia/APKBUILD index 570edf330..70368659f 100644 --- a/device/community/device-motorola-harpia/APKBUILD +++ b/device/community/device-motorola-harpia/APKBUILD @@ -1,6 +1,6 @@ # Reference: # Maintainer: Ruby Iris Juric -# Maintainer: Minecrell +# Co-Maintainer: Minecrell pkgname=device-motorola-harpia pkgdesc="Motorola Moto G4 Play" pkgver=3 diff --git a/device/community/device-nokia-n900/APKBUILD b/device/community/device-nokia-n900/APKBUILD index b93014a43..1549a9239 100644 --- a/device/community/device-nokia-n900/APKBUILD +++ b/device/community/device-nokia-n900/APKBUILD @@ -1,6 +1,6 @@ # Reference: # Maintainer: Martijn Braam -# Maintainer: Daniele Debernardi +# Co-Maintainer: Daniele Debernardi pkgname=device-nokia-n900 pkgver=6 pkgrel=0 diff --git a/device/community/device-pine64-pinephone/APKBUILD b/device/community/device-pine64-pinephone/APKBUILD index 45cad8764..c1250bffc 100644 --- a/device/community/device-pine64-pinephone/APKBUILD +++ b/device/community/device-pine64-pinephone/APKBUILD @@ -1,7 +1,7 @@ # Reference: # Maintainer: Martijn Braam -# Maintainer: Luca Weiss -# Maintainer: Bart Ribbers +# Co-Maintainer: Luca Weiss +# Co-Maintainer: Bart Ribbers pkgname=device-pine64-pinephone pkgver=0.5 pkgrel=5 diff --git a/device/community/device-samsung-a3ulte/APKBUILD b/device/community/device-samsung-a3ulte/APKBUILD index d746801d7..2adeb3034 100644 --- a/device/community/device-samsung-a3ulte/APKBUILD +++ b/device/community/device-samsung-a3ulte/APKBUILD @@ -1,6 +1,6 @@ # Reference: # Maintainer: Mis012 -# Maintainer: Minecrell +# Co-Maintainer: Minecrell pkgname=device-samsung-a3ulte pkgdesc="Samsung Galaxy A3 (SM-A300FU)" pkgver=3 diff --git a/device/community/device-samsung-a5lte/APKBUILD b/device/community/device-samsung-a5lte/APKBUILD index 7fb8bd73d..78764d6a8 100644 --- a/device/community/device-samsung-a5lte/APKBUILD +++ b/device/community/device-samsung-a5lte/APKBUILD @@ -1,6 +1,6 @@ # Reference: # Maintainer: Alexey Min -# Maintainer: Minecrell +# Co-Maintainer: Minecrell pkgname=device-samsung-a5lte pkgdesc="Samsung Galaxy A5 (SM-A500F)" pkgver=3 diff --git a/device/community/device-wileyfox-crackling/APKBUILD b/device/community/device-wileyfox-crackling/APKBUILD index ecfa0f608..dd778cf06 100644 --- a/device/community/device-wileyfox-crackling/APKBUILD +++ b/device/community/device-wileyfox-crackling/APKBUILD @@ -1,6 +1,6 @@ # Reference: # Maintainer: Nikita Travkin -# Maintainer: Minecrell +# Co-Maintainer: Minecrell pkgname=device-wileyfox-crackling pkgdesc="Wileyfox Swift" pkgver=3 diff --git a/device/main/device-qemu-aarch64/APKBUILD b/device/main/device-qemu-aarch64/APKBUILD index b158adc5e..0cb87a620 100644 --- a/device/main/device-qemu-aarch64/APKBUILD +++ b/device/main/device-qemu-aarch64/APKBUILD @@ -1,6 +1,6 @@ # Reference: # Maintainer: Minecrell -# Maintainer: Daniele Debernardi +# Co-Maintainer: Daniele Debernardi pkgname=device-qemu-aarch64 pkgver=2 pkgrel=1 diff --git a/device/main/device-qemu-amd64/APKBUILD b/device/main/device-qemu-amd64/APKBUILD index d03f735c9..a0fcb38dd 100644 --- a/device/main/device-qemu-amd64/APKBUILD +++ b/device/main/device-qemu-amd64/APKBUILD @@ -1,6 +1,6 @@ # Reference: # Maintainer: Minecrell -# Maintainer: Daniele Debernardi +# Co-Maintainer: Daniele Debernardi pkgname=device-qemu-amd64 pkgver=2 pkgrel=1 diff --git a/device/testing/device-samsung-a3lte/APKBUILD b/device/testing/device-samsung-a3lte/APKBUILD index 6aee54409..a71c3e5a9 100644 --- a/device/testing/device-samsung-a3lte/APKBUILD +++ b/device/testing/device-samsung-a3lte/APKBUILD @@ -1,6 +1,6 @@ # Reference: # Maintainer: Nikita Travkin -# Maintainer: Minecrell +# Co-Maintainer: Minecrell pkgname=device-samsung-a3lte pkgdesc="Samsung Galaxy A3 (SM-A300F)" pkgver=1 diff --git a/device/testing/device-xiaomi-santoni/APKBUILD b/device/testing/device-xiaomi-santoni/APKBUILD index 00ba373dd..195559be9 100644 --- a/device/testing/device-xiaomi-santoni/APKBUILD +++ b/device/testing/device-xiaomi-santoni/APKBUILD @@ -1,7 +1,6 @@ -# Maintainer: Asriel Dreemurr -# Maintainer: Danct12 - # Reference: +# Maintainer: Asriel Dreemurr +# Co-Maintainer: Danct12 pkgname=device-xiaomi-santoni pkgdesc="Xiaomi Redmi 4X" pkgver=0.6