From 3bda869f2045b6126223bad1a68ff1995d976296 Mon Sep 17 00:00:00 2001
From: Julian Mullings-Black <julianmb@google.com>
Date: Wed, 20 Oct 2021 18:51:35 +0000
Subject: [PATCH] Remove symlink to seL4 kernel for sel4-sys build

- delete the symlink called "seL4"
- remove the manually specified SEL4_DIR environment variable from
Cargo.toml and move to .cargo/config.toml

bug: 202428321

Change-Id: I4f54b730e627a8445560e0e5e7bc056ab7e19062
GitOrigin-RevId: 17743c7034a37ac2dc0d036f405096213888f584
---
 apps/system/components/.cargo/config.toml                     | 4 ++++
 apps/system/components/kata-os-common/src/sel4-sys/Cargo.toml | 3 ---
 apps/system/components/kata-os-common/src/sel4-sys/seL4       | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 apps/system/components/.cargo/config.toml
 delete mode 120000 apps/system/components/kata-os-common/src/sel4-sys/seL4

diff --git a/apps/system/components/.cargo/config.toml b/apps/system/components/.cargo/config.toml
new file mode 100644
index 0000000..37a93d6
--- /dev/null
+++ b/apps/system/components/.cargo/config.toml
@@ -0,0 +1,4 @@
+[env]
+# Pathname to seL4 kernel for xml files and (eventually) tools scripts,
+# defaults to "sel4" if not set
+SEL4_DIR = { value = "../../../../../kernel", relative = true }
\ No newline at end of file
diff --git a/apps/system/components/kata-os-common/src/sel4-sys/Cargo.toml b/apps/system/components/kata-os-common/src/sel4-sys/Cargo.toml
index 4055aea..a0e268b 100644
--- a/apps/system/components/kata-os-common/src/sel4-sys/Cargo.toml
+++ b/apps/system/components/kata-os-common/src/sel4-sys/Cargo.toml
@@ -17,9 +17,6 @@ build = "build.rs"
 
 # NB: used by build.rs
 [env]
-# Pathname to seL4 kernel for xml files and (eventually) tools scripts,
-# defaults to "sel4"
-SEL4_DIR = "sel4"
 # Name of python3 interpreter executable, defaults to "python3"
 PYTHON = "python3"
 
diff --git a/apps/system/components/kata-os-common/src/sel4-sys/seL4 b/apps/system/components/kata-os-common/src/sel4-sys/seL4
deleted file mode 120000
index ed7725c..0000000
--- a/apps/system/components/kata-os-common/src/sel4-sys/seL4
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../kernel
\ No newline at end of file