Skip to content

Commit

Permalink
umpf: do not set PV in series.inc
Browse files Browse the repository at this point in the history
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 <ejo@pengutronix.de>
  • Loading branch information
ejoerns committed Apr 24, 2024
1 parent 7402e07 commit 91a674b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tests/series-format-patch-bb.ref
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion umpf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 91a674b

Please sign in to comment.