diff options
| author | Ulises Mendez Martinez <umendez@google.com> | 2024-03-20 14:08:48 +0000 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2024-03-20 17:42:52 +0000 |
| commit | bb0e3a313cccec31639dc7efacc16058c5ce0286 (patch) | |
| tree | 25ee8f4efa71500276ec54c4f83cab4466457e5b | |
| parent | 9161cc053e46eed52a214c31698c160ebf30ae43 (diff) | |
| download | build-bb0e3a313cccec31639dc7efacc16058c5ce0286.tar.gz | |
Revert "kleaf: ACK: Declare KERNEL_DIR under KLEAF_REPO_WORKSPACE_ROOT"
This reverts commit 5ed9a61b49d0fb567f658b374e01585f49f79cf7.
Reason for revert: It breaks use case of having a local repo.
Bug: 328770706
Change-Id: I18c970d44128a1b24faeb4031a8a2cfea46e2756
| -rw-r--r-- | _setup_env.sh | 3 | ||||
| -rw-r--r-- | kleaf/common_kernels.bzl | 5 | ||||
| -rw-r--r-- | kleaf/impl/kernel_env.bzl | 6 |
3 files changed, 1 insertions, 13 deletions
diff --git a/_setup_env.sh b/_setup_env.sh index e56541f..6f0edc2 100644 --- a/_setup_env.sh +++ b/_setup_env.sh @@ -78,9 +78,6 @@ export MODULES_ARCHIVE=modules.tar.gz export TZ=UTC export LC_ALL=C -# TODO(b/291918087): KERNEL_DIR is modified with -# KLEAF_REDECLARE_KERNEL_DIR_UNDER_DYNAMIC_KLEAF_REPO_WORKSPACE_ROOT, making -# the value here incorrect. if [ -z "${SOURCE_DATE_EPOCH}" ]; then if [[ -n "${KLEAF_SOURCE_DATE_EPOCHS}" ]]; then export SOURCE_DATE_EPOCH=$(extract_git_metadata "${KLEAF_SOURCE_DATE_EPOCHS}" "${KERNEL_DIR}" SOURCE_DATE_EPOCH) diff --git a/kleaf/common_kernels.bzl b/kleaf/common_kernels.bzl index daf4dc0..3f5776f 100644 --- a/kleaf/common_kernels.bzl +++ b/kleaf/common_kernels.bzl @@ -482,10 +482,7 @@ def define_common_kernels( # Workaround to set KERNEL_DIR correctly and # avoid using the fallback (directory of the config). - set_kernel_dir_cmd = """\ -KERNEL_DIR=\"{kernel_dir}\" -KLEAF_REDECLARE_KERNEL_DIR_UNDER_DYNAMIC_KLEAF_REPO_WORKSPACE_ROOT=1 -""".format( + set_kernel_dir_cmd = "KERNEL_DIR=\"{kernel_dir}\"".format( kernel_dir = paths.join( native.package_relative_label(":x").workspace_root, native.package_relative_label(":x").package, diff --git a/kleaf/impl/kernel_env.bzl b/kleaf/impl/kernel_env.bzl index 0577263..2011a6e 100644 --- a/kleaf/impl/kernel_env.bzl +++ b/kleaf/impl/kernel_env.bzl @@ -378,11 +378,6 @@ def _get_env_setup_cmds(ctx): export dtstree=$(realpath -s $(dirname ${{DTSTREE_MAKEFILE}}) --relative-to ${{ROOT_DIR}}/${{KERNEL_DIR}}) fi - # Redeclare KERNEL_DIR to be under $KLEAF_REPO_WORKSPACE_ROOT if requested. - if [[ "${{KLEAF_REDECLARE_KERNEL_DIR_UNDER_DYNAMIC_KLEAF_REPO_WORKSPACE_ROOT}}" == "1" ]]; then - export KERNEL_DIR=${{KLEAF_REPO_WORKSPACE_ROOT:+$KLEAF_REPO_WORKSPACE_ROOT/}}${{KERNEL_DIR#{kleaf_repo_workspace_root}}} - fi - ## Set up KCPPFLAGS # Replace ${{ROOT_DIR}} with "/proc/self/cwd" in the file name @@ -408,7 +403,6 @@ def _get_env_setup_cmds(ctx): """.format( get_make_jobs_cmd = status.get_volatile_status_cmd(ctx, "MAKE_JOBS"), linux_x86_libs_path = ctx.files._linux_x86_libs[0].dirname, - kleaf_repo_workspace_root = (ctx.label.workspace_root + "/") if ctx.label.workspace_root else "", ) return struct( pre_env = pre_env, |