Linuxulator: ports for Rocky Linux 9 #255

Awoonyaa · 2024-05-02T10:56:59Z

arrowd · 2024-05-02T11:52:13Z

@TijlCoosemans can you look at this?

TijlCoosemans · 2024-05-07T08:55:53Z

I haven't looked at everything in detail, but here are some general comments:

missing pkg-plist.aarch64 in every port, but I suggest you change Uses/linux.mk so it only defines PLIST for c7 and rename all pkg-plist.amd64 to just pkg-plist. If there are differences between the two architectures it can probably be handled with PLIST_SUB. I've been thinking about merging the pkg-plist.* files of c7 ports using the following in Uses/linux.mk. It should work for rl9 as well if you need it:

.    if ${ARCH} == aarch64
PLIST_SUB+=		AARCH64="" AMD64="@comment " I386="@comment " \
			LINUX32="@comment " LINUX64=""
.    elif ${ARCH} == amd64
PLIST_SUB+=		AARCH64="@comment " AMD64="" I386="" \
			LINUX32="" LINUX64=""
.    elif ${ARCH} == i386
PLIST_SUB+=		AARCH64="@comment " AMD64="@comment " I386="" \
			LINUX32="" LINUX64="@comment "
.    endif

missing archivers/Makefile
don't mark devel/linux-c7-strace deprecated just yet. linux-c7 is the only option to run i386 programs so it's very likely to stay in the ports tree beyond its EoL date.
rename devel/linux-strace to linux-rl9-strace
rename ftp/linux-wget to linux-rl9-wget
rename security/linux-gnupg to linux-rl9-gnupg

TijlCoosemans · 2024-05-07T08:57:22Z

Mk/Uses/linux.mk

+ && empty(NOT_FOR_ARCHS:Mamd64) && ${linux_ARGS} != rl9
 DISTFILES_amd64?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
 			${LIB_DISTNAMES_i386:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
 			${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
 			${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
 			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
 			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}
 .    endif
+.    if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mamd64)) \
+ && empty(NOT_FOR_ARCHS:Mamd64) && ${linux_ARGS} == rl9
+DISTFILES_amd64?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
+			${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
+			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
+			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}
+.    endif


Suggested change

&& empty(NOT_FOR_ARCHS:Mamd64) && ${linux_ARGS} != rl9

