Merge remote-tracking branch 'origin/6.0/stage'

Author: Delphix Engineering

default-package-config.sh

@@ -155,6 +155,14 @@ function kernel_build() {
 	local build_deps_tool="apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes"
 	logmust sudo mk-build-deps --install debian/control --tool "${build_deps_tool}"
 
+	#
+	# Here we update the configs used to control the kernel's build
+	# system. This is useful as it allows us to override various
+	# kernel config options via an OVERRIDES file, which we use to
+	# disable varous kernel modules that we don't need or want.
+	#
+	logmust fakeroot debian/rules updateconfigs "${debian_rules_args[@]}"
+
 	logmust fakeroot debian/rules "binary" "${debian_rules_args[@]}"
 
 	logmust cd "$WORKDIR"