Date: Sun, 25 Feb 2024 00:13:00 +0900 From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> To: Vladimir Kondratyev <wulf@FreeBSD.org> Cc: dev-commits-ports-main@freebsd.org Subject: Re: git: 0d8479ccccca - main - graphics/drm-61-kmod: Update to drm_v6.1.69_1 Message-ID: <20240225001300.a98d998624e721124c892751@dec.sakura.ne.jp>
next in thread | raw e-mail | index | archive | help
Hi.
I'm not using any of graphics/[nvidia-]drm-*-kmod ports, though,
but happen to see this commit message.
This seems to ignore 1400508 <= ${OSVERSION} < 1500000.
A "!" (not) should be missing in the logic.
> The branch main has been updated by wulf:
>
> URL:
https://cgit.FreeBSD.org/ports/commit/?id=0d8479cccccad632779b640524cdb4d156fb7431
>
> commit 0d8479cccccad632779b640524cdb4d156fb7431
> Author: Vladimir Kondratyev <wulf@FreeBSD.org>
> AuthorDate: 2024-02-24 13:29:50 +0000
> Commit: Vladimir Kondratyev <wulf@FreeBSD.org>
> CommitDate: 2024-02-24 13:52:15 +0000
>
> graphics/drm-61-kmod: Update to drm_v6.1.69_1
> - Allow build on recent 14-STABLE
> - Fix https://github.com/freebsd/drm-kmod/issues/277
> - Attempt to fix PR/274770
>
> Sponsored by: Serenity Cyber Security, LLC
> Approved by: x11 (manu, implicit)
> ---
> graphics/drm-61-kmod/Makefile | 7 ++++---
> graphics/drm-61-kmod/Makefile.version | 2 +-
> graphics/drm-61-kmod/distinfo | 6 +++---
> graphics/drm-61-kmod/pkg-descr | 3 ++-
> 4 files changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/graphics/drm-61-kmod/Makefile
b/graphics/drm-61-kmod/Makefile
> index 43f0d5be31aa..1327241c9177 100644
> --- a/graphics/drm-61-kmod/Makefile
> +++ b/graphics/drm-61-kmod/Makefile
> @@ -1,5 +1,6 @@
> PORTNAME= drm-61-kmod
> PORTVERSION= ${DRM_KMOD_DISTVERSION}
> +PORTREVISION= 1
> CATEGORIES= graphics kld
>
> .include "Makefile.version"
> @@ -15,7 +16,7 @@ ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le
> ONLY_FOR_ARCHS_REASON= the new KMS components are only
supported on amd64 and powerpc64
>
> CONFLICTS_INSTALL= drm-510-kmod \
> - drm-61-kmod
> + drm-515-kmod
>
> USES= kmod uidfix compiler:c++11-lang
>
> @@ -26,8 +27,8 @@ GH_TAGNAME= ${DRM_KMOD_GH_TAGNAME}
>
> .include <bsd.port.options.mk>
>
> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500008
> -IGNORE= not supported on older than 15.0, no kernel
support
> +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500008 || ( $
{OSVERSION} >= 1400508 && ${OSVERSION} < 1500000 )
This should be
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500008 || !( $
{OSVERSION} >= 1400508 && ${OSVERSION} < 1500000 )
> +IGNORE= not supported on older than 14-STABLE 1400508,
no kernel support
> .endif
> .if ${OPSYS} != FreeBSD
> IGNORE= not supported on anything but FreeBSD (missing
linuxkpi functionality)
(snip)
--
Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20240225001300.a98d998624e721124c892751>