[gentoo-commits] gentoo-x86 commit in x11-base/x11-drm: x11-drm-20060608-r1.ebuild x11-drm-20071019.ebuild ChangeLog x11-drm-20060608.ebuild x11-drm-20070314.ebuild x11-drm-20080710.ebuild

[Bryan Stine (battousai)]

battousai    08/09/13 01:12:14

  Modified:             x11-drm-20060608-r1.ebuild x11-drm-20071019.ebuild
                        ChangeLog x11-drm-20060608.ebuild
                        x11-drm-20070314.ebuild x11-drm-20080710.ebuild
  Log:
  20060608(-r1) patchball 0.4. Remove modules.d for all ebuilds. Fixes: #165553, #204985, #214035, #218419.
  (Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64)

Revision  Changes    Path
1.9                  x11-base/x11-drm/x11-drm-20060608-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20060608-r1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20060608-r1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20060608-r1.ebuild?r1=1.8&r2=1.9

Index: x11-drm-20060608-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608-r1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- x11-drm-20060608-r1.ebuild	11 Jul 2008 02:51:08 -0000	1.8
+++ x11-drm-20060608-r1.ebuild	13 Sep 2008 01:12:14 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608-r1.ebuild,v 1.8 2008/07/11 02:51:08 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608-r1.ebuild,v 1.9 2008/09/13 01:12:14 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -26,7 +26,7 @@
 RESTRICT="strip"
 
 S="${WORKDIR}/drm"
-PATCHVER="0.3"
+PATCHVER="0.4"
 PATCHDIR="${WORKDIR}/patch"
 EXCLUDED="${WORKDIR}/excluded"
 
