Date: Sun, 24 Jan 2021 17:23:35 +0000 From: Rene Ladan <rene@freebsd.org> To: Emmanuel Vadot <manu@bidouilliste.com> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r562491 - in head/graphics: drm-current-kmod drm-devel-kmod drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-kmod Message-ID: <20210124172335.GB46858@freefall.freebsd.org> In-Reply-To: <20210124181956.ae1376dbf803cf52d7e84d55@bidouilliste.com> References: <202101241716.10OHGG26045422@repo.freebsd.org> <20210124181956.ae1376dbf803cf52d7e84d55@bidouilliste.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Jan 24, 2021 at 06:19:56PM +0100, Emmanuel Vadot wrote: > On Sun, 24 Jan 2021 17:16:16 +0000 (UTC) > Rene Ladan <rene@FreeBSD.org> wrote: > > > Author: rene > > Date: Sun Jan 24 17:16:15 2021 > > New Revision: 562491 > > URL: https://svnweb.freebsd.org/changeset/ports/562491 > > > > Log: > > Hook drm-fbsd13-kmod to the maser drm-kmod port and bump its PORTREVISION. > > > > Add new drm-fbsd13-kmod to the conflict lists of the other ports. > > Be pedantic about version boundaries. > > > > Approved by: manu (on ports-committers) > > MFH: 2021Q1 > > > > Modified: > > head/graphics/drm-current-kmod/Makefile > > head/graphics/drm-devel-kmod/Makefile > > head/graphics/drm-fbsd11.2-kmod/Makefile > > head/graphics/drm-fbsd12.0-kmod/Makefile > > head/graphics/drm-kmod/Makefile > > > > Modified: head/graphics/drm-current-kmod/Makefile > > ============================================================================== > > --- head/graphics/drm-current-kmod/Makefile Sun Jan 24 16:48:25 2021 (r562490) > > +++ head/graphics/drm-current-kmod/Makefile Sun Jan 24 17:16:15 2021 (r562491) > > @@ -19,6 +19,7 @@ RUN_DEPENDS= gpu-firmware-kmod>=g20200914:graphics/gpu > > CONFLICTS_INSTALL= drm-devel-kmod \ > > drm-fbsd11.2-kmod \ > > drm-fbsd12.0-kmod \ > > + drm-fbsd13-kmod \ > > drm-legacy-kmod > > > > OPTIONS_DEFINE= DEBUG SOURCE > > > > Modified: head/graphics/drm-devel-kmod/Makefile > > ============================================================================== > > --- head/graphics/drm-devel-kmod/Makefile Sun Jan 24 16:48:25 2021 (r562490) > > +++ head/graphics/drm-devel-kmod/Makefile Sun Jan 24 17:16:15 2021 (r562491) > > @@ -19,6 +19,7 @@ RUN_DEPENDS= gpu-firmware-kmod>=g20200914:graphics/gpu > > CONFLICTS_INSTALL= drm-current-kmod \ > > drm-fbsd11.2-kmod \ > > drm-fbsd12.0-kmod \ > > + drm-fbsd13-kmod \ > > drm-legacy-kmod > > > > OPTIONS_DEFINE= DEBUG > > > > Modified: head/graphics/drm-fbsd11.2-kmod/Makefile > > ============================================================================== > > --- head/graphics/drm-fbsd11.2-kmod/Makefile Sun Jan 24 16:48:25 2021 (r562490) > > +++ head/graphics/drm-fbsd11.2-kmod/Makefile Sun Jan 24 17:16:15 2021 (r562491) > > @@ -18,6 +18,7 @@ RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu > > > > CONFLICTS_INSTALL= drm-devel-kmod \ > > drm-fbsd12.0-kmod \ > > + drm-fbsd13-kmod \ > > drm-current-kmod \ > > drm-legacy-kmod > > > > @@ -32,7 +33,7 @@ GH_TAGNAME= d7d433d > > > > .include <bsd.port.options.mk> > > > > -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200000 > > +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 > > IGNORE= only supported on FreeBSD 11. > > .endif > > > > > > Modified: head/graphics/drm-fbsd12.0-kmod/Makefile > > ============================================================================== > > --- head/graphics/drm-fbsd12.0-kmod/Makefile Sun Jan 24 16:48:25 2021 (r562490) > > +++ head/graphics/drm-fbsd12.0-kmod/Makefile Sun Jan 24 17:16:15 2021 (r562491) > > @@ -18,6 +18,7 @@ RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu > > > > CONFLICTS_INSTALL= drm-devel-kmod \ > > drm-fbsd11.2-kmod \ > > + drm-fbsd13-kmod \ > > drm-current-kmod \ > > drm-legacy-kmod > > > > @@ -32,7 +33,7 @@ GH_TAGNAME= fa1387d > > > > .include <bsd.port.options.mk> > > > > -.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSION} > 1300000) > > +.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSION} >= 1300000) > > IGNORE= only supported on FreeBSD 12. > > .endif > > .if ${OPSYS} != FreeBSD > > > > Modified: head/graphics/drm-kmod/Makefile > > ============================================================================== > > --- head/graphics/drm-kmod/Makefile Sun Jan 24 16:48:25 2021 (r562490) > > +++ head/graphics/drm-kmod/Makefile Sun Jan 24 17:16:15 2021 (r562491) > > @@ -3,6 +3,7 @@ > > > > PORTNAME= drm-kmod > > PORTVERSION= g20190710 > > +PORTREVISION= 1 > > CATEGORIES= graphics > > > > MAINTAINER= x11@FreeBSD.org > > @@ -22,7 +23,9 @@ RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-k > > RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod > > .elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300108 > > IGNORE= not supported on older 13, no kernel support > > -.elif ${OSVERSION} >= 1300108 > > +.elif ${OSVERSION} >= 1300108 && ${OSVERSION} < 1400000 > > OSVERSION should be 1300136 here. Ah yes, because the drm-fbsd13-kmod port itself is a NOP for early 13. Should the line upper limit for the above IGNORE line also be bumped? René
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210124172335.GB46858>