Re: git: 73fdb066887d - main - devel/linux-rl9-devtools: Bump KERNELVERSION to unbreak fetch
Date: Mon, 21 Apr 2025 11:46:08 UTC
Hi Gleb,
Am 21.04.25 um 08:28 schrieb Gleb Popov:
> The branch main has been updated by arrowd:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=73fdb066887d8340925f2a0adaf5b871a9cc03f4
>
> commit 73fdb066887d8340925f2a0adaf5b871a9cc03f4
> Author: Gleb Popov <arrowd@FreeBSD.org>
> AuthorDate: 2025-04-21 05:30:33 +0000
> Commit: Gleb Popov <arrowd@FreeBSD.org>
> CommitDate: 2025-04-21 06:27:38 +0000
>
> devel/linux-rl9-devtools: Bump KERNELVERSION to unbreak fetch
> ---
> devel/linux-rl9-devtools/Makefile | 4 ++--
> devel/linux-rl9-devtools/distinfo | 20 +++++++-------------
> 2 files changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/devel/linux-rl9-devtools/Makefile b/devel/linux-rl9-devtools/Makefile
> index 54bc8073be2d..35fa0304049e 100644
> --- a/devel/linux-rl9-devtools/Makefile
> +++ b/devel/linux-rl9-devtools/Makefile
> @@ -1,6 +1,6 @@
> PORTNAME= devtools
> PORTVERSION= ${LINUX_DIST_VER}
> -PORTREVISION= 9
> +PORTREVISION= 10
> CATEGORIES= devel
>
> MAINTAINER= emulation@FreeBSD.org
> @@ -22,7 +22,7 @@ QA_ENV+= USESLIBTOOL=no
> BUVERSION= 2.35.2-54.el9
> GCCVERSION= 11.5.0-5.el9_5
> GLIBCVERSION= 2.34-125.el9_5.3
> -KERNELVERSION= 5.14.0-503.35.1.el9_5
> +KERNELVERSION= 5.14.0-503.38.1.el9_5
> MPFRVERSION= 4.1.0-7.el9
> LIBMPCVERSION= 1.2.1-4.el9
>
> diff --git a/devel/linux-rl9-devtools/distinfo b/devel/linux-rl9-devtools/distinfo
> index 29f07fa21448..a1a423bab085 100644
> --- a/devel/linux-rl9-devtools/distinfo
> +++ b/devel/linux-rl9-devtools/distinfo
> @@ -1,4 +1,4 @@
> -TIMESTAMP = 1744738548
> +TIMESTAMP = 1745213399
> SHA256 (rocky/b/binutils-2.35.2-54.el9.aarch64.rpm) = fa816c4f7479b68e0ac3fd6c26982d1c2832d70dfb4236085ff5b6bd4e2a1039
> SIZE (rocky/b/binutils-2.35.2-54.el9.aarch64.rpm) = 4983292
> SHA256 (rocky/b/binutils-2.35.2-54.el9.x86_64.rpm) = ddba97d5ad45c495cdd94188955569819dd6db2d6c927431987bad7f4c0df3b6
> @@ -37,10 +37,10 @@ SHA256 (rocky/g/glibc-devel-2.34-125.el9_5.3.x86_64.rpm) = 0365766ac33bc7dfad997
> SIZE (rocky/g/glibc-devel-2.34-125.el9_5.3.x86_64.rpm) = 25425
> SHA256 (rocky/g/glibc-headers-2.34-125.el9_5.3.x86_64.rpm) = 27390403c4a1e41c9d3097de4492374dcbebad4cca402c924ebd35f4eb26978f
> SIZE (rocky/g/glibc-headers-2.34-125.el9_5.3.x86_64.rpm) = 439533
> -SHA256 (rocky/k/kernel-headers-5.14.0-503.35.1.el9_5.aarch64.rpm) = b43a46565e063434ca5453298f3685b3c59f2ca376b1e6dce6df0c503ed75ee8
> -SIZE (rocky/k/kernel-headers-5.14.0-503.35.1.el9_5.aarch64.rpm) = 3678441
> -SHA256 (rocky/k/kernel-headers-5.14.0-503.35.1.el9_5.x86_64.rpm) = 077b1e5edee9ca882f427df588f4c8c38389bb4e862966e913dbd0297c0b27e4
> -SIZE (rocky/k/kernel-headers-5.14.0-503.35.1.el9_5.x86_64.rpm) = 3710645
> +SHA256 (rocky/k/kernel-headers-5.14.0-503.38.1.el9_5.aarch64.rpm) = a0c86d790416cb1ac4e4a283678e5f0ba47408d0cfeac5f85ed552a1b71aafa4
> +SIZE (rocky/k/kernel-headers-5.14.0-503.38.1.el9_5.aarch64.rpm) = 3680029
> +SHA256 (rocky/k/kernel-headers-5.14.0-503.38.1.el9_5.x86_64.rpm) = 02385266dd48fbeaaa11493ab231a778f77b24c3fc1aadacd57ace601f79f3c8
> +SIZE (rocky/k/kernel-headers-5.14.0-503.38.1.el9_5.x86_64.rpm) = 3712245
> SHA256 (rocky/l/libatomic-11.5.0-5.el9_5.aarch64.rpm) = 22ec15677e92a91a1aa86c9083525083f4a53c75c159e5cce496a65172f47589
> SIZE (rocky/l/libatomic-11.5.0-5.el9_5.aarch64.rpm) = 28359
> SHA256 (rocky/l/libatomic-11.5.0-5.el9_5.i686.rpm) = 74f8d01153ae3052f968fc76e4d26d71e300d35335d4c5d9c7887676cf255b3c
> @@ -65,19 +65,13 @@ SHA256 (rocky/l/libstdc++-devel-11.5.0-5.el9_5.i686.rpm) = 8dd409ea671f11c345b55
> SIZE (rocky/l/libstdc++-devel-11.5.0-5.el9_5.i686.rpm) = 2346423
> SHA256 (rocky/l/libstdc++-devel-11.5.0-5.el9_5.x86_64.rpm) = a9df7e426503b79954e995b927c528628053740956fad1c9dfb84ee44e06ddc6
> SIZE (rocky/l/libstdc++-devel-11.5.0-5.el9_5.x86_64.rpm) = 2329962
> -SHA256 (rocky/m/mpfr-4.1.0-7.el9.aarch64.rpm) = 41ce16a26c839c36cd84a836361ecd3ca4bc966bddc945af8cb70886331511ee
> -SIZE (rocky/m/mpfr-4.1.0-7.el9.aarch64.rpm) = 244002
> -SHA256 (rocky/m/mpfr-4.1.0-7.el9.x86_64.rpm) = 88e46af29bde609d8f414313d0090e30501cc38ddf5c6a1bffe34ae896ca936e
> -SIZE (rocky/m/mpfr-4.1.0-7.el9.x86_64.rpm) = 333532
> SHA256 (rocky/b/binutils-2.35.2-54.el9.src.rpm) = c6eccfb1ac99c90691953dfd97f1aabce89cf4ca83e39137ab561a0733f7853d
> SIZE (rocky/b/binutils-2.35.2-54.el9.src.rpm) = 22350808
> SHA256 (rocky/g/glibc-2.34-125.el9_5.3.src.rpm) = 185db2c8d2aab7d58ac33a5b1fb85ec2f253fe20f95dcc36beb510b205a4e1a0
> SIZE (rocky/g/glibc-2.34-125.el9_5.3.src.rpm) = 18609420
> -SHA256 (rocky/k/kernel-5.14.0-503.35.1.el9_5.src.rpm) = d6c8629d4160620dcf9454a045b8cda519ea1a84679ad7a98d41ddf93da00219
> -SIZE (rocky/k/kernel-5.14.0-503.35.1.el9_5.src.rpm) = 146394288
> +SHA256 (rocky/k/kernel-5.14.0-503.38.1.el9_5.src.rpm) = c3cf7f683ec75e8611e8562ed49497e6de87350a45f49e58924a870604c89f50
> +SIZE (rocky/k/kernel-5.14.0-503.38.1.el9_5.src.rpm) = 146398845
> SHA256 (rocky/l/libmpc-1.2.1-4.el9.src.rpm) = e0e1edc062c4d5565ebedeba87e13a661caa74d43c885c656eb5b75cf1ed3bcc
> SIZE (rocky/l/libmpc-1.2.1-4.el9.src.rpm) = 844729
> -SHA256 (rocky/m/mpfr-4.1.0-7.el9.src.rpm) = 94cb2af3328fd57d3c4f1f56f8ae856dd8ae37c0ec61de793037f5c1c7146fa3
> -SIZE (rocky/m/mpfr-4.1.0-7.el9.src.rpm) = 1554505
> SHA256 (rocky/g/gcc-11.5.0-5.el9_5.src.rpm) = 8656bacb48e097fec2c34a35460ff0338c021ac4b1b0cb3849e47f4256692095
> SIZE (rocky/g/gcc-11.5.0-5.el9_5.src.rpm) = 81864140
After your updates of emulators/linux_base-rl9 and
devel/linux-rl9-devtools, I get the following error, when I try to
rebuild devtools:
===> Registering installation for linux-rl9-devtools-9.5_10
pkg-static: Unable to access file
/usr/ports/devel/linux-rl9-devtools/work/stage/compat/linux/usr/share/doc/mpfr/BUGS:No
such file or directory
pkg-static: Unable to access file
/usr/ports/devel/linux-rl9-devtools/work/stage/compat/linux/usr/share/doc/mpfr/NEWS:No
such file or directory
pkg-static: Unable to access file
/usr/ports/devel/linux-rl9-devtools/work/stage/compat/linux/usr/share/doc/mpfr/PATCHES:No
such file or directory
pkg-static: Unable to access file
/usr/ports/devel/linux-rl9-devtools/work/stage/compat/linux/usr/share/doc/mpfr/README:No
such file or directory
*** Error code 1
Stop.
make[1]: stopped making
"/usr/ports/devel/linux-rl9-devtools/work/.install_done.devtools._compat_linux"
in /usr/ports/devel/linux-rl9-devtools
It seems you forgot to remove the mpfr entries from pkg-plist of the
amd64 version, after moving mpfr to base? The following patch helps me
to install successfully again:
diff --git a/devel/linux-rl9-devtools/pkg-plist.amd64
b/devel/linux-rl9-devtools/pkg-plist.amd64
index 20ffadef9467..c927b9d20005 100644
--- a/devel/linux-rl9-devtools/pkg-plist.amd64
+++ b/devel/linux-rl9-devtools/pkg-plist.amd64
@@ -2908,10 +2908,6 @@ usr/libexec/getconf/default
%%PORTDOCS%%usr/share/doc/libstdc++-devel/ChangeLog-2020.bz2
%%PORTDOCS%%usr/share/doc/libstdc++-devel/ChangeLog.bz2
%%PORTDOCS%%usr/share/doc/libstdc++-devel/README
-%%PORTDOCS%%usr/share/doc/mpfr/BUGS
-%%PORTDOCS%%usr/share/doc/mpfr/NEWS
-%%PORTDOCS%%usr/share/doc/mpfr/PATCHES
-%%PORTDOCS%%usr/share/doc/mpfr/README
usr/share/info/as.info.gz
usr/share/info/bfd.info.gz
usr/share/info/binutils.info.gz
Thanks for your updates! Very appreciated.
Best wishes,
Rainer