From fae9e49dd63f411983cc9a7f62f0fa8418797b35 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Thu, 28 Apr 2022 14:30:42 +0200 Subject: [PATCH] graphics: Delete drm-current-kmod and drm-devel-kmod For now please use drm-510-kmod and if you have problems with it please use drm-54-kmod and open a issue on https://github.com/freebsd/drm-kmod Sponsored by: Beckhoff Automation GmbH & Co. KG --- MOVED | 2 + graphics/Makefile | 2 - graphics/drm-current-kmod/Makefile | 75 - graphics/drm-current-kmod/distinfo | 3 - graphics/drm-current-kmod/pkg-descr | 5 - graphics/drm-current-kmod/pkg-message | 18 - graphics/drm-current-kmod/pkg-plist | 2340 ------------------------- graphics/drm-devel-kmod/Makefile | 57 - graphics/drm-devel-kmod/distinfo | 3 - graphics/drm-devel-kmod/pkg-descr | 6 - graphics/drm-devel-kmod/pkg-message | 22 - graphics/drm-devel-kmod/pkg-plist | 7 - 12 files changed, 2 insertions(+), 2538 deletions(-) delete mode 100644 graphics/drm-current-kmod/Makefile delete mode 100644 graphics/drm-current-kmod/distinfo delete mode 100644 graphics/drm-current-kmod/pkg-descr delete mode 100644 graphics/drm-current-kmod/pkg-message delete mode 100644 graphics/drm-current-kmod/pkg-plist delete mode 100644 graphics/drm-devel-kmod/Makefile delete mode 100644 graphics/drm-devel-kmod/distinfo delete mode 100644 graphics/drm-devel-kmod/pkg-descr delete mode 100644 graphics/drm-devel-kmod/pkg-message delete mode 100644 graphics/drm-devel-kmod/pkg-plist diff --git a/MOVED b/MOVED index 4a9ec94d3248a..6fca9d05431c2 100644 --- a/MOVED +++ b/MOVED @@ -17144,3 +17144,5 @@ security/pinentry-gnome3|security/pinentry-gnome|2022-04-30|De-versioned due to www/shttpd||2022-04-30|Has expired: Abandonware, last release over 12+ years ago mail/p5-Email-Sender-Transport-SMTPS|mail/p5-Email-Sender|2022-04-30|Has expired: Deprecated by upstream. Use Email::Sender::Transport::SMTP in mail/p5-Email-Sender instead net/gogoc||2022-04-30|Has expired: Services were discontinued in 2016 +graphics/drm-current-kmod||2022-05-01|Switched to a Linux version based naming scheme. Use graphics/drm-510-kmod +graphics/drm-devel-kmod||2022-05-01|Switched to a Linux version based naming scheme. Use graphics/drm-510-kmod diff --git a/graphics/Makefile b/graphics/Makefile index b5d543ae6c0f8..c696b3170dfaf 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -141,8 +141,6 @@ SUBDIR += drawpile SUBDIR += drm-54-kmod SUBDIR += drm-510-kmod - SUBDIR += drm-current-kmod - SUBDIR += drm-devel-kmod SUBDIR += drm-fbsd12.0-kmod SUBDIR += drm-fbsd13-kmod SUBDIR += drm-kmod diff --git a/graphics/drm-current-kmod/Makefile b/graphics/drm-current-kmod/Makefile deleted file mode 100644 index eb21f7737e0eb..0000000000000 --- a/graphics/drm-current-kmod/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# Created by: Johannes Dieterich - -PORTNAME= drm-current-kmod -PORTVERSION= 5.4.144.g20220223 -CATEGORIES= graphics kld - -MAINTAINER= x11@FreeBSD.org -COMMENT= DRM modules for the linuxkpi-based KMS components - -LICENSE= BSD2CLAUSE MIT GPLv2 -LICENSE_COMB= multi - -ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le -ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64, i386, aarch64, and powerpc64 - -RUN_DEPENDS= gpu-firmware-kmod>=g20200914:graphics/gpu-firmware-kmod - -CONFLICTS_INSTALL= drm-devel-kmod - -OPTIONS_DEFINE= DEBUG SOURCE - -SOURCE_DESC= Install kernel module sources - -OPTIONS_SUB= yes - -USES= kmod uidfix compiler:c++11-lang - -USE_GITHUB= yes -GH_ACCOUNT= freebsd -GH_PROJECT= drm-kmod -GH_TAGNAME= drm_v5.4.144_7 - -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400000 -IGNORE= not supported on older CURRENT, no kernel support -.endif -.if ${OPSYS} != FreeBSD -IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) -.endif - -.if ${ARCH} == "amd64" -PLIST_SUB+= AMDGPU="" -PLIST_SUB+= I915="" -.elif ${ARCH} == "i386" -PLIST_SUB+= AMDGPU="@comment " -PLIST_SUB+= I915="" -.elif ${ARCH} == "aarch64" || ${ARCH:Mpowerpc*} -PLIST_SUB+= AMDGPU="" -PLIST_SUB+= I915="@comment " -.else -PLIST_SUB+= AMDGPU="@comment " -PLIST_SUB+= I915="@comment " -.endif - -KMODSRC= ${STAGEDIR}${PREFIX}/sys/modules/${PORTNAME} -SRCDIRS= amd drivers drm i915 include linuxkpi radeon ttm vmwgfx vboxvideo - -PLIST_SUB+= KMODSRC="sys/modules/${PORTNAME}" - -MAKE_ENV+= MAKEOBJDIRPREFIX=${WRKSRC}/obj - -pre-build: - ${MKDIR} ${WRKSRC}/obj - (cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} obj) - -post-install-SOURCE-on: - ${MKDIR} ${KMODSRC} - ${INSTALL_DATA} ${WRKSRC}/Makefile ${KMODSRC} - ${INSTALL_DATA} ${WRKSRC}/kconfig.mk ${KMODSRC} -.for dir in ${SRCDIRS} - cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${KMODSRC} -.endfor - -.include diff --git a/graphics/drm-current-kmod/distinfo b/graphics/drm-current-kmod/distinfo deleted file mode 100644 index f651e91b3ccb0..0000000000000 --- a/graphics/drm-current-kmod/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1650961646 -SHA256 (freebsd-drm-kmod-5.4.144.g20220223-drm_v5.4.144_7_GH0.tar.gz) = eafe0404859bf4dfede13118db1cf0e5960eb5f9b2ed3cfa6eb2729c69b46d28 -SIZE (freebsd-drm-kmod-5.4.144.g20220223-drm_v5.4.144_7_GH0.tar.gz) = 18822772 diff --git a/graphics/drm-current-kmod/pkg-descr b/graphics/drm-current-kmod/pkg-descr deleted file mode 100644 index db45f57425f41..0000000000000 --- a/graphics/drm-current-kmod/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components. -Currently corresponding to Linux 5.4.114 DRM. -This version is for FreeBSD CURRENT. - -WWW: https://github.com/freebsd/drm-kmod/ diff --git a/graphics/drm-current-kmod/pkg-message b/graphics/drm-current-kmod/pkg-message deleted file mode 100644 index 93966f2154162..0000000000000 --- a/graphics/drm-current-kmod/pkg-message +++ /dev/null @@ -1,18 +0,0 @@ -[ -{ type: install - message: < - -PORTNAME= drm-devel-kmod -PORTVERSION= 5.7.19.g20220223 -CATEGORIES= graphics kld - -MAINTAINER= x11@FreeBSD.org -COMMENT= DRM modules for the linuxkpi-based KMS components (development version) - -LICENSE= BSD2CLAUSE MIT GPLv2 -LICENSE_COMB= multi - -ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le -ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64, arm64, i386, and powerpc64 - -RUN_DEPENDS= gpu-firmware-kmod>=g20200914:graphics/gpu-firmware-kmod - -CONFLICTS_INSTALL= drm-current-kmod - -OPTIONS_DEFINE= DEBUG - -USES= kmod uidfix compiler:c++11-lang - -USE_GITHUB= yes -GH_ACCOUNT= freebsd -GH_PROJECT= drm-kmod -GH_TAGNAME= drm_v5.7.19_4 - -.include - -.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1300525 || \ - (${OSVERSION} < 1400047 && ${OSVERSION} >= 1400000)) -IGNORE= not supported on older CURRENT/STABLE, no kernel support -.endif -.if ${OPSYS} != FreeBSD -IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) -.endif - -.if ${ARCH} == "amd64" -PLIST_SUB+= AMDGPU="" -PLIST_SUB+= AMDKFD="@comment " -PLIST_SUB+= I915="" -.elif ${ARCH} == "i386" -PLIST_SUB+= AMDGPU="@comment " -PLIST_SUB+= AMDKFD="@comment " -PLIST_SUB+= I915="" -.elif ${ARCH} == "aarch64" || ${ARCH:Mpowerpc*} -PLIST_SUB+= AMDGPU="" -PLIST_SUB+= AMDKFD="@comment " -PLIST_SUB+= I915="@comment " -.else -PLIST_SUB+= AMDGPU="@comment " -PLIST_SUB+= AMDKFD="@comment " -PLIST_SUB+= I915="@comment " -.endif - -.include diff --git a/graphics/drm-devel-kmod/distinfo b/graphics/drm-devel-kmod/distinfo deleted file mode 100644 index aeac05e64c7ec..0000000000000 --- a/graphics/drm-devel-kmod/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1650961877 -SHA256 (freebsd-drm-kmod-5.7.19.g20220223-drm_v5.7.19_4_GH0.tar.gz) = 69fc75f2a220754e9fae604709b7ae92692c2518fd78cbace67ae4310fe7a37b -SIZE (freebsd-drm-kmod-5.7.19.g20220223-drm_v5.7.19_4_GH0.tar.gz) = 18759424 diff --git a/graphics/drm-devel-kmod/pkg-descr b/graphics/drm-devel-kmod/pkg-descr deleted file mode 100644 index e801411f99e53..0000000000000 --- a/graphics/drm-devel-kmod/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -amdgpu, i915, and radeon DRM modules for the linuxkpi-based -KMS components. -Currently corresponding to Linux 5.5.19 DRM. -This version is the development version and only works on FreeBSD CURRENT. - -WWW: https://github.com/freebsd/drm-kmod diff --git a/graphics/drm-devel-kmod/pkg-message b/graphics/drm-devel-kmod/pkg-message deleted file mode 100644 index de3e58608cda9..0000000000000 --- a/graphics/drm-devel-kmod/pkg-message +++ /dev/null @@ -1,22 +0,0 @@ -[ -{ type: install - message: <