diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc index 90c5cf4e5d..3e89f0fb61 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc +++ b/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 -} - # Are we merging for the board sysroot, or for the SDK, or for # the images? Returns a string in a passed variable: # diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults index d0da1b9838..3fb2f4e9a7 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults +++ b/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"