185.18.04185.18.04

2 files changed, 1 insertions, 171 deletions

diff --git a/DRIVER_VERSION b/DRIVER_VERSION
index b0ec0e9..7095454 100644
--- a/DRIVER_VERSION
+++ b/DRIVER_VERSION
@@ -1 +1 @@
-185.19
+185.18.04
diff --git a/makefile.nvmk b/makefile.nvmk
deleted file mode 100644
index 9b844b0..0000000
--- a/makefile.nvmk
+++ /dev/null
@@ -1,170 +0,0 @@
-##############################################################################
-# drivers/setup/linux/nvidia-installer/makefile.nvmk
-##############################################################################
-
-include $(NV_SOURCE)/drivers/common/build/nvCommon.nvmk
-
-
-##############################################################################
-# export the appropriate variables from nvmake to the gmake that we're
-# going to invoke
-##############################################################################
-
-$(eval $(EXPORT_VARIABLES_TO_PUBLIC_MAKEFILE))
-
-_ncurses_dir = $(NV_TOOLS)/unix/targets/$(NV_TARGET_OS)-$(NV_TARGET_ARCH)/ncurses-5.5
-
-NCURSES_INCLUDE_DIR = $(_ncurses_dir)/include
-NCURSES_LIB_DIR     = $(_ncurses_dir)/lib
-
-export NCURSES_CFLAGS = -I$(NCURSES_INCLUDE_DIR)
-export NCURSES_LDFLAGS = -L$(NCURSES_LIB_DIR)
-
-_pci_dir = $(NV_TOOLS)/unix/targets/$(NV_TARGET_OS)-$(NV_TARGET_ARCH)/pciutils-2.2.1
-
-PCI_INCLUDE_DIR = $(_pci_dir)/include
-PCI_LIB_DIR = $(_pci_dir)/lib
-
-export PCI_CFLAGS = -I$(PCI_INCLUDE_DIR)
-export PCI_LDFLAGS = -L$(PCI_LIB_DIR)
-
-export OUTPUTDIR
-
-export NV_AUTO_DEPEND
-export NV_VERBOSE
-
-# for utils.mk
-NV_MAKE_ARGS = -I $(NV_SOURCE)/drivers/setup/linux/common
-
-
-##############################################################################
-# check that all the directories that we exported above actually
-# exist; trigger a warning if any of them don't exist
-##############################################################################
-
-_extra_dirs += $(NCURSES_INCLUDE_DIR)
-_extra_dirs += $(NCURSES_LIB_DIR)
-_extra_dirs += $(PCI_INCLUDE_DIR)
-_extra_dirs += $(PCI_LIB_DIR)
-
-build :: $(_extra_dirs)
-
-$(sort $(_extra_dirs)) :
-	@$(ECHO) WARNING: nvidia-installer extra directory does not exist: $@
-
-
-##############################################################################
-# generate the legacy GPU header file
-##############################################################################
-
-_nv_common_inc = $(NV_SOURCE)/drivers/common/inc
-_nv_sdk_inc    = $(NV_SOURCE)/sdk/nvidia/inc
-
-NV_NAME_H      = $(_nv_common_inc)/nv_name.h
-NV_CHIPFLAGS_H = $(_nv_common_inc)/nvChipFlags.h
-NV_CHIPUTILS_H = $(_nv_common_inc)/nvChipUtils.h
-NV_MISC_H      = $(_nv_sdk_inc)/nvmisc.h
-
-NV_LEGACY_H    = $(OUTPUTDIR)/nvLegacy.h
-
-NV_LEGACY_GENERATOR = $(OUTPUTDIR)/nvLegacyGenerator
-
-NV_LEGACY_GENERATOR_HEADER_DEPS = \
-  $(NV_NAME_H) $(NV_CHIPFLAGS_H) $(NV_CHIPUTILS_H) $(NV_MISC_H)
-
-NV_LEGACY_GENERATOR_INCLUDE_CFLAGS = \
-  $(addprefix -I,$(sort $(dir $(NV_LEGACY_GENERATOR_HEADER_DEPS))))
-
-$(NV_LEGACY_GENERATOR): ../nvLegacy.c $(NV_LEGACY_GENERATOR_HEADER_DEPS)
-	$(call quiet_cmd,HOST_CC) $< -o $@ \
-	  $(NV_LEGACY_GENERATOR_INCLUDE_CFLAGS) $(HOST_LDFLAGS) $(HOST_BIN_LDFLAGS)
-
-$(NV_LEGACY_H): $(NV_LEGACY_GENERATOR)
-	./$(NV_LEGACY_GENERATOR) > $@
-
-OTHER_FILES_TO_REMOVE += $(NV_LEGACY_H) $(NV_LEGACY_GENERATOR)
-
-
-##############################################################################
-# define how to package the nvidia-installer source tarball
-##############################################################################
-
-.PHONY: dist
-
-# include the list of nvidia-installer source files; defines DIST_FILES
-include dist-files.mk
-
-NVIDIA_INSTALLER_DISTDIR_NO_OUTPUTDIR = nvidia-installer-$(NV_VERSION_STRING)
-NVIDIA_INSTALLER_DISTDIR = $(OUTPUTDIR)/$(NVIDIA_INSTALLER_DISTDIR_NO_OUTPUTDIR)
-NVIDIA_INSTALLER_TARBALL_NO_OUTPUTDIR = $(NVIDIA_INSTALLER_DISTDIR_NO_OUTPUTDIR).tar.bz2
-NVIDIA_INSTALLER_TARBALL = $(NVIDIA_INSTALLER_DISTDIR).tar.bz2
-
-ifeq ($(NV_VERBOSE),1)
-  _tar_verbose_arg = -v
-else
-  _tar_verbose_arg =
-endif
-
-# define rules to copy files from the source tree to
-# $(NVIDIA_INSTALLER_DISTDIR)
-
-$(eval $(call ADD_FILE_TO_TARBALL_RULE,                 \
-  public.mk,                                            \
-  $(NVIDIA_INSTALLER_DISTDIR)/Makefile,                 \
-  $(NVIDIA_INSTALLER_TARBALL)))
-
-$(eval $(call ADD_FILE_TO_TARBALL_RULE,                 \
-  $(OUTPUTDIR)/version.mk,                              \
-  $(NVIDIA_INSTALLER_DISTDIR)/version.mk,               \
-  $(NVIDIA_INSTALLER_TARBALL)))
-
-$(eval $(call ADD_FILE_TO_TARBALL_RULE,                 \
-  $(NV_SOURCE)/drivers/setup/linux/common/utils.mk,     \
-  $(NVIDIA_INSTALLER_DISTDIR)/utils.mk,                 \
-  $(NVIDIA_INSTALLER_TARBALL)))
-
-$(eval $(call ADD_FILE_TO_TARBALL_RULE,                 \
-  $(NV_LEGACY_H),                                       \
-  $(NVIDIA_INSTALLER_DISTDIR)/$(notdir $(NV_LEGACY_H)), \
-  $(NVIDIA_INSTALLER_TARBALL)))
-
-$(foreach src, $(DIST_FILES),                           \
-  $(eval $(call ADD_FILE_TO_TARBALL_RULE,               \
-    $(src),                                             \
-    $(NVIDIA_INSTALLER_DISTDIR)/$(src),                 \
-    $(NVIDIA_INSTALLER_TARBALL))))
-
-$(NVIDIA_INSTALLER_TARBALL):
-	@$(ECHO) "Generating $(OUTPUTDIR)/$(NVIDIA_INSTALLER_TARBALL)"
-	$(RM) $(OUTPUTDIR)/tar-file-list.txt
-	for i in $(patsubst $(OUTPUTDIR)/%,%,$(TARBALL_FILE_LIST_$@)); do \
-	  $(ECHO) $${i} >> $(OUTPUTDIR)/tar-file-list.txt; \
-	done
-	cd $(OUTPUTDIR) && \
-	PATH=/bin $(TAR) -c -j $(_tar_verbose_arg) -f \
-	  $(NVIDIA_INSTALLER_TARBALL_NO_OUTPUTDIR) \
-	  --files-from=tar-file-list.txt
-	$(RM) $(OUTPUTDIR)/tar-file-list.txt
-
-dist: $(NVIDIA_INSTALLER_TARBALL)
-
-OTHER_FILES_TO_REMOVE += $(NVIDIA_INSTALLER_DISTDIR)
-OTHER_FILES_TO_REMOVE += $(NVIDIA_INSTALLER_TARBALL)
-
-
-##############################################################################
-# to actually build nvidia-settings, hand off control to the public makefile
-##############################################################################
-
-$(eval $(DEFINE_VERSION_MK_RULE))
-
-build:: $(OUTPUTDIR)/version.mk $(NV_LEGACY_H)
-	$(MAKE) $(NV_MAKE_ARGS) -f public.mk $@
-
-
-##############################################################################
-# define the compiler and include the common rules
-##############################################################################
-
-include $(NV_SOURCE)/drivers/common/build/gcc-4.1.1as2.nvmk
-include $(NV_SOURCE)/drivers/common/build/nvCommonRules.nvmk