mirror of
https://github.com/NVIDIA/nvidia-installer.git
synced 2025-07-23 02:13:00 +02:00
525.53
This commit is contained in:
11
Makefile
11
Makefile
@@ -158,27 +158,30 @@ quiet_GEN_UI_ARRAY = GEN-UI-ARRAY $@
|
||||
# build rules
|
||||
##############################################################################
|
||||
|
||||
.PNONY: all install NVIDIA_INSTALLER_install MKPRECOMPILED_install \
|
||||
MANPAGE_install MAKESELF_HELP_SCRIPT_install clean clobber
|
||||
|
||||
.PHONY: all
|
||||
all: $(NVIDIA_INSTALLER) $(MKPRECOMPILED) $(MAKESELF_HELP_SCRIPT) \
|
||||
$(MAKESELF_HELP_SCRIPT_SH) $(MANPAGE)
|
||||
|
||||
.PHONY: install
|
||||
install: NVIDIA_INSTALLER_install MKPRECOMPILED_install MANPAGE_install \
|
||||
MAKESELF_HELP_SCRIPT_install
|
||||
|
||||
.PHONY: NVIDIA_INSTALLER_install
|
||||
NVIDIA_INSTALLER_install: $(NVIDIA_INSTALLER)
|
||||
$(MKDIR) $(BINDIR)
|
||||
$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
|
||||
|
||||
.PHONY: MKPRECOMPILED_install
|
||||
MKPRECOMPILED_install: $(MKPRECOMPILED)
|
||||
$(MKDIR) $(BINDIR)
|
||||
$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
|
||||
|
||||
.PHONY: MAKESELF_HELP_SCRIPT_install
|
||||
MAKESELF_HELP_SCRIPT_install: $(MAKESELF_HELP_SCRIPT)
|
||||
$(MKDIR) $(BINDIR)
|
||||
$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
|
||||
|
||||
.PHONY: MANPAGE_install
|
||||
MANPAGE_install: $(MANPAGE)
|
||||
$(MKDIR) $(MANDIR)
|
||||
$(INSTALL) $(INSTALL_DOC_ARGS) $< $(MANDIR)/$(notdir $<)
|
||||
@@ -257,6 +260,7 @@ $(CONFIG_H): $(VERSION_MK)
|
||||
$(call BUILD_OBJECT_LIST,$(ALL_SRC)) $(NCURSES6_UI_O) $(NCURSESW6_UI_O): $(CONFIG_H)
|
||||
$(call BUILD_MAKESELF_OBJECT_LIST,$(MAKESELF_HELP_SCRIPT_SRC)): $(CONFIG_H)
|
||||
|
||||
.PHONY: clean clobber
|
||||
clean clobber:
|
||||
rm -rf $(OUTPUTDIR)
|
||||
|
||||
@@ -297,6 +301,7 @@ $(MAKESELF_HELP_SCRIPT_SH): $(MAKESELF_HELP_SCRIPT)
|
||||
|
||||
AUTO_TEXT = ".\\\" WARNING: THIS FILE IS AUTO-GENERATED! Edit $< instead."
|
||||
|
||||
.PHONY: doc
|
||||
doc: $(MANPAGE)
|
||||
|
||||
GEN_MANPAGE_OPTS_SRC = gen-manpage-opts.c
|
||||
|
2
crc.c
2
crc.c
@@ -73,7 +73,7 @@ uint32 compute_crc_from_buffer(const uint8 *buf, int len)
|
||||
{
|
||||
uint32 cword = ~0;
|
||||
static uint32 *crctab = NULL;
|
||||
int i;
|
||||
uint32 i;
|
||||
|
||||
if (!crctab) {
|
||||
crctab = (uint32 *) nvalloc(sizeof(uint32) * 256);
|
||||
|
35
kernel.c
35
kernel.c
@@ -306,24 +306,22 @@ int determine_kernel_source_path(Options *op, Package *p)
|
||||
|
||||
ret = access(version_h, F_OK) == 0 || access(uapi_version_h, F_OK) == 0;
|
||||
|
||||
free(version_h);
|
||||
free(uapi_version_h);
|
||||
|
||||
if (!ret) {
|
||||
ui_error(op, "Neither the '" VERSION_H_PATH "' nor the '"
|
||||
UAPI_VERSION_H_PATH "' kernel header file exists. "
|
||||
if (ret) {
|
||||
/* OK, we seem to have a path to a configured kernel source tree */
|
||||
|
||||
ui_log(op, "Kernel source path: '%s'\n", op->kernel_source_path);
|
||||
ui_log(op, "Kernel output path: '%s'\n", op->kernel_output_path);
|
||||
} else {
|
||||
ui_error(op, "Neither the '%s' nor the '%s' kernel header file exists. "
|
||||
"The most likely reason for this is that the kernel "
|
||||
"source files in '%s' have not been configured.",
|
||||
op->kernel_output_path);
|
||||
return FALSE;
|
||||
version_h, uapi_version_h, op->kernel_output_path);
|
||||
}
|
||||
|
||||
/* OK, we seem to have a path to a configured kernel source tree */
|
||||
free(version_h);
|
||||
free(uapi_version_h);
|
||||
|
||||
ui_log(op, "Kernel source path: '%s'\n", op->kernel_source_path);
|
||||
ui_log(op, "Kernel output path: '%s'\n", op->kernel_output_path);
|
||||
|
||||
return TRUE;
|
||||
return ret;
|
||||
|
||||
} /* determine_kernel_source_path() */
|
||||
|
||||
@@ -1392,7 +1390,16 @@ static int test_kernel_modules_helper(Options *op, Package *p, int pause_udev)
|
||||
{
|
||||
char *cmd = NULL, *data = NULL;
|
||||
int insmod_ret = -1, i;
|
||||
const char *depmods[] = { "i2c-core", "drm", "drm-kms-helper", "vfio_mdev", "vfio", "mdev" };
|
||||
const char *depmods[] = {
|
||||
"i2c-core",
|
||||
"drm",
|
||||
"drm-kms-helper",
|
||||
"vfio_mdev",
|
||||
"vfio",
|
||||
"mdev",
|
||||
"video",
|
||||
"backlight",
|
||||
};
|
||||
|
||||
if (pause_udev) {
|
||||
/*
|
||||
|
19
utils.mk
19
utils.mk
@@ -44,6 +44,7 @@ CC_ONLY_CFLAGS ?=
|
||||
CXX_ONLY_CFLAGS ?=
|
||||
LDFLAGS ?=
|
||||
BIN_LDFLAGS ?=
|
||||
EXTRA_CFLAGS ?=
|
||||
|
||||
STACK_USAGE_WARNING ?=
|
||||
CFLAGS += $(if $(STACK_USAGE_WARNING),-Wstack-usage=$(STACK_USAGE_WARNING))
|
||||
@@ -84,6 +85,8 @@ ifeq ($(DEVELOP),1)
|
||||
CFLAGS += -DDEVELOP=1
|
||||
endif
|
||||
|
||||
CFLAGS += $(EXTRA_CFLAGS)
|
||||
|
||||
STRIP_CMD ?= strip
|
||||
DO_STRIP ?= 1
|
||||
|
||||
@@ -209,7 +212,6 @@ ifneq ($(_eval_available),T)
|
||||
$(error This Makefile requires a GNU Make that supports 'eval'. Please upgrade to GNU make 3.80 or later)
|
||||
endif
|
||||
|
||||
|
||||
##############################################################################
|
||||
# Test passing $(1) to $(CC). If $(CC) succeeds, then echo $(1).
|
||||
#
|
||||
@@ -225,6 +227,19 @@ TEST_CC_ARG = \
|
||||
$(ECHO) $(1))
|
||||
|
||||
|
||||
##############################################################################
|
||||
# Test if instruction $(1) is understood by the assembler
|
||||
# Returns "1" if the instruction is understood, else returns empty string.
|
||||
#
|
||||
# Example usage:
|
||||
# ENDBR_SUPPORTED := $(call AS_HAS_INSTR, endbr64)
|
||||
##############################################################################
|
||||
|
||||
AS_HAS_INSTR = \
|
||||
$(shell if ($(ECHO) "$(1)" | $(CC) -c -x assembler - -o /dev/null) >/dev/null 2>&1 ;\
|
||||
then $(ECHO) "1"; else $(ECHO) ""; fi)
|
||||
|
||||
|
||||
##############################################################################
|
||||
# define variables used when installing the open source utilities from
|
||||
# the source tarball
|
||||
@@ -243,7 +258,7 @@ MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1
|
||||
##############################################################################
|
||||
|
||||
default build: all
|
||||
|
||||
.PHONY: default build
|
||||
|
||||
##############################################################################
|
||||
# get the definition of NVIDIA_VERSION from version.mk
|
||||
|
@@ -1,4 +1,4 @@
|
||||
NVIDIA_VERSION = 520.56.06
|
||||
NVIDIA_VERSION = 525.53
|
||||
|
||||
# This file.
|
||||
VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
|
||||
|
Reference in New Issue
Block a user