project-lakitu: x11-drivers remove redundant build parameters
in cos-linux-mod_src_compile, we specify the CC and LD variables in the
BUILD_PARAMS already so there is no need to rewrite those variables in
the NVIDIA builds.
Change-Id: I5eade286d4ecdb0f1c10c89e3c1aa694da71c595
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/75073
Reviewed-by: Shuo Yang <gshuoy@google.com>
Reviewed-by: Oleksandr Tymoshenko <ovt@google.com>
Tested-by: RBE-prod-presubmit <service-269995278450@remotebuildexecution.iam.gserviceaccount.com>
Reviewed-by: Kevin Berry <kpberry@google.com>
diff --git a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.104.05.ebuild b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.104.05.ebuild
index 19bdb30..75f8263 100644
--- a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.104.05.ebuild
+++ b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.104.05.ebuild
@@ -60,7 +60,8 @@
nvidia-uvm(nvidia/${PV}:kernel-module-source:kernel-module-source/kernel-open)"
KBUILD_OUTPUT="${KERNEL_DIR}/build"
linux-mod_pkg_setup
- BUILD_PARAMS="CC=${CC} CXX=${CBUILD}-gcc LD=${LD} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+ CXX="${CBUILD}-gcc"
+ BUILD_PARAMS="CXX=${CXX} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
BUILD_TARGETS="modules"
}
diff --git a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.104.12.ebuild b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.104.12.ebuild
index f11aed7..77728d9 100644
--- a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.104.12.ebuild
+++ b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.104.12.ebuild
@@ -60,7 +60,8 @@
nvidia-uvm(nvidia/${PV}:kernel-module-source:kernel-module-source/kernel-open)"
KBUILD_OUTPUT="${KERNEL_DIR}/build"
linux-mod_pkg_setup
- BUILD_PARAMS="CC=${CC} CXX=${CBUILD}-gcc LD=${LD} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+ CXX="${CBUILD}-gcc"
+ BUILD_PARAMS="CXX=${CXX} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
BUILD_TARGETS="modules"
}
diff --git a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.129.03.ebuild b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.129.03.ebuild
index dd155f3..c70b1fb 100644
--- a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.129.03.ebuild
+++ b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.129.03.ebuild
@@ -60,7 +60,8 @@
nvidia-uvm(nvidia/${PV}:kernel-module-source:kernel-module-source/kernel-open)"
KBUILD_OUTPUT="${KERNEL_DIR}/build"
linux-mod_pkg_setup
- BUILD_PARAMS="CC=${CC} CXX=${CBUILD}-gcc LD=${LD} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+ CXX="${CBUILD}-gcc"
+ BUILD_PARAMS="CXX=${CXX} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
BUILD_TARGETS="modules"
}
diff --git a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.154.05.ebuild b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.154.05.ebuild
index eb86b83..cfd6b82 100644
--- a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.154.05.ebuild
+++ b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.154.05.ebuild
@@ -60,7 +60,8 @@
nvidia-uvm(nvidia/${PV}:kernel-module-source:kernel-module-source/kernel-open)"
KBUILD_OUTPUT="${KERNEL_DIR}/build"
linux-mod_pkg_setup
- BUILD_PARAMS="CC=${CC} CXX=${CBUILD}-gcc LD=${LD} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+ CXX="${CBUILD}-gcc"
+ BUILD_PARAMS="CXX=${CXX} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
BUILD_TARGETS="modules"
}
diff --git a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.161.07.ebuild b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.161.07.ebuild
index 0460e8d..bd0b9c5 100644
--- a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.161.07.ebuild
+++ b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.161.07.ebuild
@@ -60,7 +60,8 @@
nvidia-uvm(nvidia/${PV}:kernel-module-source:kernel-module-source/kernel-open)"
KBUILD_OUTPUT="${KERNEL_DIR}/build"
linux-mod_pkg_setup
- BUILD_PARAMS="CC=${CC} CXX=${CBUILD}-gcc LD=${LD} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+ CXX="${CBUILD}-gcc"
+ BUILD_PARAMS="CXX=${CXX} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
BUILD_TARGETS="modules"
}
diff --git a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.161.08.ebuild b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.161.08.ebuild
index 77b74c3..8e7d25d 100644
--- a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.161.08.ebuild
+++ b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.161.08.ebuild
@@ -60,7 +60,8 @@
nvidia-uvm(nvidia/${PV}:kernel-module-source:kernel-module-source/kernel-open)"
KBUILD_OUTPUT="${KERNEL_DIR}/build"
linux-mod_pkg_setup
- BUILD_PARAMS="CC=${CC} CXX=${CBUILD}-gcc LD=${LD} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+ CXX="${CBUILD}-gcc"
+ BUILD_PARAMS="CXX=${CXX} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
BUILD_TARGETS="modules"
}
diff --git a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.183.01.ebuild b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.183.01.ebuild
index 4bfdf93..388317c 100644
--- a/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.183.01.ebuild
+++ b/project-lakitu/x11-drivers/nvidia-drivers-open535/nvidia-drivers-open535-535.183.01.ebuild
@@ -60,7 +60,8 @@
nvidia-uvm(nvidia/${PV}:kernel-module-source:kernel-module-source/kernel-open)"
KBUILD_OUTPUT="${KERNEL_DIR}/build"
linux-mod_pkg_setup
- BUILD_PARAMS="CC=${CC} CXX=${CBUILD}-gcc LD=${LD} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+ CXX="${CBUILD}-gcc"
+ BUILD_PARAMS="CXX=${CXX} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
BUILD_TARGETS="modules"
}
diff --git a/project-lakitu/x11-drivers/nvidia-drivers-open550/nvidia-drivers-open550-550.54.14.ebuild b/project-lakitu/x11-drivers/nvidia-drivers-open550/nvidia-drivers-open550-550.54.14.ebuild
index dc2fe29..2ae846c 100644
--- a/project-lakitu/x11-drivers/nvidia-drivers-open550/nvidia-drivers-open550-550.54.14.ebuild
+++ b/project-lakitu/x11-drivers/nvidia-drivers-open550/nvidia-drivers-open550-550.54.14.ebuild
@@ -60,7 +60,8 @@
nvidia-uvm(nvidia/${PV}:kernel-module-source:kernel-module-source/kernel-open)"
KBUILD_OUTPUT="${KERNEL_DIR}/build"
linux-mod_pkg_setup
- BUILD_PARAMS="CC=${CC} CXX=${CBUILD}-gcc LD=${LD} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+ CXX="${CBUILD}-gcc"
+ BUILD_PARAMS="CXX=${CXX} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
BUILD_TARGETS="modules"
}
diff --git a/project-lakitu/x11-drivers/nvidia-drivers-open550/nvidia-drivers-open550-550.54.15.ebuild b/project-lakitu/x11-drivers/nvidia-drivers-open550/nvidia-drivers-open550-550.54.15.ebuild
index cd24622..599eeee 100644
--- a/project-lakitu/x11-drivers/nvidia-drivers-open550/nvidia-drivers-open550-550.54.15.ebuild
+++ b/project-lakitu/x11-drivers/nvidia-drivers-open550/nvidia-drivers-open550-550.54.15.ebuild
@@ -60,7 +60,8 @@
nvidia-uvm(nvidia/${PV}:kernel-module-source:kernel-module-source/kernel-open)"
KBUILD_OUTPUT="${KERNEL_DIR}/build"
linux-mod_pkg_setup
- BUILD_PARAMS="CC=${CC} CXX=${CBUILD}-gcc LD=${LD} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+ CXX="${CBUILD}-gcc"
+ BUILD_PARAMS="CXX=${CXX} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
BUILD_TARGETS="modules"
}
diff --git a/project-lakitu/x11-drivers/nvidia-drivers-open550/nvidia-drivers-open550-550.90.07.ebuild b/project-lakitu/x11-drivers/nvidia-drivers-open550/nvidia-drivers-open550-550.90.07.ebuild
index dfff580..989c7df 100644
--- a/project-lakitu/x11-drivers/nvidia-drivers-open550/nvidia-drivers-open550-550.90.07.ebuild
+++ b/project-lakitu/x11-drivers/nvidia-drivers-open550/nvidia-drivers-open550-550.90.07.ebuild
@@ -60,7 +60,8 @@
nvidia-uvm(nvidia/${PV}:kernel-module-source:kernel-module-source/kernel-open)"
KBUILD_OUTPUT="${KERNEL_DIR}/build"
linux-mod_pkg_setup
- BUILD_PARAMS="CC=${CC} CXX=${CBUILD}-gcc LD=${LD} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+ CXX="${CBUILD}-gcc"
+ BUILD_PARAMS="CXX=${CXX} KERNEL_SOURCES=${KV_DIR} KBUILD_OUTPUT=${KBUILD_OUTPUT} NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
BUILD_TARGETS="modules"
}
