diff mbox series

[3/3] libgcrypt: Make the version consistent

Message ID 20240119113354.3000697-3-mingli.yu@windriver.com
State New
Headers show
Series [1/3] xmlto: Remove the explicit PV setting | expand

Commit Message

Yu, Mingli Jan. 19, 2024, 11:33 a.m. UTC 
From: Mingli Yu <mingli.yu@windriver.com>

The change [1] extends a -unknown suffix to version and introduces
the version inconsistency.

Before the patch:
   # rpm -qa | grep libgcrypt
   libgcrypt-1.10.3-r0.core2_64
   libgcrypt-ptest-1.10.3-r0.core2_64
   # rpm -ql libgcrypt
   /usr
   /usr/bin
   /usr/bin/mpicalc
   /usr/lib64
   /usr/lib64/libgcrypt.so.20
   /usr/lib64/libgcrypt.so.20.4.3
   # mpicalc --help
   mpicalc 2.0
   libgcrypt 1.10.3-unknown
   [snip]

After the patch:
   # rpm -qa | grep libgcrypt
   libgcrypt-1.10.3-r0.core2_64
   libgcrypt-ptest-1.10.3-r0.core2_64
   # rpm -ql libgcrypt
   /usr
   /usr/bin
   /usr/bin/mpicalc
   /usr/lib64
   /usr/lib64/libgcrypt.so.20
   /usr/lib64/libgcrypt.so.20.4.3
   # mpicalc --help
   mpicalc 2.0
   libgcrypt 1.10.3
   [snip]

[1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=0f2c6ce2;hp=86e5e06a97ae13b8bbf6923ecc76e02b9c429b46

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 ...autogen.sh-Remove-the-unknown-suffix.patch | 50 +++++++++++++++++++
 .../libgcrypt/libgcrypt_1.10.3.bb             |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 meta/recipes-support/libgcrypt/files/0001-autogen.sh-Remove-the-unknown-suffix.patch
diff mbox series

Patch

diff --git a/meta/recipes-support/libgcrypt/files/0001-autogen.sh-Remove-the-unknown-suffix.patch b/meta/recipes-support/libgcrypt/files/0001-autogen.sh-Remove-the-unknown-suffix.patch
new file mode 100644
index 0000000000..6023eb82b2
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/0001-autogen.sh-Remove-the-unknown-suffix.patch
@@ -0,0 +1,50 @@ 
+From c951a588d63d0fdf8571112a04dec5d09b27bc3c Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 18 Jan 2024 16:45:56 +0800
+Subject: [PATCH] autogen.sh: Remove the unknown suffix
+
+The commit [0f2c6ce2 build: Let configure create the VERSION file.] [1]
+extends the version to make the version inconsistent as below:
+   # rpm -qa | grep libgcrypt
+   libgcrypt-1.10.3-r0.core2_64
+   libgcrypt-ptest-1.10.3-r0.core2_64
+   # rpm -ql libgcrypt
+   /usr
+   /usr/bin
+   /usr/bin/mpicalc
+   /usr/lib64
+   /usr/lib64/libgcrypt.so.20
+   /usr/lib64/libgcrypt.so.20.4.3
+   # mpicalc --help
+   mpicalc 2.0
+   libgcrypt 1.10.3-unknown
+   [snip]
+
+Considering we mainly use a release version in oe, so remove the added
+suffix to keep consistent.
+
+[1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=0f2c6ce2;hp=86e5e06a97ae13b8bbf6923ecc76e02b9c429b46
+
+Upstream-Status: Inappropriate [OE-Specific as we use a release version in oe]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ .../libgcrypt/1.10.3/libgcrypt-1.10.3/autogen.sh                | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 9b36158..d5cccd2 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -266,7 +266,7 @@ if [ "$myhost" = "find-version" ]; then
+     else
+       ingit=no
+       beta=yes
+-      tmp="-unknown"
++      tmp=""
+       rev="0000000"
+       rvd="0"
+     fi
+-- 
+2.25.1
+
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb
index 1c4f4d6038..a2f97d08f0 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb
@@ -25,6 +25,7 @@  SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
            file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
            file://no-native-gpg-error.patch \
            file://no-bench-slope.patch \
+           file://0001-autogen.sh-Remove-the-unknown-suffix.patch \
            file://run-ptest \
            "
 SRC_URI[sha256sum] = "8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa"