From 6bf5c05b85776005a385467b84edaca08634332e Mon Sep 17 00:00:00 2001 From: Liam Middlebrook Date: Wed, 19 Sep 2018 14:31:28 -0700 Subject: 410.57 --- Makefile | 5 +---- common-utils/common-utils.h | 2 ++ files.c | 20 +++++++----------- install-from-cwd.c | 4 ---- manifest.c | 5 ----- misc.c | 50 --------------------------------------------- misc.h | 1 - nvidia-installer.c | 7 +------ nvidia-installer.h | 4 ---- option_table.h | 10 --------- utils.mk | 35 ++----------------------------- version.mk | 2 +- 12 files changed, 14 insertions(+), 131 deletions(-) diff --git a/Makefile b/Makefile index 66aaf84..d196370 100644 --- a/Makefile +++ b/Makefile @@ -149,7 +149,7 @@ NCURSES_UI_SO_SRC += $(if $(BUILD_NCURSES6),$(NCURSES6_UI_SO_C),) CFLAGS += $(if $(BUILD_NCURSES6),-DNV_INSTALLER_NCURSES6,) INSTALLER_SRC = $(SRC) $(NCURSES_UI_SO_SRC) $(TLS_TEST_C) $(TLS_TEST_DSO_C) \ - $(RTLD_TEST_C) $(COMPAT_32_SRC) $(STAMP_C) + $(RTLD_TEST_C) $(COMPAT_32_SRC) INSTALLER_OBJS = $(call BUILD_OBJECT_LIST,$(INSTALLER_SRC)) @@ -290,9 +290,6 @@ $(foreach src,$(MAKESELF_HELP_SCRIPT_SRC),\ $(eval $(call DEFINE_OBJECT_RULE_WITH_OBJECT_NAME,HOST,$(src),\ $(call BUILD_MAKESELF_OBJECT_LIST,$(src))))) -# define the rule to generate $(STAMP_C) -$(eval $(call DEFINE_STAMP_C_RULE, $(INSTALLER_OBJS),$(NVIDIA_INSTALLER_PROGRAM_NAME))) - $(CONFIG_H): $(VERSION_MK) @ $(RM) -f $@ @ $(MKDIR) $(OUTPUTDIR) diff --git a/common-utils/common-utils.h b/common-utils/common-utils.h index 6ef1d06..7d51910 100644 --- a/common-utils/common-utils.h +++ b/common-utils/common-utils.h @@ -132,4 +132,6 @@ typedef enum { NV_OPTIONAL_BOOL_TRUE = TRUE } NVOptionalBool; +#define NV_ID_STRING PROGRAM_NAME ": version " NVIDIA_VERSION + #endif /* __COMMON_UTILS_H__ */ diff --git a/files.c b/files.c index ecad170..b63e45a 100644 --- a/files.c +++ b/files.c @@ -773,12 +773,6 @@ int set_destinations(Options *op, Package *p) path = p->entries[i].path; break; - case FILE_TYPE_OPENGL_HEADER: - prefix = op->opengl_prefix; - dir = op->opengl_incdir; - path = p->entries[i].path; - break; - case FILE_TYPE_INSTALLER_BINARY: prefix = op->utility_prefix; dir = op->utility_bindir; @@ -2176,16 +2170,18 @@ void process_dkms_conf(Options *op, Package *p) int i; char *tmpfile; - char *tokens[6] = { "__VERSION_STRING", "__DKMS_MODULES", "__JOBS", - "__EXCLUDE_MODULES", "will be generated", NULL }; - char *replacements[6] = { p->version, NULL, NULL, - p->excluded_kernel_modules, - "was generated", NULL }; + char *tokens[] = { "__VERSION_STRING", "__DKMS_MODULES", "__JOBS", + "__EXCLUDE_MODULES", "will be generated", + "__IGNORE_CC_MISMATCH", NULL }; + char *replacements[] = { p->version, NULL, NULL, + p->excluded_kernel_modules, + "was generated", NULL, NULL }; int package_num_entries = p->num_entries; replacements[1] = nvstrdup(""); replacements[2] = nvasprintf("%d", op->concurrency_level); + replacements[5] = op->ignore_cc_version_check ? "1" : ""; /* Build the list of kernel modules to be installed */ for (i = 0; i < p->num_kernel_modules; i++) { @@ -2463,8 +2459,6 @@ void get_default_prefixes_and_paths(Options *op) if (!op->opengl_libdir) op->opengl_libdir = default_libdir; - if (!op->opengl_incdir) - op->opengl_incdir = DEFAULT_INCDIR; if (!op->x_prefix) { if (op->modular_xorg) { diff --git a/install-from-cwd.c b/install-from-cwd.c index 3b7ed48..05d83b1 100644 --- a/install-from-cwd.c +++ b/install-from-cwd.c @@ -222,10 +222,6 @@ int install_from_cwd(Options *op) if (!get_prefixes(op)) goto failed; - /* ask if we should install the OpenGL header files */ - - should_install_opengl_headers(op, p); - /* * select the appropriate TLS class, modifying the package as * necessary. diff --git a/manifest.c b/manifest.c index 8af720c..baad96b 100644 --- a/manifest.c +++ b/manifest.c @@ -78,7 +78,6 @@ static const struct { */ { ENTRY(KERNEL_MODULE_SRC, F, F, T, F, F, F, F, F, T, T, F) }, { ENTRY(KERNEL_MODULE, F, F, T, F, F, F, F, F, T, F, F) }, - { ENTRY(OPENGL_HEADER, F, F, T, T, F, F, T, F, T, F, F) }, { ENTRY(CUDA_ICD, F, F, T, F, F, F, F, F, T, F, F) }, { ENTRY(OPENGL_LIB, T, F, T, F, F, T, T, F, T, F, F) }, { ENTRY(CUDA_LIB, T, F, T, T, F, T, F, F, T, F, F) }, @@ -195,10 +194,6 @@ void get_installable_file_type_list( PackageEntryFileType type = packageEntryFileTypeTable[i].type; - if ((type == FILE_TYPE_OPENGL_HEADER) && !op->opengl_headers) { - continue; - } - if (((type == FILE_TYPE_KERNEL_MODULE_SRC) || (type == FILE_TYPE_DKMS_CONF)) && op->no_kernel_module_source) { diff --git a/misc.c b/misc.c index 15b7d0f..290bf82 100644 --- a/misc.c +++ b/misc.c @@ -1059,56 +1059,6 @@ char *extract_version_string(const char *str) } /* extract_version_string() */ - -/* - * should_install_opengl_headers() - if in expert mode, ask the user - * if they want to install OpenGL header files. - */ - -void should_install_opengl_headers(Options *op, Package *p) -{ - int i, have_headers = FALSE; - - if (!op->expert) return; - - /* - * first, scan through the package to see if we have any header - * files to install - */ - - for (i = 0; i < p->num_entries; i++) { - if (p->entries[i].type == FILE_TYPE_OPENGL_HEADER) { - have_headers = TRUE; - break; - } - } - - if (!have_headers) return; - - /* - * If we're to provide more verbose descriptions, we could present - * something like this: - * - * ("The %s provides OpenGL header files; these are used when - * compiling OpenGL applications. Most Linux distributions - * already have OpenGL header files installed (normally in the - * /usr/include/GL/ directory). If you don't have OpenGL header - * files installed and would like to, or if you want to develop - * OpenGL applications that take advantage of NVIDIA OpenGL - * extensions, then you can install NVIDIA's OpenGL header files - * at this time.", p->description); - */ - - op->opengl_headers = ui_yes_no(op, op->opengl_headers, - "Install NVIDIA's OpenGL header files?"); - - ui_expert(op, "Installation %s install the OpenGL header files.", - op->opengl_headers ? "will" : "will not"); - -} /* should_install_opengl_headers() */ - - - /* * should_install_compat32_files() - ask the user if he/she wishes to * install 32bit compatibily libraries. diff --git a/misc.h b/misc.h index 93f8d49..91b15a1 100644 --- a/misc.h +++ b/misc.h @@ -68,7 +68,6 @@ int check_precompiled_kernel_interface_tools(Options *op); char *extract_version_string(const char *str); int continue_after_error(Options *op, const char *fmt, ...) NV_ATTRIBUTE_PRINTF(2, 3); int do_install(Options *op, Package *p, CommandList *c); -void should_install_opengl_headers(Options *op, Package *p); void should_install_compat32_files(Options *op, Package *p); void should_install_optional_modules(Options *op, Package *p, const KernelModuleInfo *optional_modules, diff --git a/nvidia-installer.c b/nvidia-installer.c index 6d09d2b..71a9792 100644 --- a/nvidia-installer.c +++ b/nvidia-installer.c @@ -54,12 +54,10 @@ static void print_help(const char* name, int is_uninstall, int advanced); * print_version() - print the current nvidia-installer version number */ -extern const char *pNV_ID; - static void print_version(void) { nv_info_msg(NULL, ""); - nv_info_msg(NULL, "%s", pNV_ID); + nv_info_msg(NULL, "%s", NV_ID_STRING); nv_info_msg(TAB, "The NVIDIA Software Installer for Unix/Linux."); nv_info_msg(NULL, ""); nv_info_msg(TAB, "This program is used to install, upgrade and uninstall " @@ -130,7 +128,6 @@ static Options *load_default_options(void) op->tmpdir = get_tmpdir(op); op->logging = TRUE; /* log by default */ - op->opengl_headers = FALSE; /* do not install our GL headers by default */ op->nvidia_modprobe = TRUE; op->run_nvidia_xconfig = FALSE; op->selinux_option = SELINUX_DEFAULT; @@ -324,8 +321,6 @@ static void parse_commandline(int argc, char *argv[], Options *op) break; case TMPDIR_OPTION: op->tmpdir = strval; break; - case OPENGL_HEADERS_OPTION: - op->opengl_headers = TRUE; break; case NO_NVIDIA_MODPROBE_OPTION: op->nvidia_modprobe = FALSE; break; #if defined(NV_TLS_TEST) diff --git a/nvidia-installer.h b/nvidia-installer.h index 73b2c87..1e7e93b 100644 --- a/nvidia-installer.h +++ b/nvidia-installer.h @@ -99,7 +99,6 @@ typedef enum { typedef enum { FILE_TYPE_NONE, FILE_TYPE_KERNEL_MODULE_SRC, - FILE_TYPE_OPENGL_HEADER, FILE_TYPE_OPENGL_LIB, FILE_TYPE_DOCUMENTATION, FILE_TYPE_OPENGL_SYMLINK, @@ -184,7 +183,6 @@ typedef struct __options { int logging; int no_precompiled_interface; int no_ncurses_color; - int opengl_headers; int nvidia_modprobe; int no_questions; int silent; @@ -230,7 +228,6 @@ typedef struct __options { char *opengl_prefix; char *opengl_libdir; - char *opengl_incdir; char *x_prefix; char *x_libdir; @@ -490,7 +487,6 @@ typedef struct __package { #define DEFAULT_AARCH64_TRIPLET_LIBDIR "lib/aarch64-linux-gnu" #define DEFAULT_PPC64LE_TRIPLET_LIBDIR "lib/powerpc64le-linux-gnu" #define DEFAULT_BINDIR "bin" -#define DEFAULT_INCDIR "include" #define DEFAULT_X_MODULEDIR "modules" #define DEFAULT_DOT_DESKTOPDIR "share/applications" #define DEFAULT_DOCDIR "share/doc" diff --git a/option_table.h b/option_table.h index a0e6773..37fb844 100644 --- a/option_table.h +++ b/option_table.h @@ -47,7 +47,6 @@ enum { LOG_FILE_NAME_OPTION, HELP_ARGS_ONLY_OPTION, TMPDIR_OPTION, - OPENGL_HEADERS_OPTION, NO_NVIDIA_MODPROBE_OPTION, INSTALLER_PREFIX_OPTION, FORCE_TLS_OPTION, @@ -351,15 +350,6 @@ static const NVGetoptOption __options[] = { { "no-ncurses-color", 'c', NVGETOPT_OPTION_APPLIES_TO_NVIDIA_UNINSTALL, NULL, "Disable use of color in the ncurses user interface." }, - { "opengl-headers", OPENGL_HEADERS_OPTION, 0, NULL, - "Normally, installation will not install NVIDIA's OpenGL " - "header files; the OpenGL header files packaged by the " - "Linux distribution or available from " - "http://www.opengl.org/registry/ should be preferred. " - "However, http://www.opengl.org/registry/ does not yet provide " - "a glx.h or gl.h. Until that is resolved, NVIDIA's OpenGL " - "header files can still be chosen, through this installer option." }, - { "no-nvidia-modprobe", NO_NVIDIA_MODPROBE_OPTION, 0, NULL, "Skip installation of 'nvidia-modprobe', a setuid root utility which " "nvidia-installer installs by default. nvidia-modprobe can be used by " diff --git a/utils.mk b/utils.mk index 66dbb16..8218e0c 100644 --- a/utils.mk +++ b/utils.mk @@ -74,9 +74,7 @@ PRINTF ?= printf MKDIR ?= mkdir -p RM ?= rm -f TOUCH ?= touch -WHOAMI ?= whoami HARDLINK ?= ln -f -HOSTNAME_CMD ?= hostname DATE ?= date GZIP_CMD ?= gzip CHMOD ?= chmod @@ -214,6 +212,8 @@ ifndef NVIDIA_VERSION $(error NVIDIA_VERSION undefined) endif +CFLAGS += -DNVIDIA_VERSION=\"$(NVIDIA_VERSION)\" + ############################################################################## # Several of the functions below take an argument that indicates if @@ -424,37 +424,6 @@ define DEBUG_INFO_RULES endif endef -############################################################################## -# STAMP_C - this is a source file that is generated during the build -# to capture information about the build environment for the utility. -# -# The DEFINE_STAMP_C_RULE function is used to define the rule for -# generating STAMP_C. First argument is a list of dependencies for -# STAMP_C (g_stamp.o is filtered out of the list); second argument is -# the name of the program being built. -# -# The includer of utils.mk should add $(STAMP_C) to its list of source -# files -############################################################################## - -STAMP_C = $(OUTPUTDIR)/g_stamp.c - -define DEFINE_STAMP_C_RULE - - $$(STAMP_C): $$(filter-out \ - $$(call BUILD_OBJECT_LIST,$$(STAMP_C)),$(1)) \ - $$(VERSION_MK) - @ $$(RM) $$@ - @ $$(PRINTF) "%s" "const char NV_ID[] = \"nvidia id: " >> $$@ - @ $$(PRINTF) "%s" "$(2): " >> $$@ - @ $$(PRINTF) "%s" "version $$(NVIDIA_VERSION) " >> $$@ - @ $$(PRINTF) "%s" "($$(shell $$(WHOAMI))" >> $$@ - @ $$(PRINTF) "%s" "@$$(shell $$(HOSTNAME_CMD))) " >> $$@ - @ $$(PRINTF) "%s\n" "$$(shell $(DATE))\";" >> $$@ - @ $$(PRINTF) "%s\n" "const char *pNV_ID = NV_ID + 11;" >> $$@ - -endef - ############################################################################## # Define rules that can be used for embedding a file into an ELF object that # contains the raw contents of that file and symbols pointing to the embedded diff --git a/version.mk b/version.mk index fa110cd..37ee6b6 100644 --- a/version.mk +++ b/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 396.54 +NVIDIA_VERSION = 410.57 -- cgit v1.2.3