cros-kernel2: s/CROS_KERNEL_FAMILY/CHROMEOS_KERNEL_FAMILY/
Renaming for being consistent with other kernel vars.
BUG=None
TEST=Build kernel successfully
Cq-Depend: chromium:3488680, chromium:3488681
Change-Id: I2d47df6feaa6e5c57c0852deae5479872986423b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/3485599
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Vineeth Pillai <vineethrp@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Vineeth Pillai <vineethrp@google.com>
diff --git a/eclass/cros-kernel2.eclass b/eclass/cros-kernel2.eclass
index ab194b5..8bfe5b9 100644
--- a/eclass/cros-kernel2.eclass
+++ b/eclass/cros-kernel2.eclass
@@ -46,22 +46,22 @@
WIRELESS_VERSIONS=( 4.2 )
WIRELESS_SUFFIXES=( "${WIRELESS_VERSIONS[@]/.}" )
-CROS_KERNEL_FAMILY_VALUES=(
+CHROMEOS_KERNEL_FAMILY_VALUES=(
arcvm
chromeos
manatee
termina
)
-CROS_KERNEL_FAMILY_FLAGS=(
- "${CROS_KERNEL_FAMILY_VALUES[@]/#/cros_kernel_family_}"
+CHROMEOS_KERNEL_FAMILY_FLAGS=(
+ "${CHROMEOS_KERNEL_FAMILY_VALUES[@]/#/chromeos_kernel_family_}"
)
IUSE="
apply_patches
-asan
buildtest
- ${CROS_KERNEL_FAMILY_FLAGS[*]}
+ ${CHROMEOS_KERNEL_FAMILY_FLAGS[*]}
+clang
-compilation_database
-device_tree
@@ -94,7 +94,7 @@
-lxc
"
REQUIRED_USE="
- ^^ ( ${CROS_KERNEL_FAMILY_FLAGS[*]} )
+ ^^ ( ${CHROMEOS_KERNEL_FAMILY_FLAGS[*]} )
compilation_database? ( clang )
?? ( fit_compression_kernel_lz4 fit_compression_kernel_lzma )
frozen_gcc? ( !clang )
@@ -1676,17 +1676,17 @@
recovery_ramfs? ( || ( tpm tpm2 ) )
"
-# Get the CROS_KERNEL_FAMILY from the use flags(cros_kernel_family_*).
+# Get the CHROMEOS_KERNEL_FAMILY from the use flags(chromeos_kernel_family_*).
_get_kernel_family() {
local i
- for i in "${!CROS_KERNEL_FAMILY_FLAGS[@]}"; do
- if use "${CROS_KERNEL_FAMILY_FLAGS[${i}]}"; then
- echo "${CROS_KERNEL_FAMILY_VALUES[${i}]}"
+ for i in "${!CHROMEOS_KERNEL_FAMILY_FLAGS[@]}"; do
+ if use "${CHROMEOS_KERNEL_FAMILY_FLAGS[${i}]}"; then
+ echo "${CHROMEOS_KERNEL_FAMILY_VALUES[${i}]}"
return
fi
done
- die "cros kernel family use flag not defined!"
+ die "chromeos kernel family use flag not defined!"
}
# If an overlay has eclass overrides, but doesn't actually override this
@@ -2313,7 +2313,7 @@
if [ -e chromeos/scripts/prepareconfig ] ; then
local kernel_family=$(_get_kernel_family)
einfo "Using family: ${kernel_family}"
- CROS_KERNEL_FAMILY="${kernel_family}" chromeos/scripts/prepareconfig \
+ CHROMEOS_KERNEL_FAMILY="${kernel_family}" chromeos/scripts/prepareconfig \
"${config}" "${build_cfg}" || die
else
config="$(eclass_dir)/${cfgarch}_defconfig"
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 73c12dd..19f6d54 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -145,7 +145,7 @@
# ChromeOS-specific: BOARD_USE for accessing board value in cros-board.eclass
# CROS_WORKON_TREE for cros-workon
-# CROS_KERNEL_FAMILY for kernel config family
+# CHROMEOS_KERNEL_FAMILY for kernel config family
# EC_FIRMWARE for compiling the main EC image
# EC_FIRMWARE_EXTRA for compiling other needed EC images
# FPMCU_FIRMWARE for compiling the fingerprint firmware
@@ -173,7 +173,7 @@
${USE_EXPAND}
BOARD_USE
CROS_WORKON_TREE
- CROS_KERNEL_FAMILY
+ CHROMEOS_KERNEL_FAMILY
EC_FIRMWARE
EC_FIRMWARE_EXTRA
FPMCU_FIRMWARE
diff --git a/profiles/targets/chromeos/make.defaults b/profiles/targets/chromeos/make.defaults
index 1a45c47..7004d6f 100644
--- a/profiles/targets/chromeos/make.defaults
+++ b/profiles/targets/chromeos/make.defaults
@@ -174,4 +174,4 @@
LIBDIR_x86="lib"
# Default kernel config family.
-CROS_KERNEL_FAMILY="chromeos"
+CHROMEOS_KERNEL_FAMILY="chromeos"
