From f01911d0e2811ff270a9bb7e1bf976f6b99cbab6 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Thu, 28 Jul 2022 15:38:45 +0000 Subject: [PATCH] AUR: further solve `.SRCINFO` issues Due to the release CI job running on an Ubuntu machine, we do not have easy access to `makepkg` to generate the `.SRCINFO` using `--printsrcinfo` as this is a `pacman` specific utility, and instead we maintain a template. Historically seen, something went wrong here while the `PKGBUILD` file became more complex and certain fields added there were not _also_ included in the `.SRCINFO` template. This commit ensures everything is restored to working state, and provides the proper fix for what was attempted in #2917. In addition, checksums are now included in the file. Signed-off-by: Hidde Beydals --- .github/aur/flux-bin/.SRCINFO.template | 14 ++++++++++---- .github/aur/flux-bin/PKGBUILD.template | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/aur/flux-bin/.SRCINFO.template b/.github/aur/flux-bin/.SRCINFO.template index 4cf609cee4..10aafed729 100644 --- a/.github/aur/flux-bin/.SRCINFO.template +++ b/.github/aur/flux-bin/.SRCINFO.template @@ -8,9 +8,15 @@ pkgbase = flux-bin arch = armv7h arch = aarch64 license = APACHE - source_x86_64 = ${pkgname}-${pkgver}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_amd64.tar.gz - source_armv6h = ${pkgname}-${pkgver}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_arm.tar.gz - source_armv7h = ${pkgname}-${pkgver}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_arm.tar.gz - source_aarch64 = ${pkgname}-${pkgver}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_arm64.tar.gz + optdepends = bash-completion: auto-completion for flux in Bash + optdepends = zsh-completions: auto-completion for flux in ZSH + source_x86_64 = ${PKGNAME}-${PKGVER}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${PKGVER}/flux_${PKGVER}_linux_amd64.tar.gz + sha256sums_x86_64 = ${SHA256SUM_AMD64} + source_armv6h = ${PKGNAME}-${PKGVER}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${PKGVER}/flux_${PKGVER}_linux_arm.tar.gz + sha256sums_armv6h = ${SHA256SUM_ARM} + source_armv7h = ${PKGNAME}-${PKGVER}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${PKGVER}/flux_${PKGVER}_linux_arm.tar.gz + sha256sums_armv7h = ${SHA256SUM_ARM} + source_aarch64 = ${PKGNAME}-${PKGVER}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${PKGVER}/flux_${PKGVER}_linux_arm64.tar.gz + sha256sums_aarch64 = ${SHA256SUM_ARM64} pkgname = flux-bin diff --git a/.github/aur/flux-bin/PKGBUILD.template b/.github/aur/flux-bin/PKGBUILD.template index f3106d1ce5..df4272d71b 100644 --- a/.github/aur/flux-bin/PKGBUILD.template +++ b/.github/aur/flux-bin/PKGBUILD.template @@ -8,8 +8,8 @@ pkgdesc="Open and extensible continuous delivery solution for Kubernetes" url="https://fluxcd.io/" arch=("x86_64" "armv6h" "armv7h" "aarch64") license=("APACHE") -optdepends=('bash-completion: auto-completion for flux in Bash', -'zsh-completions: auto-completion for flux in ZSH') +optdepends=('bash-completion: auto-completion for flux in Bash' + 'zsh-completions: auto-completion for flux in ZSH') source_x86_64=( "${pkgname}-${pkgver}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_amd64.tar.gz" )