From 89b351ddadec3d87d135c5a88888972d897d167e Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 24 Sep 2015 15:02:05 -0700 Subject: [PATCH] x11-base/nouveau-drm: removal after last rites --- profiles/package.mask | 5 - x11-base/nouveau-drm/Manifest | 2 - .../files/nouveau-drm-20100212-Makefile | 102 ----------------- .../files/nouveau-drm-20121015-Makefile | 104 ------------------ x11-base/nouveau-drm/metadata.xml | 9 -- .../nouveau-drm/nouveau-drm-20120728.ebuild | 48 -------- .../nouveau-drm/nouveau-drm-20121015.ebuild | 48 -------- 7 files changed, 318 deletions(-) delete mode 100644 x11-base/nouveau-drm/Manifest delete mode 100644 x11-base/nouveau-drm/files/nouveau-drm-20100212-Makefile delete mode 100644 x11-base/nouveau-drm/files/nouveau-drm-20121015-Makefile delete mode 100644 x11-base/nouveau-drm/metadata.xml delete mode 100644 x11-base/nouveau-drm/nouveau-drm-20120728.ebuild delete mode 100644 x11-base/nouveau-drm/nouveau-drm-20121015.ebuild diff --git a/profiles/package.mask b/profiles/package.mask index f4de355833f7..e71162cc5a28 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -226,11 +226,6 @@ app-i18n/atokx2 # via the kernel as upstream has deprecated these packages. app-emulation/kvm-kmod -# Matt Turner (22 Aug 2015) -# nouveau has been in the kernel since 2.6.33 -# Masked for removal in 30 days. -x11-base/nouveau-drm - # Lars Wendler (21 Aug 2015) # This version breaks tests in app-admin/rsyslog and # also breaks rule settings. diff --git a/x11-base/nouveau-drm/Manifest b/x11-base/nouveau-drm/Manifest deleted file mode 100644 index bc786daf06de..000000000000 --- a/x11-base/nouveau-drm/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST nouveau-drm-20120728.tar.gz 2423412 SHA256 d5ee7e49245d5eab57dd36f20439d99bb3bfe731c4133e07ea7a9e2a8bb92269 SHA512 747ff42747839371acfdecef6cada0c98fd75e856bbd3f9b1b9497a1b47144f5498a7de20d81f62f056c9b01203ab2f8bfd765280e006cab49acbfda7b315b42 WHIRLPOOL 12d376ee9b4bb054e9341d6ef97d13a6bc5f9a992eee82bbff3f974c61b4ebf89b22c09e4f85d3db4a834107ebc1cbf8665d73a6a5939b606ac8efcf58b5303f -DIST nouveau-drm-20121015.tar.gz 2484701 SHA256 6905cec49716c8b5f1881796f1190cd7eae6f73e23275e883e3d2b66a074771e SHA512 c652bc5a3b44d10a16bbd8c8cd9d7c9fd1393bc39cdeb5e350ab4995557e9c90aaa78ff317e08e47d07961a0dc6d96838db18a5b85b1dae8073dcc5157021038 WHIRLPOOL 2fba21206680799444eaf4b8b129b803f7d1c1a9c14e7ce47d5cbff240512ca90f63d017579ff1a2031f9cb5e02894f72832bc2dbe4285004dfdaae86c64b06f diff --git a/x11-base/nouveau-drm/files/nouveau-drm-20100212-Makefile b/x11-base/nouveau-drm/files/nouveau-drm-20100212-Makefile deleted file mode 100644 index 123bc5339d3e..000000000000 --- a/x11-base/nouveau-drm/files/nouveau-drm-20100212-Makefile +++ /dev/null @@ -1,102 +0,0 @@ -# This Makefile is loosely based on the drm.git/linux-core/Makefile and -# the preliminary work by Christopher James Halse Rogers. -# Edited by Pekka Paalanen - -# By default, the build is done against the running linux kernel source. -# To build against a different kernel source tree, set LINUXDIR: -# -# make LINUXDIR=/path/to/kernel/source - -# By default, it is assumed the Nouveau kernel tree is found in $PWD/../. -# To use a different path to the Nouveau kernel tree, set NOUVEAUROOTDIR: -# -# make NOUVEAUROOTDIR=/path/to/nouveau/linux-2.6 - - -ifndef LINUXDIR -RUNNING_REL := $(shell uname -r) - -LINUXDIR := $(shell if [ -e /lib/modules/$(RUNNING_REL)/source ]; then \ - echo /lib/modules/$(RUNNING_REL)/source; \ - else echo /lib/modules/$(RUNNING_REL)/build; fi) -endif - -NOUVEAUGITREMOTE ?= origin -NOUVEAUROOTDIR ?= $(CURDIR)/.. -override NOUVEAUROOTDIR := $(abspath $(NOUVEAUROOTDIR)) - -TESTFILE := include/drm/nouveau_drm.h -ifeq ($(wildcard $(NOUVEAUROOTDIR)/$(TESTFILE)),) -$(error $(NOUVEAUROOTDIR) does not look like the right kernel tree, \ - please set NOUVEAUROOTDIR) -endif - -GIT_REVISION := $(shell GIT_DIR=$(NOUVEAUROOTDIR)/.git \ - git describe --always --abbrev=17 2> /dev/null) - -DRMINC := -I$(NOUVEAUROOTDIR)/include/drm -DRMDIR := $(NOUVEAUROOTDIR)/drivers/gpu/drm -DRMCFG := \ - CONFIG_DRM=m \ - CONFIG_DRM_KMS_HELPER=m \ - CONFIG_DRM_TTM=m \ - CONFIG_DRM_NOUVEAU=m \ - CONFIG_DRM_NOUVEAU_KMS=n \ - CONFIG_DRM_NOUVEAU_BACKLIGHT=y \ - CONFIG_DRM_NOUVEAU_DEBUG=y \ - CONFIG_DRM_I2C_CH7006=m \ - CONFIG_DRM_TDFX=n \ - CONFIG_DRM_R128=n \ - CONFIG_DRM_RADEON=n \ - CONFIG_DRM_MGA=n \ - CONFIG_DRM_I810=n \ - CONFIG_DRM_I830=n \ - CONFIG_DRM_I915=n \ - CONFIG_DRM_SIS=n \ - CONFIG_DRM_SAVAGE=n \ - CONFIG_DRM_VIA=n - -EXTRA_CFLAGS := -MYEXTRA_CFLAGS := -MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_BACKLIGHT -MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_DEBUG - -ifneq ($(GIT_REVISION),) -MYEXTRA_CFLAGS += '-DGIT_REVISION=\"$(GIT_REVISION)\"' -endif - -MYPARMS := -C $(LINUXDIR) KCPPFLAGS="$(DRMINC)" SUBDIRS="$(DRMDIR)" $(DRMCFG) - -MYEXTRA_CFLAGS += $(EXTRA_CFLAGS) -ifneq ($(MYEXTRA_CFLAGS),) -MYPARMS += EXTRA_CFLAGS="$(MYEXTRA_CFLAGS)" -endif - -.PHONY: all modules install clean archive FORCE - -all: modules -FORCE: - -modules: - $(MAKE) $(MYPARMS) modules - -install: - $(MAKE) $(MYPARMS) modules_install - -clean: - $(MAKE) $(MYPARMS) clean - -archive: newttm-devel-compat.tar.gz newttm-devel.tar.gz master.tar.gz - -newttm-devel-compat.tar.gz: EXTRAS=nouveau README-nouveau - -%.tar: FORCE - GIT_DIR=$(NOUVEAUROOTDIR)/.git \ - git archive --format=tar --prefix=$*/ $(NOUVEAUGITREMOTE)/$* \ - drivers/gpu/drm include/drm $(EXTRAS) > $@ - -%.tar.gz: %.tar - gzip -9 -c $< > $@ - -# The commit id of the archive can be read with -# $ zcat foo.tar.gz | git get-tar-commit-id diff --git a/x11-base/nouveau-drm/files/nouveau-drm-20121015-Makefile b/x11-base/nouveau-drm/files/nouveau-drm-20121015-Makefile deleted file mode 100644 index 98736f8ccd26..000000000000 --- a/x11-base/nouveau-drm/files/nouveau-drm-20121015-Makefile +++ /dev/null @@ -1,104 +0,0 @@ -# This Makefile is loosely based on the drm.git/linux-core/Makefile and -# the preliminary work by Christopher James Halse Rogers. -# Edited by Pekka Paalanen - -# By default, the build is done against the running linux kernel source. -# To build against a different kernel source tree, set LINUXDIR: -# -# make LINUXDIR=/path/to/kernel/source - -# By default, it is assumed the Nouveau kernel tree is found in $PWD/../. -# To use a different path to the Nouveau kernel tree, set NOUVEAUROOTDIR: -# -# make NOUVEAUROOTDIR=/path/to/nouveau/linux-2.6 - - -ifndef LINUXDIR -RUNNING_REL := $(shell uname -r) - -LINUXDIR := $(shell if [ -e /lib/modules/$(RUNNING_REL)/source ]; then \ - echo /lib/modules/$(RUNNING_REL)/source; \ - else echo /lib/modules/$(RUNNING_REL)/build; fi) -endif - -NOUVEAUGITREMOTE ?= origin -NOUVEAUROOTDIR ?= $(CURDIR)/.. -override NOUVEAUROOTDIR := $(abspath $(NOUVEAUROOTDIR)) - -TESTFILE := include/drm/nouveau_drm.h -ifeq ($(wildcard $(NOUVEAUROOTDIR)/$(TESTFILE)),) -$(error $(NOUVEAUROOTDIR) does not look like the right kernel tree, \ - please set NOUVEAUROOTDIR) -endif - -GIT_REVISION := $(shell GIT_DIR=$(NOUVEAUROOTDIR)/.git \ - git describe --always --abbrev=17 2> /dev/null) - -DRMINC := -I$(NOUVEAUROOTDIR)/include/drm -DRMDIR := $(NOUVEAUROOTDIR)/drivers/gpu/drm -DRMCFG := \ - CONFIG_DRM=m \ - CONFIG_DRM_KMS_HELPER=m \ - CONFIG_DRM_TTM=m \ - CONFIG_DRM_NOUVEAU=m \ - CONFIG_DRM_NOUVEAU_KMS=n \ - CONFIG_DRM_NOUVEAU_BACKLIGHT=y \ - CONFIG_DRM_NOUVEAU_DEBUG=y \ - CONFIG_DRM_I2C_CH7006=m \ - CONFIG_DRM_TDFX=n \ - CONFIG_DRM_R128=n \ - CONFIG_DRM_RADEON=n \ - CONFIG_DRM_MGA=n \ - CONFIG_DRM_I810=n \ - CONFIG_DRM_I830=n \ - CONFIG_DRM_I915=n \ - CONFIG_DRM_SIS=n \ - CONFIG_DRM_SAVAGE=n \ - CONFIG_DRM_VIA=n - -EXTRA_CFLAGS := -MYEXTRA_CFLAGS := -MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_BACKLIGHT -MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_DEBUG -MYEXTRA_CFLAGS += -DCONFIG_NOUVEAU_DEBUG -MYEXTRA_CFLAGS += -DCONFIG_NOUVEAU_DEBUG_DEFAULT - -ifneq ($(GIT_REVISION),) -MYEXTRA_CFLAGS += '-DGIT_REVISION=\"$(GIT_REVISION)\"' -endif - -MYPARMS := -C $(LINUXDIR) KCPPFLAGS="$(DRMINC)" SUBDIRS="$(DRMDIR)" $(DRMCFG) - -MYEXTRA_CFLAGS += $(EXTRA_CFLAGS) -ifneq ($(MYEXTRA_CFLAGS),) -MYPARMS += EXTRA_CFLAGS="$(MYEXTRA_CFLAGS)" -endif - -.PHONY: all modules install clean archive FORCE - -all: modules -FORCE: - -modules: - $(MAKE) $(MYPARMS) modules - -install: - $(MAKE) $(MYPARMS) modules_install - -clean: - $(MAKE) $(MYPARMS) clean - -archive: newttm-devel-compat.tar.gz newttm-devel.tar.gz master.tar.gz - -newttm-devel-compat.tar.gz: EXTRAS=nouveau README-nouveau - -%.tar: FORCE - GIT_DIR=$(NOUVEAUROOTDIR)/.git \ - git archive --format=tar --prefix=$*/ $(NOUVEAUGITREMOTE)/$* \ - drivers/gpu/drm include/drm $(EXTRAS) > $@ - -%.tar.gz: %.tar - gzip -9 -c $< > $@ - -# The commit id of the archive can be read with -# $ zcat foo.tar.gz | git get-tar-commit-id diff --git a/x11-base/nouveau-drm/metadata.xml b/x11-base/nouveau-drm/metadata.xml deleted file mode 100644 index 40a4ce953dab..000000000000 --- a/x11-base/nouveau-drm/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - chithanh@gentoo.org - Chí-Thanh Christopher Nguyễn - -x11 - diff --git a/x11-base/nouveau-drm/nouveau-drm-20120728.ebuild b/x11-base/nouveau-drm/nouveau-drm-20120728.ebuild deleted file mode 100644 index a97939f93f6d..000000000000 --- a/x11-base/nouveau-drm/nouveau-drm-20120728.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -inherit linux-info linux-mod - -DESCRIPTION="Nouveau DRM Kernel Modules for X11" -HOMEPAGE="http://nouveau.freedesktop.org/" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/master - -CONFIG_CHECK="~ACPI_VIDEO ~BACKLIGHT_CLASS_DEVICE ~DEBUG_FS !DRM ~FB_CFB_FILLRECT ~FB_CFB_COPYAREA ~FB_CFB_IMAGEBLIT ~FRAMEBUFFER_CONSOLE ~!FB_NVIDIA ~!FB_RIVA ~!FB_UVESA ~!FB_VGA16 ~I2C_ALGOBIT ~MXM_WMI ~VGA_ARB" - -pkg_setup() { - linux-mod_pkg_setup - if kernel_is lt 3 5; then - eerror "You need kernel 3.5 for this version of nouveau-drm" - die "Incompatible kernel version" - fi - elog "For newer kernels newer than 2.6.32 there is integrated nouveau DRM." - elog "Use that if you experience build issues." -} - -src_compile() { - set_arch_to_kernel - emake \ - LINUXDIR="${KERNEL_DIR}" \ - NOUVEAUROOTDIR="${PWD}" \ - -f "${FILESDIR}"/${PN}-20100212-Makefile \ - || die "Compiling kernel modules failed" -} - -src_install() { - insinto /lib/modules/${KV_FULL}/${PN} - doins drivers/gpu/drm/{*/,}*.ko || die "doins failed" -} diff --git a/x11-base/nouveau-drm/nouveau-drm-20121015.ebuild b/x11-base/nouveau-drm/nouveau-drm-20121015.ebuild deleted file mode 100644 index 427d281a5c93..000000000000 --- a/x11-base/nouveau-drm/nouveau-drm-20121015.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -inherit linux-info linux-mod - -DESCRIPTION="Nouveau DRM Kernel Modules for X11" -HOMEPAGE="http://nouveau.freedesktop.org/" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/master - -CONFIG_CHECK="~ACPI_VIDEO ~BACKLIGHT_CLASS_DEVICE ~DEBUG_FS !DRM ~FB_CFB_FILLRECT ~FB_CFB_COPYAREA ~FB_CFB_IMAGEBLIT ~FRAMEBUFFER_CONSOLE ~!FB_NVIDIA ~!FB_RIVA ~!FB_UVESA ~!FB_VGA16 ~I2C_ALGOBIT ~MXM_WMI ~VGA_ARB" - -pkg_setup() { - linux-mod_pkg_setup - if kernel_is lt 3 6; then - eerror "You need kernel 3.6 for this version of nouveau-drm" - die "Incompatible kernel version" - fi - elog "For newer kernels newer than 2.6.32 there is integrated nouveau DRM." - elog "Use that if you experience build issues." -} - -src_compile() { - set_arch_to_kernel - emake \ - LINUXDIR="${KERNEL_DIR}" \ - NOUVEAUROOTDIR="${PWD}" \ - -f "${FILESDIR}"/${PN}-20100212-Makefile \ - || die "Compiling kernel modules failed" -} - -src_install() { - insinto /lib/modules/${KV_FULL}/${PN} - doins drivers/gpu/drm/{*/,}*.ko || die "doins failed" -} -- 2.26.2