DISTFILES_amd64?= ${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \

${LIB_DISTNAMES_i386:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \

${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \

${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_amd64}:amd64/} \

${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \

${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}

. endif

. if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mamd64)) \

&& empty(NOT_FOR_ARCHS:Mamd64) && ${linux_ARGS} == rl9

DISTFILES_amd64?= ${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \

${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_amd64}:amd64/} \

${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \

${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}

. endif

&& empty(NOT_FOR_ARCHS:Mamd64)

. ifndef DISTFILES_amd64

. if ${linux_ARGS} == c7

DISTFILES_amd64= ${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \

${LIB_DISTNAMES_i386:S/$/${EXTRACT_SUFX_i386}:amd64,i386/}

. endif

DISTFILES_amd64+= ${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \

${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_amd64}:amd64/} \

${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \

${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}

. endif

. endif

TijlCoosemans · 2024-05-07T09:06:28Z

devel/linux_libusb/Makefile

+.if ${ARCH} == amd64 && ${FLAVOR:Mc7}
+ONLY_FOR_ARCHS+=	i386


ONLY_FOR_ARCHS isn't just for amd64. Also, is it customary to use :M with FLAVOR? I think you can just use ==.

Suggested change

.if ${ARCH} == amd64 && ${FLAVOR:Mc7}

ONLY_FOR_ARCHS+= i386

.if ${FLAVOR} == c7

ONLY_FOR_ARCHS+= i386

.endif

.if ${ARCH} == amd64 && ${FLAVOR} == c7

arrowd · 2024-05-07T19:00:31Z

missing pkg-plist.aarch64 in every port,

Right, I will go over all the ports again and add plists for aarch64.

missing archivers/Makefile

Fixed.

don't mark devel/linux-c7-strace deprecated just yet. linux-c7 is the only option to run i386 programs so it's very likely to stay in the ports tree beyond its EoL date.
rename devel/linux-strace to linux-rl9-strace
rename ftp/linux-wget to linux-rl9-wget
rename security/linux-gnupg to linux-rl9-gnupg

Let me explain. These ports do not install libraries but executables, so they can't be depended on via USE_LINUX. These ports are essentially the same as, for example, editors/linux-wps-office - it is a consumer of linux-c7 or linux-rl9 infrastructure.

I see no sense in having two ports for mostly the same wget Linux binary (although one of these would be older). The same goes for strace and gnupg.

TijlCoosemans · 2024-05-08T07:34:55Z

don't mark devel/linux-c7-strace deprecated just yet. linux-c7 is the only option to run i386 programs so it's very likely to stay in the ports tree beyond its EoL date.
rename devel/linux-strace to linux-rl9-strace
rename ftp/linux-wget to linux-rl9-wget
rename security/linux-gnupg to linux-rl9-gnupg

Let me explain. These ports do not install libraries but executables, so they can't be depended on via USE_LINUX. These ports are essentially the same as, for example, editors/linux-wps-office - it is a consumer of linux-c7 or linux-rl9 infrastructure.

I see no sense in having two ports for mostly the same wget Linux binary (although one of these would be older). The same goes for strace and gnupg.

Ports like linux-wps-office and linux-chrome have a separate upstream who tend to make sure their packages work on multiple linux distributions while rl9 strace and wget only work on rl9. In that case it's easier to have separate ports for c7 and rl9 strace than to try to support both from one port.

You can add them to linux.mk and depend on them using USE_LINUX. USE_LINUX adds RUN_DEPENDS by default.

arrowd · 2024-05-08T07:43:02Z

Sigh, you're right. That was silly of me to remove rl9 spice from these ports.

arrowd · 2024-05-11T15:32:25Z

@TijlCoosemans I have applied your suggestions and also added aarch64 pkg-plists, carefully comparing each of them to the amd64 ones. I also addressed comments from the Bugzilla PR.

Is this ready to go in?

TijlCoosemans · 2024-05-11T15:53:58Z

devel/linux_libusb/Makefile

@@ -40,7 +46,8 @@ MAKE_ENV+=	LDADD="-lrt"

 MAKE_ARGS+=	NO_WDATE_TIME=yes

-.if ${ARCH} == amd64
+.if ${FLAVOR} == c7
+ONLY_FOR_ARCHS+=	i386
 PLIST_FILES+=	usr/lib/libusb.so.3 \


This PLIST_FILES must be behind .if ${ARCH} == amd64. It corresponds to the amd64 bits in do-build and do-install below

Right, fixed.

TijlCoosemans · 2024-05-11T15:57:09Z

Mk/Uses/linux.mk

+.    endif
+.    if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mamd64)) \
+ && empty(NOT_FOR_ARCHS:Mamd64) && ${linux_ARGS} == rl9
+DISTFILES_amd64?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \


This .if block with DISTFILES_amd64 assignment should be removed. It is handled by the .if block above.

Sorry, I just blindly copied your suggested changes. Fixed.

Sponsored by: Serenity Cybersecurity, LLC Co-authored-by: Dima Panov <fluffy@FreeBSD.org>

Sponsored by: Serenity Cybersecurity, LLC

Co-authored-by: Gleb Popov <arrowd@FreeBSD.org> Sponsored by: Serenity Cybersecurity, LLC

Sponsored by: Serenity Cybersecurity, LLC

Co-authored-by: Gleb Popov <arrowd@FreeBSD.org> Sponsored by: Serenity Cybersecurity, LLC

Sponsored by: Serenity Cybersecurity, LLC

Sponsored by: Serenity Cybersecurity, LLC Co-authored-by: awoonya <mzhyneva@gmail.com>

Sponsored by: Serenity Cybersecurity, LLC

TijlCoosemans · 2024-05-11T19:41:58Z

Okay for me now.

Do you know what the .buildid files are for? They are the only difference between pkg-plist.aarch64 and pkg-plist.amd64.

arrowd · 2024-05-11T20:46:01Z

See https://access.redhat.com/documentation/ru-ru/red_hat_enterprise_linux/6/html/developer_guide/compiling-build-id

and

the build-id is a unique checksum added by the linker and computed over all "important" bits of the ELF file. Its primary use is to make sure that the core file matches the binary which produced it (build-id is located very near the start of the binary, and is included in the core for this purpose).

I thought about not installing these at all, but that is orthogonal for this PR.

Martinfx · 2024-05-12T12:07:47Z

Hello,
i have problem with this port:

===>   linux-wps-office-11.1.0.11719 depends on executable: update-desktop-database - found
===>   linux-wps-office-11.1.0.11719 depends on package: linux-rl9-libpng>0 - found
===>   linux-wps-office-11.1.0.11719 depends on package: linux-rl9-pulseaudio-libs>0 - not found
===>  Staging for linux-rl9-pulseaudio-libs-15.0
===>   linux-rl9-pulseaudio-libs-15.0 depends on package: linux-rl9-dbus-libs>0 - not found
===>  Staging for linux-rl9-dbus-libs-1.12.20_2
===>   linux-rl9-dbus-libs-1.12.20_2 depends on package: linux-rl9-expat>0 - found
===>   linux-rl9-dbus-libs-1.12.20_2 depends on package: linux-rl9-systemd-libs>0 - not found
===>  Staging for linux-rl9-systemd-libs-252_3
===>   linux-rl9-systemd-libs-252_3 depends on package: linux-rl9-elfutils-libs>0 - found
===>   linux-rl9-systemd-libs-252_3 depends on package: linux-rl9-libgcrypt>0 - found
===>   linux-rl9-systemd-libs-252_3 depends on package: linux-rl9-libgpg-error>0 - found
===>   linux-rl9-systemd-libs-252_3 depends on package: linux-rl9-lz4>0 - found
===>   linux-rl9-systemd-libs-252_3 depends on package: linux-rl9-nss>0 - not found
===>  Staging for linux-rl9-nss-3.90.0_2
===>   linux-rl9-nss-3.90.0_2 depends on package: linux-rl9-nspr>0 - not found
===>  Installing for linux-rl9-nspr-4.35.0
===>  Checking if linux-rl9-nspr is already installed
===>   Registering installation for linux-rl9-nspr-4.35.0 as automatic
pkg-static: Unable to access file /usr/ports/devel/linux-rl9-nspr/work/stage/compat/linux/usr/lib/.build-id/14/9b125ff43bfbd434104d63d60b606b92a37895:No such file or directory
pkg-static: Unable to access file /usr/ports/devel/linux-rl9-nspr/work/stage/compat/linux/usr/lib/.build-id/56/e7237b88c86e68a2a3ed3b864b01264acc4a52:No such file or directory
pkg-static: Unable to access file /usr/ports/devel/linux-rl9-nspr/work/stage/compat/linux/usr/lib/.build-id/fe/377b98f2cf7a18d0da81a30fe7d5832ce9e47f:No such file or directory
*** Error code 1

arrowd force-pushed the rocky branch from 724456a to a35d2d9 Compare May 7, 2024 07:09

TijlCoosemans reviewed May 7, 2024

View reviewed changes

arrowd force-pushed the rocky branch 2 times, most recently from 95622c8 to fc74e5d Compare May 7, 2024 17:11

arrowd force-pushed the rocky branch from fc74e5d to 413c1df Compare May 7, 2024 19:01

arrowd force-pushed the rocky branch 5 times, most recently from 570d02a to d426942 Compare May 11, 2024 15:30

TijlCoosemans reviewed May 11, 2024

View reviewed changes

arrowd and others added 12 commits May 11, 2024 19:34

Linuxulator ports: Introduce Rocky Linux 9.

3d83be3

Sponsored by: Serenity Cybersecurity, LLC Co-authored-by: Dima Panov <fluffy@FreeBSD.org>

Mk/bsd.sites.mk: Add RPM Fusion 9 master sites

0441fe0

Sponsored by: Serenity Cybersecurity, LLC

Linuxulator ports: More Rocky Linux 9 packages

7a12625

Co-authored-by: Gleb Popov <arrowd@FreeBSD.org> Sponsored by: Serenity Cybersecurity, LLC

audio/linux-rl9-opus: Add new port

5ecc419

Sponsored by: Serenity Cybersecurity, LLC

Linuxulator ports: More Rocky Linux 9 packages

cf68fcc

Sponsored by: Serenity Cybersecurity, LLC

ftp/linux-rl9-wget: Linux wget from Rocky Linux 9

3a97bfe

Sponsored by: Serenity Cybersecurity, LLC

Linuxulator ports: Add gnupg and libassuan from Rocky Linux

0944831

Sponsored by: Serenity Cybersecurity, LLC

devel/linux-rl9-libunistring: Add new port

aa6554b

Sponsored by: Serenity Cybersecurity, LLC

devel/linux-rl9-strace: add strace from Rocky Linux

16279ba

Co-authored-by: Gleb Popov <arrowd@FreeBSD.org> Sponsored by: Serenity Cybersecurity, LLC

devel/linux-rl9-libsigsegv: add new port

3efdb28

Sponsored by: Serenity Cybersecurity, LLC

devel/linux-rl9-libsigc++20: add new port

7810504

Sponsored by: Serenity Cybersecurity, LLC

devel/linux_libusb: Flavorize with c7 and rl9 flavors

90ef1a8

Sponsored by: Serenity Cybersecurity, LLC

fluffykhv and others added 5 commits May 11, 2024 19:34

Linuxulator ports: Update Rocky Linux to 9.3 and add more packages

4d640da

Sponsored by: Serenity Cybersecurity, LLC Co-authored-by: awoonya <mzhyneva@gmail.com>

audio/linux-rl9-pulseaudio-utils: add port

9cce63a

editors/linux-r7-office: Update to 2024.1.1

6678660

Sponsored by: Serenity Cybersecurity, LLC

www/linux-chrome: Add new port

e51a303

Sponsored by: Serenity Cybersecurity, LLC

Linuxulator ports: Add aarch64 support for Rocky Linux 9

cf385b8

Sponsored by: Serenity Cybersecurity, LLC

arrowd force-pushed the rocky branch from d426942 to cf385b8 Compare May 11, 2024 16:34

arrowd closed this May 12, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Linuxulator: ports for Rocky Linux 9 #255

Linuxulator: ports for Rocky Linux 9 #255

Awoonyaa commented May 2, 2024

arrowd commented May 2, 2024

TijlCoosemans commented May 7, 2024

TijlCoosemans May 7, 2024

TijlCoosemans May 7, 2024

arrowd commented May 7, 2024

TijlCoosemans commented May 8, 2024

arrowd commented May 8, 2024

arrowd commented May 11, 2024

TijlCoosemans May 11, 2024

arrowd May 11, 2024

TijlCoosemans May 11, 2024

arrowd May 11, 2024

TijlCoosemans commented May 11, 2024

arrowd commented May 11, 2024

Martinfx commented May 12, 2024

Linuxulator: ports for Rocky Linux 9 #255

Linuxulator: ports for Rocky Linux 9 #255

Conversation

Awoonyaa commented May 2, 2024

arrowd commented May 2, 2024

TijlCoosemans commented May 7, 2024

TijlCoosemans May 7, 2024

Choose a reason for hiding this comment

TijlCoosemans May 7, 2024

Choose a reason for hiding this comment

arrowd commented May 7, 2024

TijlCoosemans commented May 8, 2024

arrowd commented May 8, 2024

arrowd commented May 11, 2024

TijlCoosemans May 11, 2024

Choose a reason for hiding this comment

arrowd May 11, 2024

Choose a reason for hiding this comment

TijlCoosemans May 11, 2024

Choose a reason for hiding this comment

arrowd May 11, 2024

Choose a reason for hiding this comment

TijlCoosemans commented May 11, 2024

arrowd commented May 11, 2024

Martinfx commented May 12, 2024