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