| Message ID | 20240119113354.3000697-2-mingli.yu@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] xmlto: Remove the explicit PV setting | expand |
On Fri, 2024-01-19 at 19:33 +0800, Yu, Mingli wrote: > From: Mingli Yu <mingli.yu@windriver.com> > > The commit [b67e4e523 Improve the beta number generation.] [1] > extends the version to make it work well for no release version, > but it introduces the version inconsistency. > > Considering we mainly use a release version in oe, so remove the > added suffix to keep consistent. > > Before the patch: > # rpm -qa | grep gnupg > gnupg-gpg-2.4.3-r0.core2_64 > gnupg-2.4.3-r0.core2_64 > # gpgv --version > gpgv (GnuPG) 2.4.3-unknown > [snip] > > After the patch: > # rpm -qa | grep gnupg > gnupg-gpg-2.4.3-r0.core2_64 > gnupg-2.4.3-r0.core2_64 > # gpgv --version > gpgv (GnuPG) 2.4.3 > [snip] > > [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blobdiff;f=autogen.sh;h=2b0a5dc51a7386ef90ff6c8358d26b9cc65c0c72;hp=471193c2af6a298fdde466950061dd890feb230e;hb=b67e4e523e6d19d384e23c5bb03010caebd150e7;hpb=518d835380a2ae01d6a9cc19de92684baade96a4 > > Signed-off-by: Mingli Yu <mingli.yu@windriver.com> > --- > ...autogen.sh-Remove-the-unknown-suffix.patch | 43 +++++++++++++++++++ > meta/recipes-support/gnupg/gnupg_2.4.3.bb | 1 + > 2 files changed, 44 insertions(+) > create mode 100644 meta/recipes-support/gnupg/gnupg/0001-autogen.sh-Remove-the-unknown-suffix.patch We're not carrying a patch to do this, particularly one marked as not suitable for upstream. Please work with upstream to fix the version shown when you build a release tarball. Same for the other patch, 3/3. Cheers, Richard
> On 19 Jan 2024, at 11:33, Yu, Mingli via lists.openembedded.org <mingli.yu=eng.windriver.com@lists.openembedded.org> wrote: > file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ > file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ > file://fix-ldap.patch \ > + file://0001-autogen.sh-Remove-the-unknown-suffix.patch \ 0004-autogen.sh-fix-find-version-for-beta-checking.patch already does something similar, so the patches should be merged instead of having a series of incremental fixes. Also, as RP said, engaging with upstream here would be good. Ross
Thanks Richard and Ross's comments! I will try to send the patch to the upstream. Thanks, On 1/20/24 01:41, Ross Burton wrote: > CAUTION: This email comes from a non Wind River email account! > Do not click links or open attachments unless you recognize the sender and know the content is safe. > >> On 19 Jan 2024, at 11:33, Yu, Mingli via lists.openembedded.org <mingli.yu=eng.windriver.com@lists.openembedded.org> wrote: >> file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ >> file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ >> file://fix-ldap.patch \ >> + file://0001-autogen.sh-Remove-the-unknown-suffix.patch \ > > 0004-autogen.sh-fix-find-version-for-beta-checking.patch already does something similar, so the patches should be merged instead of having a series of incremental fixes. > > Also, as RP said, engaging with upstream here would be good. > > Ross
diff --git a/meta/recipes-support/gnupg/gnupg/0001-autogen.sh-Remove-the-unknown-suffix.patch b/meta/recipes-support/gnupg/gnupg/0001-autogen.sh-Remove-the-unknown-suffix.patch new file mode 100644 index 0000000000..05614954e0 --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg/0001-autogen.sh-Remove-the-unknown-suffix.patch @@ -0,0 +1,43 @@ +From 7bdc05ad7c2e196344565988dfc0225eeb86ec0a Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Fri, 19 Jan 2024 16:29:06 +0800 +Subject: [PATCH] autogen.sh: Remove the unknown suffix + +The commit [b67e4e523 Improve the beta number generation.] [1] +extends the version to make it work well for no release version +and introduce the below version inconsistency as below: + # rpm -qa | grep gnupg + gnupg-gpg-2.4.3-r0.core2_64 + gnupg-2.4.3-r0.core2_64 + # gpgv --version + gpgv (GnuPG) 2.4.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=gnupg.git;a=blobdiff;f=autogen.sh;h=2b0a5dc51a7386ef90ff6c8358d26b9cc65c0c72;hp=471193c2af6a298fdde466950061dd890feb230e;hb=b67e4e523e6d19d384e23c5bb03010caebd150e7;hpb=518d835380a2ae01d6a9cc19de92684baade96a4 + +Upstream-Status: Inappropriate [OE-Specific as we use a release version in oe] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autogen.sh b/autogen.sh +index 78753b5..fdaa0ad 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -237,7 +237,7 @@ if [ "$myhost" = "find-version" ]; then + rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) + else + ingit=no +- tmp="-unknown" ++ tmp="" + rev="0000000" + rvd="0" + fi +-- +2.25.1 + diff --git a/meta/recipes-support/gnupg/gnupg_2.4.3.bb b/meta/recipes-support/gnupg/gnupg_2.4.3.bb index e91ef34b7d..f50bb7c391 100644 --- a/meta/recipes-support/gnupg/gnupg_2.4.3.bb +++ b/meta/recipes-support/gnupg/gnupg_2.4.3.bb @@ -19,6 +19,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ file://fix-ldap.patch \ + file://0001-autogen.sh-Remove-the-unknown-suffix.patch \ " SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ file://relocate.patch"