diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2013-03-02 16:02:57 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2013-03-02 16:02:57 +0000 |
| commit | 305afd73dceba3aa0975dcdf3278839d204e7c6d (patch) | |
| tree | 1b2a52d5d704871be68ec6b288645637314b03d2 /x11-drivers | |
| parent | Move to new dev-qt category (diff) | |
| download | gentoo-2-305afd73dceba3aa0975dcdf3278839d204e7c6d.tar.gz gentoo-2-305afd73dceba3aa0975dcdf3278839d204e7c6d.tar.bz2 gentoo-2-305afd73dceba3aa0975dcdf3278839d204e7c6d.zip | |
Revert non-maintainer changes per bug #447566.
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)
Diffstat (limited to 'x11-drivers')
5 files changed, 8 insertions, 84 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index 77156caa0ebf..4af3244df8cf 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.426 2013/03/02 11:30:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.427 2013/03/02 16:02:57 cardoe Exp $ + + 02 Mar 2013; Doug Goldstein <cardoe@gentoo.org> + -files/nvidia-drivers-313.18-builddir-config.patch, + -files/nvidia-drivers-313.18-linux-3.7+.patch, + -files/nvidia-drivers-313.18-linux-3.8+.patch, nvidia-drivers-313.18.ebuild: + Revert non-maintainer changes per bug #447566. 02 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> nvidia-drivers-313.18.ebuild, +files/nvidia-drivers-313.18-linux-3.8+.patch: diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-builddir-config.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-builddir-config.patch deleted file mode 100644 index 65c6f67154b1..000000000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-builddir-config.patch +++ /dev/null @@ -1,42 +0,0 @@ -the .config file is found in the output dir, not the source dir. -search for it in the right place to fix kernels that are built -via standard out-of-tree methods (KBUILD_OUTPUT). - ---- a/kernel/conftest.sh -+++ b/kernel/conftest.sh -@@ -63,7 +63,7 @@ test_xen() { - XEN_PRESENT=0 - fi - else -- CONFIG=$HEADERS/../.config -+ CONFIG=$OUTPUT/.config - if [ -f $CONFIG ]; then - if [ -z "$(grep "^CONFIG_XEN=y" $CONFIG)" ]; then - XEN_PRESENT="0" -@@ -1688,7 +1688,7 @@ case "$6" in - rm -f conftest.h - else - MAKEFILE=$HEADERS/../Makefile -- CONFIG=$HEADERS/../.config -+ CONFIG=$OUTPUT/.config - - if [ -f $MAKEFILE -a -f $CONFIG ]; then - # -@@ -1857,7 +1857,7 @@ case "$6" in - rm -f conftest$$.c conftest$$.o - rm -f conftest.h - else -- CONFIG=$HEADERS/../.config -+ CONFIG=$OUTPUT/.config - if [ -f $CONFIG ]; then - if [ -z "$(grep "^CONFIG_FB_RIVA=y" $CONFIG)" ]; then - RET=0 -@@ -1923,7 +1923,7 @@ case "$6" in - rm -f conftest$$.c conftest$$.o - rm -f conftest.h - else -- CONFIG=$HEADERS/../.config -+ CONFIG=$OUTPUT/.config - if [ -f $CONFIG ]; then - if [ -z "$(grep "^CONFIG_FB_NVIDIA=y" $CONFIG)" ]; then - RET=0 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-linux-3.7+.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-linux-3.7+.patch deleted file mode 100644 index 024ca348121c..000000000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-linux-3.7+.patch +++ /dev/null @@ -1,24 +0,0 @@ -the nvidia drivers are trying to test for version 2.6.6, but fail to take into -account the first digit. so 3.7.0+ ends up failing the test. - -https://bugs.gentoo.org/447566 - ---- a/kernel/conftest.sh -+++ b/kernel/conftest.sh -@@ -1697,13 +1697,15 @@ - # kernel older than 2.6.6, that's all we require to - # build the module. - # -+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) - PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) - SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) - -- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ -+ if [ -n "$VERSION" -a $VERSION -ge 3 ] || \ -+ [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ - -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then - SELECTED_MAKEFILE=Makefile.kbuild - RET=0 - fi - fi - fi diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-linux-3.8+.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-linux-3.8+.patch deleted file mode 100644 index 80298c8ecf59..000000000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-linux-3.8+.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/447566 - ---- a/kernel/conftest.sh -+++ b/kernel/conftest.sh -@@ -160,6 +160,7 @@ build_cflags() { - - if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then - CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" -+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include/uapi" - CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated" - CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi" - elif [ "$ARCH" = "arm" ]; then --- diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-313.18.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-313.18.ebuild index 2067966cb282..1fd8434cec92 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-313.18.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-313.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-313.18.ebuild,v 1.5 2013/03/02 11:30:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-313.18.ebuild,v 1.6 2013/03/02 16:02:57 cardoe Exp $ EAPI=5 @@ -156,9 +156,6 @@ src_prepare() { epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch fi - epatch "${FILESDIR}"/${PN}-313.18-builddir-config.patch - epatch "${FILESDIR}"/${PN}-313.18-linux-3.{7,8}+.patch #447566 - # Allow user patches so they can support RC kernels and whatever else epatch_user } |