From 91a674bb381e32092ba20aa78183bcc291b213cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20J=C3=B6rns?= Date: Wed, 24 Apr 2024 13:27:36 +0200 Subject: [PATCH] umpf: do not set PV in series.inc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since most recipes tend to use PV in their SRC_URI and we cannot set it as a default value ('?='), it is the safest way to not set it automatically from series.inc. Users who want to have the umpf version as part of the yocto package version can set PV = "${UMPF_PV}" at an appropriate location within the recipe. Signed-off-by: Enrico Jörns --- tests/series-format-patch-bb.ref | 2 +- umpf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/series-format-patch-bb.ref b/tests/series-format-patch-bb.ref index 4b7cbee..248939f 100644 --- a/tests/series-format-patch-bb.ref +++ b/tests/series-format-patch-bb.ref @@ -15,5 +15,5 @@ SRC_URI += "\ " UMPF_BASE = "base" UMPF_VERSION = "20240314-2" -PV = "${UMPF_BASE}-${UMPF_VERSION}" +UMPF_PV = "${UMPF_BASE}-${UMPF_VERSION}" # umpf-end diff --git a/umpf b/umpf index 9bf9019..5d127de 100755 --- a/umpf +++ b/umpf @@ -1422,7 +1422,7 @@ format_patch_end() { local base_name="$(<"${STATE}/base-name")" echo "UMPF_BASE = \"${base_name//v/}\"" >&${series_out} echo "UMPF_VERSION = \"$(<"${STATE}/version")\"" >&${series_out} - echo "PV = \"\${UMPF_BASE}-\${UMPF_VERSION}\"" >&${series_out} + echo "UMPF_PV = \"\${UMPF_BASE}-\${UMPF_VERSION}\"" >&${series_out} if [ "$(head -n 1 README 2>/dev/null)" = "Linux kernel" ]; then echo "LINUX_VERSION = \"\${UMPF_BASE}\"" >&${series_out} fi