summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2025-04-18 19:39:34 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-04-24 11:27:06 +0100
commit21a6fe43bfa04beb6a7051dcd741c18c3ea34919 (patch)
treef0946db81faf95b07a65a566899503e1f9cb85bc
parentced2a38e19afcb8cb1afbf5517168490bfce6afa (diff)
downloadpoky-21a6fe43bfa04beb6a7051dcd741c18c3ea34919.tar.gz
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). (From OE-Core rev: 04d00d69941a9d09bfbb0956186db7a7d0961327) 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>
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 4c1d42e0af..45b67bf168 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -43,6 +43,8 @@ do_configure:prepend () {
43 # update dselect/po and scripts/po 43 # update dselect/po and scripts/po
44 cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/dselect/po/ 44 cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/dselect/po/
45 cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/scripts/po/ 45 cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/scripts/po/
46
47 [ ! -e ${S}/.dist-version ] && echo ${PV} > ${S}/.dist-version
46} 48}
47 49
48do_install:append () { 50do_install:append () {