Christian Heusel pushed to branch main at Arch Linux / Packaging / Packages /
rpi-imager
Commits:
52c1e52b by tuxxx at 2026-08-15T18:31:21+02:00
rpi-imager: mark patched builds with Arch Linux suffix
The package deliberately changes the upstream sources during prepare(), which
makes git describe append -dirty. Use an Arch-specific dirty marker so the
version exposed in the UI and HTTP user agent identifies the packaged build.
- - - - -
4 changed files:
- .SRCINFO
- PKGBUILD
- REUSE.toml
- + set-archlinux-version-suffix.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -26,7 +26,9 @@ pkgbase = rpi-imager
optdepends = dosfstools: SD card bootloader support
source = git+https://github.com/raspberrypi/rpi-imager.git#tag=v2.0.11
source = remove-vendoring.patch
+ source = set-archlinux-version-suffix.patch
b2sums =
8b059b1461b2c7c139dac11dbd5378f2d2120f7f1d221dd9dd31a8d15bc36d97da2a056b9dd1221ab7b032ba7f2ece5b1072a71e8727c33bb3b5e2d60cf33286
b2sums =
c74100eb29fce2bd5e54e4b7b96475b2e024e28d09098aeee573099034eaf5c406cf2e638fce85758d97ace92a35238b9fbcbe073fdf7084bbda40e900ec9a6a
+ b2sums =
514374bec639dd01a673e5b7a3f85ea88701ee4ac954c85118480732a55d44df0b7b06a4cdf41b90b309ed43eb5dd7417e7310be4765fad391df46312bf315f2
pkgname = rpi-imager
=====================================
PKGBUILD
=====================================
@@ -36,15 +36,18 @@ url="https://github.com/raspberrypi/rpi-imager";
license=("Apache-2.0")
source=("git+https://github.com/raspberrypi/rpi-imager.git#tag=v${pkgver}";
- "remove-vendoring.patch")
+ "remove-vendoring.patch"
+ "set-archlinux-version-suffix.patch")
b2sums=('8b059b1461b2c7c139dac11dbd5378f2d2120f7f1d221dd9dd31a8d15bc36d97da2a056b9dd1221ab7b032ba7f2ece5b1072a71e8727c33bb3b5e2d60cf33286'
-
'c74100eb29fce2bd5e54e4b7b96475b2e024e28d09098aeee573099034eaf5c406cf2e638fce85758d97ace92a35238b9fbcbe073fdf7084bbda40e900ec9a6a')
+
'c74100eb29fce2bd5e54e4b7b96475b2e024e28d09098aeee573099034eaf5c406cf2e638fce85758d97ace92a35238b9fbcbe073fdf7084bbda40e900ec9a6a'
+
'514374bec639dd01a673e5b7a3f85ea88701ee4ac954c85118480732a55d44df0b7b06a4cdf41b90b309ed43eb5dd7417e7310be4765fad391df46312bf315f2')
prepare() {
cd "${pkgname}"
# https://github.com/raspberrypi/rpi-imager/issues/924
patch -Np1 -i "$srcdir/remove-vendoring.patch"
+ patch -Np1 -i "$srcdir/set-archlinux-version-suffix.patch"
}
build() {
=====================================
REUSE.toml
=====================================
@@ -16,6 +16,7 @@ SPDX-License-Identifier = "0BSD"
[[annotations]]
path = [
"remove-vendoring.patch",
+ "set-archlinux-version-suffix.patch",
]
SPDX-FileCopyrightText = "rpi-imager contributors"
SPDX-License-Identifier = "Apache-2.0"
=====================================
set-archlinux-version-suffix.patch
=====================================
@@ -0,0 +1,10 @@
+diff --git a/src/cmake/GenerateVersion.cmake b/src/cmake/GenerateVersion.cmake
+index 29a3464a..15c1bc56 100644
+--- a/src/cmake/GenerateVersion.cmake
++++ b/src/cmake/GenerateVersion.cmake
+@@ -14,4 +14,4 @@ if(GIT_EXECUTABLE)
+ execute_process(
+- COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty
++ COMMAND "${GIT_EXECUTABLE}" describe --tags --always
--dirty=-archlinux
+ WORKING_DIRECTORY "${SOURCE_DIR}"
+ OUTPUT_VARIABLE GIT_DESCRIBE
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/rpi-imager/-/commit/52c1e52ba293d67e011799154a3c37323fb7d536
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/rpi-imager/-/commit/52c1e52ba293d67e011799154a3c37323fb7d536
You're receiving this email because of your account on gitlab.archlinux.org.
Manage all notifications: https://gitlab.archlinux.org/-/profile/notifications
| Help: https://gitlab.archlinux.org/help
