From: Yi Zhao <yi.zhao@windriver.com>
Date: Fri, 18 Apr 2025 11:39:34 +0000 (+0800)
Subject: dpkg: drop suffix from version number
X-Git-Tag: uninative-4.8~692
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04d00d69941a9d09bfbb0956186db7a7d0961327;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

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 <yi.zhao@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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 () {