overlay: Replace cros_target with new variables

Author: krnowak

sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-libs/glib

@@ -1,5 +1,5 @@
 # Do not install gobject-introspection binaries in production images.
-if [[ $(cros_target) != "cros_host" ]] ; then
+if [[ ${FLATCAR_TYPE} != 'sdk' ]] ; then
 	glib_mask="/usr/bin/gi-* /usr/lib*/libgirepository-2.0*"
 	PKG_INSTALL_MASK+=" ${glib_mask}"
 	INSTALL_MASK+=" ${glib_mask}"

sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-misc/openssh

@@ -2,7 +2,7 @@
 #
 # Do not install the config snippet that defines a subsystem. We have
 # our own definition in coreos-init.
-if [[ $(cros_target) != "cros_host" ]] ; then
+if [[ ${FLATCAR_TYPE} != 'sdk' ]] ; then
 	openssh_mask=" /usr/lib*/misc/ssh-keysign /etc/ssh/sshd_config.d/*gentoo-subsystem.conf "
 	PKG_INSTALL_MASK+="${openssh_mask}"
 	INSTALL_MASK+="${openssh_mask}"

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc

@@ -5,23 +5,6 @@ CROS_BUILD_BOARD_BIN="${CROS_BUILD_BOARD_TREE}/bin"
 
 CROS_ADDONS_TREE="/mnt/host/source/src/third_party/coreos-overlay/coreos"
 
-# Are we merging for the board sysroot, or for the cros sdk, or for
-# the target hardware?  Returns a string:
-#  - cros_host (the sdk)
-#  - board_sysroot
-#  - target_image
-# We can't rely on "use cros_host" as USE gets filtred based on IUSE,
-# and not all packages have IUSE=cros_host.
-cros_target() {
-	if [[ ${CROS_SDK_HOST} == "cros-sdk-host" ]] ; then
-		echo "cros_host"
-	elif [[ ${ROOT%/} == ${SYSROOT%/} ]] ; then
-		echo "board_sysroot"
-	else
-		echo "target_image"
-	fi
-}
-
 # Load all additional bashrc files we have for this package.
 cros_stack_bashrc() {
 	local cfg cfgd

sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults

@@ -2,10 +2,6 @@ FLATCAR_TYPE="sdk"
 
 USE="cros_host expat man -pam"
 
-# Used by some old goo in profiles/coreos/base/profile.bashrc
-# TODO: clean up that old goo
-CROS_SDK_HOST="cros-sdk-host"
-
 # Enable CPU architectures needed by Rust builds
 LLVM_TARGETS="X86 AArch64"