diff mbox series

[v2] autoconf: mangle PV to avoid version-goes-backwards

Message ID 20250423150746.3951901-1-ross.burton@arm.com
State New
Headers show
Series [v2] autoconf: mangle PV to avoid version-goes-backwards | expand

Commit Message

Ross Burton April 23, 2025, 3:07 p.m. UTC
I previously upgrade autoconf 2.72e (the fifth release candidate) to the
final release 2.72, but unfortunately failed to notice that the version
appears to go backwards as the package managers sort 2.72e _after_ 2.72.

We could resolve this with an epoch (via PE) but epochs are forever and
this mistake is temporary, so set a convoluted PV to fix the sorting
order that can be removed when the next major release is made.

[1] oe-core 11ff8dba0ce ("autoconf: upgrade to final 2.72 release")

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/autoconf/autoconf_2.72.bb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Richard Purdie April 23, 2025, 6:39 p.m. UTC | #1
On Wed, 2025-04-23 at 16:07 +0100, Ross Burton via lists.openembedded.org wrote:
> I previously upgrade autoconf 2.72e (the fifth release candidate) to the
> final release 2.72, but unfortunately failed to notice that the version
> appears to go backwards as the package managers sort 2.72e _after_ 2.72.
> 
> We could resolve this with an epoch (via PE) but epochs are forever and
> this mistake is temporary, so set a convoluted PV to fix the sorting
> order that can be removed when the next major release is made.
> 
> [1] oe-core 11ff8dba0ce ("autoconf: upgrade to final 2.72 release")
> 
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta/recipes-devtools/autoconf/autoconf_2.72.bb | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/autoconf/autoconf_2.72.bb b/meta/recipes-devtools/autoconf/autoconf_2.72.bb
> index f2d2781fec9..283596d556e 100644
> --- a/meta/recipes-devtools/autoconf/autoconf_2.72.bb
> +++ b/meta/recipes-devtools/autoconf/autoconf_2.72.bb
> @@ -11,8 +11,14 @@ DEPENDS:remove:class-native = "autoconf-native automake-native help2man-native"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=cc3f3a7596cb558bbd9eb7fbaa3ef16c \
>  		    file://COPYINGv3;md5=1ebbd3e34237af26da5dc08a4e440464"
>  
> +# Remove this when upgrading past 2.72, as package managers sort 2.72e (the
> +# fifth release candidate) after 2.72.
> +REALPV = "2.72"
> +PV = "2.72e+really${REALPV}"
> +S = "${WORKDIR}/${BPN}-${REALPV}"
> +
>  SRC_URI = " \
> -           ${GNU_MIRROR}/autoconf/${BP}.tar.gz \
> +           ${GNU_MIRROR}/autoconf/${BPN}-${REALPV}.tar.gz \
>             file://program_prefix.patch \
>             file://autoreconf-exclude.patch \
>             file://remove-usr-local-lib-from-m4.patch \
> 

Would setting PKGV work instead of this?

Cheers,

Richard
diff mbox series

Patch

diff --git a/meta/recipes-devtools/autoconf/autoconf_2.72.bb b/meta/recipes-devtools/autoconf/autoconf_2.72.bb
index f2d2781fec9..283596d556e 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.72.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.72.bb
@@ -11,8 +11,14 @@  DEPENDS:remove:class-native = "autoconf-native automake-native help2man-native"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cc3f3a7596cb558bbd9eb7fbaa3ef16c \
 		    file://COPYINGv3;md5=1ebbd3e34237af26da5dc08a4e440464"
 
+# Remove this when upgrading past 2.72, as package managers sort 2.72e (the
+# fifth release candidate) after 2.72.
+REALPV = "2.72"
+PV = "2.72e+really${REALPV}"
+S = "${WORKDIR}/${BPN}-${REALPV}"
+
 SRC_URI = " \
-           ${GNU_MIRROR}/autoconf/${BP}.tar.gz \
+           ${GNU_MIRROR}/autoconf/${BPN}-${REALPV}.tar.gz \
            file://program_prefix.patch \
            file://autoreconf-exclude.patch \
            file://remove-usr-local-lib-from-m4.patch \