@@ -129,20 +129,22 @@
 		K_RV=${CHOST/*-freebsd/}
 	elif use kernel_linux
 	then
-		linux-mod_pkg_setup
-
 		if kernel_is 2 6
 		then
-			linux_chkconfig_builtin "DRM" && \
-				die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
-
-			CONFIG_CHECK="AGP"
+			CONFIG_CHECK="!DRM AGP"
+			ERROR_DRM="Please disable the Direct Rendering Manager in the kernel config. (CONFIG_DRM)"
 			ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
+
+			kernel_is ge 2 6 25 && \
+				CONFIG_CHECK="${CONFIG_CHECK} ~UNUSED_SYMBOLS" \
+				ERROR_UNUSED_SYMBOLS="Please enable unused/obsolete exported symbols in your kernel config (CONFIG_UNUSED_SYMBOLS). These modules will not load otherwise."
 		elif kernel_is 2 4
 		then
 			CONFIG_CHECK="DRM"
 			ERROR_DRM="Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
 		fi
+
+		linux-mod_pkg_setup
 	fi
 }
 
@@ -315,11 +317,6 @@
 
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)
 	strip_bins \/lib\/modules
-
-	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
-	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' "${FILESDIR}"/modules.d-${PN} > "${D}"/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV_FULL}':g' "${D}"/etc/modules.d/${PN}
 }
 
 src_install_freebsd() {
@@ -338,5 +335,14 @@
 	if use kernel_linux
 	then
 		linux-mod_pkg_postinst
+
+		elog "Having in-kernel DRM modules installed can prevent x11-drm modules from being"
+		elog "loaded. It can also lead to unknown symbols in x11-drm modules, which would"
+		elog "be seen during the installation. If you experience any of those problems,"
+		elog "please ensure that the in-kernel DRM modules are not installed."
+		elog "This can be done with the following:"
+		elog "    cd ${KERNEL_DIR}"
+		elog "    make modules modules_install"
+		elog "This should allow the x11-drm modules to load and function normally."
 	fi
 }



1.3                  x11-base/x11-drm/x11-drm-20071019.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20071019.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20071019.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20071019.ebuild?r1=1.2&r2=1.3

Index: x11-drm-20071019.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20071019.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- x11-drm-20071019.ebuild	11 Jul 2008 02:51:08 -0000	1.2
+++ x11-drm-20071019.ebuild	13 Sep 2008 01:12:14 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20071019.ebuild,v 1.2 2008/07/11 02:51:08 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20071019.ebuild,v 1.3 2008/09/13 01:12:14 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -128,8 +128,6 @@
 		K_RV=${CHOST/*-freebsd/}
 	elif use kernel_linux
 	then
-		linux-mod_pkg_setup
-
 		if kernel_is 2 4
 		then
 			eerror "Upstream support for 2.4 kernels has been removed, so this package will no"
@@ -137,11 +135,11 @@
 			die "Please use in-kernel DRM or switch to a 2.6 kernel."
 		fi
 
-		linux_chkconfig_builtin "DRM" && \
-			die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
-
-		CONFIG_CHECK="AGP"
+		CONFIG_CHECK="!DRM AGP"
+		ERROR_DRM="Please disable the Direct Rendering Manager in the kernel config. (CONFIG_DRM)"
 		ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
+
+		linux-mod_pkg_setup
 	fi
 }
 
@@ -309,11 +307,6 @@
 
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)
 	strip_bins \/lib\/modules
-
-	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
-	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' "${FILESDIR}"/modules.d-${PN} > "${D}"/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV_FULL}':g' "${D}"/etc/modules.d/${PN}
 }
 
 src_install_freebsd() {
@@ -332,5 +325,14 @@
 	if use kernel_linux
 	then
 		linux-mod_pkg_postinst
+
+		elog "Having in-kernel DRM modules installed can prevent x11-drm modules from being"
+		elog "loaded. It can also lead to unknown symbols in x11-drm modules, which would"
+		elog "be seen during the installation. If you experience any of those problems,"
+		elog "please ensure that the in-kernel DRM modules are not installed."
+		elog "This can be done with the following:"
+		elog "    cd ${KERNEL_DIR}"
+		elog "    make modules modules_install"
+		elog "This should allow the x11-drm modules to load and function normally."
 	fi
 }



1.61                 x11-base/x11-drm/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/ChangeLog?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/ChangeLog?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/ChangeLog?r1=1.60&r2=1.61

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ChangeLog	12 Sep 2008 21:30:21 -0000	1.60
+++ ChangeLog	13 Sep 2008 01:12:14 -0000	1.61
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/x11-drm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.60 2008/09/12 21:30:21 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.61 2008/09/13 01:12:14 battousai Exp $
+
+  13 Sep 2008; Bryan D. Stine <battousai@g.o>
+  -files/modules.d-x11-drm, x11-drm-20060608.ebuild,
+  x11-drm-20060608-r1.ebuild, x11-drm-20070314.ebuild,
+  x11-drm-20071019.ebuild, x11-drm-20080710.ebuild:
+  Bump 20060608 and -r1 to 0.4 patchball, fixing bugs #165553, #218419. Pull
+  modules.d file from all ebuilds, fixing bug #214035.
 
   12 Sep 2008; Bryan D. Stine <battousai@g.o>
   x11-drm-20070314.ebuild, x11-drm-20080710.ebuild:



1.14                 x11-base/x11-drm/x11-drm-20060608.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild?r1=1.13&r2=1.14

Index: x11-drm-20060608.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- x11-drm-20060608.ebuild	9 Oct 2007 07:36:00 -0000	1.13
+++ x11-drm-20060608.ebuild	13 Sep 2008 01:12:14 -0000	1.14
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild,v 1.13 2007/10/09 07:36:00 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild,v 1.14 2008/09/13 01:12:14 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -26,7 +26,7 @@
 RESTRICT="strip"
 
 S="${WORKDIR}/drm"
-PATCHVER="0.3"
+PATCHVER="0.4"
 PATCHDIR="${WORKDIR}/patch"
 EXCLUDED="${WORKDIR}/excluded"
 
@@ -43,19 +43,21 @@
 RDEPEND=""
 
 pkg_setup() {
-	linux-mod_pkg_setup
-
 	if kernel_is 2 6 ; then
-		linux_chkconfig_builtin "DRM" && \
-			die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
-		CONFIG_CHECK="AGP"
+		CONFIG_CHECK="!DRM AGP"
+		ERROR_DRM="Please disable the Direct Rendering Manager in the kernel config. (CONFIG_DRM)"
 		ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
 
+		kernel_is ge 2 6 25 && \
+			CONFIG_CHECK="${CONFIG_CHECK} ~UNUSED_SYMBOLS" \
+			ERROR_UNUSED_SYMBOLS="Please enable unused/obsolete exported symbols in your kernel config (CONFIG_UNUSED_SYMBOLS). These modules will not load otherwise."
 	elif kernel_is 2 4 ; then
 		CONFIG_CHECK="DRM"
 		ERROR_DRM="Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
 	fi
 
+	linux-mod_pkg_setup
+
 	# Set video cards to build for.
 	set_vidcards
 
@@ -137,11 +139,6 @@
 
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)
 	strip_bins \/lib\/modules
-
-	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
-	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' "${FILESDIR}"/modules.d-${PN} > "${D}"/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV_FULL}':g' "${D}"/etc/modules.d/${PN}
 }
 
 pkg_postinst() {
@@ -160,6 +157,15 @@
 	fi
 
 	linux-mod_pkg_postinst
+
+	elog "Having in-kernel DRM modules installed can prevent x11-drm modules from being"
+	elog "loaded. It can also lead to unknown symbols in x11-drm modules, which would"
+	elog "be seen during the installation. If you experience any of those problems,"
+	elog "please ensure that the in-kernel DRM modules are not installed."
+	elog "This can be done with the following:"
+	elog "    cd ${KERNEL_DIR}"
+	elog "    make modules modules_install"
+	elog "This should allow the x11-drm modules to load and function normally."
 }
 
 # Functions used above are defined below:



1.8                  x11-base/x11-drm/x11-drm-20070314.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild?r1=1.7&r2=1.8

Index: x11-drm-20070314.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- x11-drm-20070314.ebuild	12 Sep 2008 21:30:21 -0000	1.7
+++ x11-drm-20070314.ebuild	13 Sep 2008 01:12:14 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.7 2008/09/12 21:30:21 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.8 2008/09/13 01:12:14 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -128,8 +128,6 @@
 		K_RV=${CHOST/*-freebsd/}
 	elif use kernel_linux
 	then
-		linux-mod_pkg_setup
-
 		if kernel_is 2 4
 		then
 			eerror "Upstream support for 2.4 kernels has been removed, so this package will no"
@@ -137,11 +135,11 @@
 			die "Please use in-kernel DRM or switch to a 2.6 kernel."
 		fi
 
-		linux_chkconfig_builtin "DRM" && \
-			die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
-
-		CONFIG_CHECK="AGP"
+		CONFIG_CHECK="!DRM AGP"
+		ERROR_DRM="Please disable the Direct Rendering Manager in the kernel config. (CONFIG_DRM)"
 		ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
+
+		linux-mod_pkg_setup
 	fi
 }
 
@@ -309,11 +307,6 @@
 
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)
 	strip_bins \/lib\/modules
-
-	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
-	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' "${FILESDIR}"/modules.d-${PN} > "${D}"/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV_FULL}':g' "${D}"/etc/modules.d/${PN}
 }
 
 src_install_freebsd() {
@@ -332,5 +325,14 @@
 	if use kernel_linux
 	then
 		linux-mod_pkg_postinst
+
+		elog "Having in-kernel DRM modules installed can prevent x11-drm modules from being"
+		elog "loaded. It can also lead to unknown symbols in x11-drm modules, which would"
+		elog "be seen during the installation. If you experience any of those problems,"
+		elog "please ensure that the in-kernel DRM modules are not installed."
+		elog "This can be done with the following:"
+		elog "    cd ${KERNEL_DIR}"
+		elog "    make modules modules_install"
+		elog "This should allow the x11-drm modules to load and function normally."
 	fi
 }



1.4                  x11-base/x11-drm/x11-drm-20080710.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild?r1=1.3&r2=1.4

Index: x11-drm-20080710.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- x11-drm-20080710.ebuild	12 Sep 2008 21:30:21 -0000	1.3
+++ x11-drm-20080710.ebuild	13 Sep 2008 01:12:14 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild,v 1.3 2008/09/12 21:30:21 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild,v 1.4 2008/09/13 01:12:14 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -136,10 +136,9 @@
 			die "Please use in-kernel DRM or switch to a 2.6 kernel."
 		fi
 
-		CONFIG_CHECK="!DRM ~AGP"
+		CONFIG_CHECK="!DRM AGP"
 		ERROR_DRM="Please disable DRM in the kernel config. (CONFIG_DRM = n)"
-		ERROR_AGP="AGPGART support is not enabled in your kernel config (CONFIG_AGP).
-			This will probably be essential for direct rendering."
+		ERROR_AGP="AGPGART support is not enabled in your kernel config (CONFIG_AGP)."
 
 		linux-mod_pkg_setup
 	fi