[packages/xorg-driver-video-nvidia-legacy3] - removed debian hackery, it's not needed anymore - rel 3

baggins baggins at pld-linux.org
Sun Jan 5 18:24:29 CET 2014


commit 7f33c19663fcff116cba7482bfd0b2092c63277e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jan 5 18:24:13 2014 +0100

    - removed debian hackery, it's not needed anymore
    - rel 3

 conftest.h                            | 470 ----------------------------------
 conftest.sh                           |   7 -
 kbuild.patch                          |  11 -
 patches.h                             |   5 -
 xorg-driver-video-nvidia-legacy3.spec |   9 +-
 5 files changed, 1 insertion(+), 501 deletions(-)
---
diff --git a/xorg-driver-video-nvidia-legacy3.spec b/xorg-driver-video-nvidia-legacy3.spec
index 9dbf77d..6f0d759 100644
--- a/xorg-driver-video-nvidia-legacy3.spec
+++ b/xorg-driver-video-nvidia-legacy3.spec
@@ -45,7 +45,7 @@ exit 1
 %define		kpkg	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
 %define		bkpkg	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
 
-%define		rel		2
+%define		rel		3
 %define		pname		xorg-driver-video-nvidia-legacy3
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips (173.14.xx series)
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez
@@ -68,7 +68,6 @@ Source7:	conftest.sh
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-legacy-desktop.patch
 Patch2:		nvidia-blacklist-vga-pmu-registers-195.patch
-Patch3:		kbuild.patch
 URL:		http://www.nvidia.com/object/unix.html
 BuildRequires:	rpmbuild(macros) >= 1.678
 %{?with_dist_kernel:%{expand:%kbrs}}
@@ -281,12 +280,6 @@ rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-
-install %{SOURCE5} usr/src/nv/
-install %{SOURCE6} usr/src/nv/
-install -m 755 %{SOURCE7} usr/src/nv/
-echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
 
 %build
 %{?with_kernel:%{expand:%bkpkg}}
