From 04d00d69941a9d09bfbb0956186db7a7d0961327 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 18 Apr 2025 19:39:34 +0800 Subject: [PATCH] dpkg: drop suffix from version number The current dpkg runtime version is generated by 'git describe' command in build-aux/get-version. But since we have made changes to git repo locally, it adds a -dirty suffix to the version number. Add a .dist-version file in the source directory. Then get-version can determine the version through .dist-version instead of "git describe" command, thus removing the -dirty suffix. Before the fix: $ dpkg --version Debian 'dpkg' package management program version 1.22.11-dirty (amd64). After the fix: $ dpkg --version Debian 'dpkg' package management program version 1.22.11 (amd64). Signed-off-by: Yi Zhao Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-devtools/dpkg/dpkg.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 4c1d42e0af9..45b67bf168f 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -43,6 +43,8 @@ do_configure:prepend () { # update dselect/po and scripts/po cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/dselect/po/ cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/scripts/po/ + + [ ! -e ${S}/.dist-version ] && echo ${PV} > ${S}/.dist-version } do_install:append () { -- 2.47.3