Date: Mon, 25 Jan 2021 11:24:20 +0100 From: Mathieu Arnold <mat@freebsd.org> 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: <20210125102420.t436xigpqakigb27@aching.in.mat.cc> In-Reply-To: <202101241716.10OHGG26045422@repo.freebsd.org> References: <202101241716.10OHGG26045422@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--tvwnd34dq6fpkei4 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jan 24, 2021 at 05:16:16PM +0000, Rene Ladan wrote: > 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 PORTREVISI= ON. > =20 > Add new drm-fbsd13-kmod to the conflict lists of the other ports. > Be pedantic about version boundaries. I don't think CONFLICTS_INSTALL is correct. Only one of the 11.2, 12.0 and 13 can be installed at the same time, because they need 11.x, 12.x or 13.x. > 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 (r56= 2490) > +++ head/graphics/drm-current-kmod/Makefile Sun Jan 24 17:16:15 2021 (r56= 2491) > @@ -19,6 +19,7 @@ RUN_DEPENDS=3D gpu-firmware-kmod>=3Dg20200914:graphics/= 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 (r5624= 90) > +++ head/graphics/drm-devel-kmod/Makefile Sun Jan 24 17:16:15 2021 (r5624= 91) > @@ -19,6 +19,7 @@ RUN_DEPENDS=3D gpu-firmware-kmod>=3Dg20200914:graphics/= 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 (r5= 62490) > +++ head/graphics/drm-fbsd11.2-kmod/Makefile Sun Jan 24 17:16:15 2021 (r5= 62491) > @@ -18,6 +18,7 @@ RUN_DEPENDS=3D gpu-firmware-kmod>=3Dg20180319:graphics/= 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 (r5= 62490) > +++ head/graphics/drm-fbsd12.0-kmod/Makefile Sun Jan 24 17:16:15 2021 (r5= 62491) > @@ -18,6 +18,7 @@ RUN_DEPENDS=3D gpu-firmware-kmod>=3Dg20180319:graphics/= 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 || ${OSVERSION} >= 1300000) > +.if ${OPSYS} =3D=3D FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSION} >= =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-fbsd11.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 > +RUN_DEPENDS=3D ${KMODDIR}/drm.ko:graphics/drm-fbsd13-kmod > +.elif ${OSVERSION} >=3D 1400000 > RUN_DEPENDS=3D ${KMODDIR}/drm.ko:graphics/drm-current-kmod > .else > IGNORE=3D not supported for this configuration >=20 --=20 Mathieu Arnold --tvwnd34dq6fpkei4 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAmAOnE9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgJ7bg/9GyLnJHXl+okt1YXcyKm4u3CVKN5Ex2vDrKPh2gOmlAtsZ+H0mX3xuoxb mTVHqxx5VPmN9MAWdwRGXI8d8hHM5FnnBX4JU9J4y7plu30dXTavQShrR8mw3pvV yYxt8X1FaW+EsFgL6dVusYmrrBkSdvj6nxApPvBdIhLFE7EPHwq78eTBhO0NQFZN Apnf/wtXVWVBiCa10EKT2G+hvPxKfO7hRCAtSXQvMnA6zG/cmPeO23q6m8kFkTpU B5GeFx4+bbx0Gwy3REslBJRIGFzSjcQmmxLGvQ7zroQg36Ai/5IOFK60V6jx0PlX GRb+TnzMpGodEGwtoL0t0GbNhP6pmXcpP3bqkilA7vdJKnqg0zkienxKVktc+fme WEroD+FRibFT1iF600K2S66SLKzeUfuZWo1YwQ1YDTgQ5r6CG8Xw+6Le6CRY/SjI YcyFfTtSYWOb5v+KYmPzRGWupIkAcsWHI9Z1OuzSJqcLLhcrHsGB2W+GGIq/oZ70 YkfF6YX1vMumQT1+dqo8pDyd7sKNwWNa7/kbeTCrrsB90I0XKBiKt00I1iVnXKQ6 92FWEP6P9RyrFQr+Mz5YeV16L0DZBMhs+yLfpNx8/7RKDKOQz0QBi6p05M7V6Ayd 0rn10B8STEVAnRSAGOhK0kAM4XodNB/6xVJnBjJz7V2d5qBs9z4= =dVxX -----END PGP SIGNATURE----- --tvwnd34dq6fpkei4--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210125102420.t436xigpqakigb27>