diff --git a/conftest.h b/conftest.h
deleted file mode 100644
index 8013014..0000000
--- a/conftest.h
+++ /dev/null
@@ -1,470 +0,0 @@
-/* synchronized with conftest.sh from 325.15, 319.32, 313.30, 310.51, 304.108, 295.75, 173.14.37, 96.43.23, 71.86.15 */
-
-#ifndef LINUX_VERSION_CODE
-#include <linux/version.h>
-#endif
-
-#if !defined(IS_ENABLED) && LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
-#define __ARG_PLACEHOLDER_1 0,
-#define config_enabled(cfg) _config_enabled(cfg)
-#define _config_enabled(value) __config_enabled(__ARG_PLACEHOLDER_##value)
-#define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0)
-#define ___config_enabled(__ignored, val, ...) val
-#define IS_ENABLED(option) (config_enabled(option) || config_enabled(option##_MODULE))
-#endif
-
-/* Implement conftest.sh function nvidiafb_sanity_check */
-#if IS_ENABLED(CONFIG_FB_NVIDIA)
-#warning "The nvidia module is incompatible with nvidiafb!"
-#endif
-
-/* Implement conftest.sh function xen_sanity_check */
-#if IS_ENABLED(CONFIG_XEN) && ! IS_ENABLED(CONFIG_PARAVIRT)
-#warning "Xen kernels are not supported!"
-#endif
-
-/* Implement conftest.sh function preempt_rt_sanity_check */
-#if IS_ENABLED(CONFIG_PREEMPT_RT) || IS_ENABLED(CONFIG_PREEMPT_RT_FULL)
-#warning "PREEMPT_RT kernels are not supported!"
-#endif
-
-/* Implement conftest.sh function remap_page_range */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-  #define NV_REMAP_PAGE_RANGE_PRESENT
-  #define NV_REMAP_PAGE_RANGE_ARGUMENT_COUNT 4
- #else
-  #define NV_REMAP_PAGE_RANGE_PRESENT
-  #define NV_REMAP_PAGE_RANGE_ARGUMENT_COUNT 5
- #endif
-#else
- #undef NV_REMAP_PAGE_RANGE_PRESENT
-#endif
-
-/* Implement conftest.sh function set_memory_uc */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) && IS_ENABLED(CONFIG_X86)
- #define NV_SET_MEMORY_UC_PRESENT
-#else
- #undef NV_SET_MEMORY_UC_PRESENT
-#endif
-
-/* Implement conftest.sh function set_memory_array_uc */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) && IS_ENABLED(CONFIG_X86)
- #define NV_SET_MEMORY_ARRAY_UC_PRESENT
-#else
- #undef NV_SET_MEMORY_ARRAY_UC_PRESENT
-#endif
-
-/* Implement conftest.sh function set_pages_uc */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) && IS_ENABLED(CONFIG_X86)
- #define NV_SET_PAGES_UC_PRESENT
-#else
- #undef NV_SET_PAGES_UC_PRESENT
-#endif
-
-/* Implement conftest.sh function outer_flush_all */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34) && IS_ENABLED(CONFIG_ARM)
- #define NV_OUTER_FLUSH_ALL_PRESENT
-#else
- #undef NV_OUTER_FLUSH_ALL_PRESENT
-#endif
-
-/* Implement conftest.sh function change_page_attr */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) && \
-               LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
- #define NV_CHANGE_PAGE_ATTR_PRESENT
-#else
- #undef NV_CHANGE_PAGE_ATTR_PRESENT
-#endif
-
-/* Implement conftest.sh function pci_get_class */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
- #define NV_PCI_GET_CLASS_PRESENT
-#else
- #undef NV_PCI_GET_CLASS_PRESENT
-#endif
-
-/* Implement conftest.sh function pci_get_domain_bus_and_slot */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
- #define NV_PCI_GET_DOMAIN_BUS_AND_SLOT_PRESENT
-#else
- #undef NV_PCI_GET_DOMAIN_BUS_AND_SLOT_PRESENT
-#endif
-
-/* Implement conftest.sh function remap_pfn_range */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
- #define NV_REMAP_PFN_RANGE_PRESENT
-#else
- #undef NV_REMAP_PFN_RANGE_PRESENT
-#endif
-
-/* Implement conftest.sh function agp_backend_acquire */
-/* Only kernels sometime before 2.4.0 don't have this function, and who */
-/* cares anymore */
-#define NV_AGP_BACKEND_ACQUIRE_PRESENT
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
- #define NV_AGP_BACKEND_ACQUIRE_ARGUMENT_COUNT 1
-#else
- #define NV_AGP_BACKEND_ACQUIRE_ARGUMENT_COUNT 0
-#endif
-
-/* Implement conftest.sh function vmap */
-/* I can not find any released kernel that uses the 2 argument variant */
-/* of vmap */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,22)
- #define NV_VMAP_PRESENT
- #define NV_VMAP_ARGUMENT_COUNT 4
-#else
- #undef NV_VMAP_PRESENT
-#endif
-
-/* Implement conftest.sh function i2c_adapter */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
- #define NV_I2C_ADAPTER_HAS_INC_USE
- #define NV_I2C_ADAPTER_HAS_DEC_USE
- #define NV_I2C_ADAPTER_HAS_CLIENT_REGISTER
-#else
- #undef NV_I2C_ADAPTER_HAS_INC_USE
- #undef NV_I2C_ADAPTER_HAS_DEC_USE
- #undef NV_I2C_ADAPTER_HAS_CLIENT_REGISTER
-#endif
-
-/* Implement conftest.sh function pm_message_t */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
- #define NV_PM_MESSAGE_T_PRESENT
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
-  #define NV_PM_MESSAGE_T_HAS_EVENT
- #else
-  #undef NV_PM_MESSAGE_T_HAS_EVENT
- #endif
-#else
- #undef NV_PM_MESSAGE_T_PRESENT
- #undef NV_PM_MESSAGE_T_HAS_EVENT
-#endif
-
-/* Implement conftest.sh function pci_choose_state */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
- #define NV_PCI_CHOOSE_STATE_PRESENT
-#else
- #undef NV_PCI_CHOOSE_STATE_PRESENT
-#endif
-
-/* Implement conftest.sh function vm_insert_page */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
- #define NV_VM_INSERT_PAGE_PRESENT
-#else
- #undef NV_VM_INSERT_PAGE_PRESENT
-#endif
-
-/* Implement conftest.sh function irq_handler_t */
-/* I can not find any released kernel that uses the 3 argument variant */
-/* of irq_handler_t */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
- #define NV_IRQ_HANDLER_T_PRESENT
- #define NV_IRQ_HANDLER_T_ARGUMENT_COUNT 2
-#else
- #undef NV_IRQ_HANDLER_T_PRESENT
-#endif
-
-/* Implement conftest.sh function acpi_device_ops */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) && \
-               LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)
- #define NV_ACPI_DEVICE_OPS_HAS_MATCH
-#else
- #undef NV_ACPI_DEVICE_OPS_HAS_MATCH
-#endif
-
-/* Implement conftest.sh function acpi_device_id */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
- #define NV_ACPI_DEVICE_ID_HAS_DRIVER_DATA
-#else
- #undef NV_ACPI_DEVICE_ID_HAS_DRIVER_DATA
-#endif
-
-/* Implement conftest.sh function acquire_console_sem */
-// 2.6.38 renamed {acquire,release}_console_sem() to console_{,un}lock()
-// but NVIDIA neither checks for these new names nor uses them
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,10) && \
-    LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #define NV_ACQUIRE_CONSOLE_SEM_PRESENT
-#else
- #undef NV_ACQUIRE_CONSOLE_SEM_PRESENT
-#endif
-
-/* Implement conftest.sh function kmem_cache_create */
-/* Only kernels sometime before 2.4.0 don't have this function, and who */
-/* cares anymore */
-#define NV_KMEM_CACHE_CREATE_PRESENT
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
- #define NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT 5
-#else
- #define NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT 6
-#endif
-
-/* Implement conftest.sh function smp_call_function */
-/* Only kernels sometime before 2.4.0 don't have this function, and who */
-/* cares anymore */
-#define NV_SMP_CALL_FUNCTION_PRESENT
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
- #define NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT 3
-#else
- #define NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT 4
-#endif
-
-/* Implement conftest.sh function on_each_cpu */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
- #define NV_ON_EACH_CPU_PRESENT
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-  #define NV_ON_EACH_CPU_ARGUMENT_COUNT 3
- #else
-  #define NV_ON_EACH_CPU_ARGUMENT_COUNT 4
- #endif
-#else
- #undef NV_ON_EACH_CPU_PRESENT
-#endif
-
-/* Implement conftest.sh function vmm_support */
-/* nv-xen.h does not exist */
-#undef HAVE_NV_XEN
-
-/* Implement conftest.sh function nvmap_support */
-/* nv-android.h does not exist */
-#undef HAVE_NV_ANDROID
-
-/* Implement conftest.sh function acpi_evaluate_integer */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,19)
- #define NV_ACPI_EVALUATE_INTEGER_PRESENT
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-  typedef unsigned long long nv_acpi_integer_t;
- #else
-  typedef unsigned long nv_acpi_integer_t;
- #endif
-#else
- #undef NV_ACPI_EVALUATE_INTEGER_PRESENT
- typedef unsigned long nv_acpi_integer_t;
-#endif
-
-/* Implement conftest.sh function acpi_walk_namespace */
-/* Only kernels sometime before 2.4.0 don't have this function, and who */
-/* cares anymore */
-#define NV_ACPI_WALK_NAMESPACE_PRESENT
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
- #define NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT 7
-#else
- #define NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT 6
-#endif
-
-/* Implement conftest.sh function acpi_os_wait_events_complete */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
- #define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_PRESENT
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
-  #define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT 0
- #else
-  #define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT 1
- #endif
-#else
- #undef NV_ACPI_OS_WAIT_EVENTS_COMPLETE_PRESENT
-#endif
-
-/* Implement conftest.sh function ioremap_cache */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) && IS_ENABLED(CONFIG_X86)
- #define NV_IOREMAP_CACHE_PRESENT
-#else
- #undef NV_IOREMAP_CACHE_PRESENT
-#endif
-
-/* Implement conftest.sh function ioremap_wc */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
- #define NV_IOREMAP_WC_PRESENT
-#else
- #undef NV_IOREMAP_WC_PRESENT
-#endif
-
-/* Implement conftest.sh function proc_dir_entry */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
- #define NV_PROC_DIR_ENTRY_HAS_OWNER
-#else
- #undef NV_PROC_DIR_ENTRY_HAS_OWNER
-#endif
-
-/* Implement conftest.sh function INIT_WORK */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,41)
- #define NV_INIT_WORK_PRESENT
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-  #define NV_INIT_WORK_ARGUMENT_COUNT 2
- #else
-  #define NV_INIT_WORK_ARGUMENT_COUNT 3
- #endif
-#else
- #undef NV_INIT_WORK_PRESENT
-#endif
-
-/* Implement conftest.sh function pci_dma_mapping_error */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,5)
- #define NV_PCI_DMA_MAPPING_ERROR_PRESENT
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-  #define NV_PCI_DMA_MAPPING_ERROR_ARGUMENT_COUNT 2
- #else
-  #define NV_PCI_DMA_MAPPING_ERROR_ARGUMENT_COUNT 1
- #endif
-#else
- #undef NV_PCI_DMA_MAPPING_ERROR_PRESENT
-#endif
-
-/* Implement conftest.sh function agp_memory */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
- #define NV_AGP_MEMORY_HAS_PAGES
-#else
- #undef NV_AGP_MEMORY_HAS_PAGES
-#endif
-
-/* Implement conftest.sh function scatterlist */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
- #define NV_SCATTERLIST_HAS_PAGE
-#else
- #undef NV_SCATTERLIST_HAS_PAGE
-#endif
-
-/* Implement conftest.sh function pci_domain_nr */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,71)
- #define NV_PCI_DOMAIN_NR_PRESENT
-#else
- #undef NV_PCI_DOMAIN_NR_PRESENT
-#endif
-
-/* Implement conftest.sh function file_operations */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
- #define NV_FILE_OPERATIONS_HAS_IOCTL
-#else
- #undef NV_FILE_OPERATIONS_HAS_IOCTL
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
- #define NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL
- #define NV_FILE_OPERATIONS_HAS_COMPAT_IOCTL
-#else
- #undef NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL
- #undef NV_FILE_OPERATIONS_HAS_COMPAT_IOCTL
-#endif
-
-/* Implement conftest.sh function efi_enabled */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1)
- #define NV_EFI_ENABLED_PRESENT
-#else
- #undef NV_EFI_ENABLED_PRESENT
-#endif
-
-/* Implement conftest.sh function dom0_kernel_present */
-#if 0
- #define NV_DOM0_KERNEL_PRESENT
-#else
- #undef NV_DOM0_KERNEL_PRESENT
-#endif
-
-/* Implement conftest.sh function drm_available */
-#if 0
- #define NV_DRM_AVAILABLE
-#else
- #undef NV_DRM_AVAILABLE
-#endif
-
-/* Implement conftest.sh function proc_create_data */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
- #define NV_PROC_CREATE_DATA_PRESENT
-#else
- #undef NV_PROC_CREATE_DATA_PRESENT
-#endif
-
-/* Implement conftest.sh function pde_data */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
- #define NV_PDE_DATA_PRESENT
-#else
- #undef NV_PDE_DATA_PRESENT
-#endif
-
-/* Implement conftest.sh function proc_remove */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
- #define NV_PROC_REMOVE_PRESENT
-#else
- #undef NV_PROC_REMOVE_PRESENT
-#endif
-
-/* Implement conftest.sh function sg_init_table */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
- #define NV_SG_INIT_TABLE_PRESENT
-#else
- #undef NV_SG_INIT_TABLE_PRESENT
-#endif
-
-/* Check for linux/semaphore.h */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
- #define NV_LINUX_SEMAPHORE_H_PRESENT
-#else
- #undef NV_LINUX_SEMAPHORE_H_PRESENT
-#endif
-
-/* Check for linux/cred.h */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
- #define NV_LINUX_CRED_H_PRESENT
-#else
- #undef NV_LINUX_CRED_H_PRESENT
-#endif
-
-/* Check for drm/drmP.h */
-#if 1
- #define NV_DRM_DRMP_H_PRESENT
-#else
- #undef NV_DRM_DRMP_H_PRESENT
-#endif
-
-/* Check for generated/autoconf.h */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
- #define NV_GENERATED_AUTOCONF_H_PRESENT
-#else
- #undef NV_GENERATED_AUTOCONF_H_PRESENT
-#endif
-
-/* Check for generated/compile.h */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
- #define NV_GENERATED_COMPILE_H_PRESENT
-#else
- #undef NV_GENERATED_COMPILE_H_PRESENT
-#endif
-
-/* Check for generated/utsrelease.h */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
- #define NV_GENERATED_UTSRELEASE_H_PRESENT
-#else
- #undef NV_GENERATED_UTSRELEASE_H_PRESENT
-#endif
-
-/* Check for asm/system.h */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
- #define NV_ASM_SYSTEM_H_PRESENT
-#else
- #undef NV_ASM_SYSTEM_H_PRESENT
-#endif
-
-/* Check for linux/efi.h */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,33)
- #define NV_LINUX_EFI_H_PRESENT
-#else
- #undef NV_LINUX_EFI_H_PRESENT
-#endif
-
-/* Check for linux/kconfig.h */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
- #define NV_LINUX_KCONFIG_H_PRESENT
-#else
- #undef NV_LINUX_KCONFIG_H_PRESENT
-#endif
-
-/* Check for linux/screen_info.h */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- #define NV_LINUX_SCREEN_INFO_H_PRESENT
-#else
- #undef NV_LINUX_SCREEN_INFO_H_PRESENT
-#endif
-
-/* Check for linux/nvmap.h */
-// does not (yet) exist in kernel source
- #undef NV_LINUX_NVMAP_H_PRESENT
diff --git a/conftest.sh b/conftest.sh
deleted file mode 100644
index 661cb4d..0000000
--- a/conftest.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-# This is a replacement for nvidia's conftest.sh
-#
-# We have a new conftest.h that works with kbuild that we don't want
-# overwritten or generated or anything else, so we want any call to
-# conftest.sh to do absolutely nothing.
-exit 0
diff --git a/kbuild.patch b/kbuild.patch
deleted file mode 100644
index bde995f..0000000
--- a/kbuild.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- NVIDIA-Linux-x86_64-173.14.37-pkg0/usr/src/nv/Makefile.kbuild~	2013-10-29 08:01:58.000000000 +0100
-+++ NVIDIA-Linux-x86_64-173.14.37-pkg0/usr/src/nv/Makefile.kbuild	2013-10-29 08:05:38.340350890 +0100
-@@ -286,8 +286,6 @@
- 	@$(RM) -f $(RESMAN_GLUE_OBJS) $(KERNEL_GLUE_OBJS)
- 	@$(RM) -f build-in.o nv-linux.o *.d .*.{cmd,flags}
- 	@$(RM) -f $(MODULE_NAME).{o,ko,mod.{o,c}} $(VERSION_HEADER) *~
--	@$(RM) -f patches.h
--	@$(RM) -f conftest*.c conftest.h
- 	@$(RM) -rf Modules.symvers .tmp_versions
- 
- #
diff --git a/patches.h b/patches.h
deleted file mode 100644
index 892d369..0000000
--- a/patches.h
+++ /dev/null
@@ -1,5 +0,0 @@
-static struct {
-	const char *short_description;
-	const char *description;
-} __nv_patches[] = {
-{ NULL, NULL } };
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia-legacy3.git/commitdiff/7f33c19663fcff116cba7482bfd0b2092c63277e



More information about the pld-cvs-commit mailing list