kata: Step 3: Rename symbols and change out paths. Change-Id: I4f7d21c631b5c2cd3e95922a7a736d4a697c0aa8
diff --git a/build-camkes.sh b/build-camkes.sh index a88451f..df2c7cd 100755 --- a/build-camkes.sh +++ b/build-camkes.sh
@@ -17,7 +17,7 @@ # This script is derived from work by mwitkowski@antmicro.com # Script for building a CAmkES test setup using the minimal bits from -# KataOS. This is meant for testing kata-os-common portability and as +# CantripOS. This is meant for testing cantrip-os-common portability and as # a pathway to public use of the Rust code bits. # # This script assumes you have a gnu toolchain setup for the target @@ -25,8 +25,8 @@ # The rust compiler likewise must be in your search path; the script # will use rustup to request target support. # -# Beware the KataOS Rust code currently uses a nightly build of Rust. -# Check projects/kata/apps/system/rust.cmake for cargo usage. +# Beware the CantripOS Rust code currently uses a nightly build of Rust. +# Check projects/cantrip/apps/system/rust.cmake for cargo usage. # # The riscv* and arm/aarch* targets are build tested and in some cases # tested under simulation. The x86* targets are untested and likely @@ -105,7 +105,7 @@ -DCROSS_COMPILER_PREFIX=${CROSS_COMPILER_PREFIX} \ -DRUST_TARGET=${RUST_TARGET} \ -DPLATFORM=${PLATFORM} \ - -DCAPDL_LOADER_APP=kata-os-rootserver \ + -DCAPDL_LOADER_APP=cantrip-os-rootserver \ -DSIMULATION=TRUE \ ${EXTRA_INIT_ARGS} popd # build
diff --git a/create-kshell-socket-port.sh b/create-kshell-socket-port.sh index e2f11dd..ae0c55b 100755 --- a/create-kshell-socket-port.sh +++ b/create-kshell-socket-port.sh
@@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Create kata shell socket port based on the renode port number as the input +# Create cantrip shell socket port based on the renode port number as the input # argument. TERM_PORT=${1:-0}
diff --git a/kcargo.sh b/kcargo.sh index b058374..afaddc3 100755 --- a/kcargo.sh +++ b/kcargo.sh
@@ -24,13 +24,13 @@ # HACK: sel4-config needs a path to the kernel build which could be # in debug or release -export SEL4_OUT_DIR=${SEL4_OUT_DIR:-"$ROOTDIR/out/kata/riscv32-unknown-elf/debug/kernel/"} +export SEL4_OUT_DIR=${SEL4_OUT_DIR:-"$ROOTDIR/out/cantrip/riscv32-unknown-elf/debug/kernel/"} if [[ ! -d "${SEL4_OUT_DIR}/gen_config" ]]; then echo "No kernel build found at ${SEL4_OUT_DIR}; build a kernel first" exit 2 fi -CARGO="${CARGO_HOME}/bin/cargo +${KATA_RUST_VERSION}" +CARGO="${CARGO_HOME}/bin/cargo +${CANTRIP_RUST_VERSION}" CARGO_TARGET="--target riscv32imac-unknown-none-elf" CARGO_OPTS='-Z unstable-options -Z avoid-dev-deps'
diff --git a/kgdb.sh b/kgdb.sh index 7ea4bdb..48fc902 100755 --- a/kgdb.sh +++ b/kgdb.sh
@@ -29,14 +29,14 @@ PROGRAM=out/shodan_boot_rom/multihart_boot_rom/multihart_boot_rom.elf REMOTE=localhost:3333 -KATA_OUT=out/kata/${TARGET}/debug +CANTRIP_OUT=out/cantrip/${TARGET}/debug MATCHA_OUT=out/matcha/riscv32imc-unknown-none-elf/debug USE_SEL4_EXTENSIONS="true" USE_SEL4_SYMBOL_AUTOSWITCHING="false" -export SOURCE_DIR=${ROOTDIR}/kata -export BUILD_DIR=$KATA_OUT +export SOURCE_DIR=${ROOTDIR}/cantrip +export BUILD_DIR=$CANTRIP_OUT function parseargv { local usage="Usage: kgdb.sh [-h|--help] [-S|--no-sel4-extensions] [-a|--sel4-symbol-autoswitching]"
diff --git a/kmem.sh b/kmem.sh index c55dbdc..0bba9c3 100755 --- a/kmem.sh +++ b/kmem.sh
@@ -92,5 +92,5 @@ parseargv "$@" -KATA_OUT="${ROOTDIR}/out/kata/${TARGET}/${BUILD}" -exec awk -f "${ROOTDIR}/scripts/mem.awk" "${KATA_OUT}/system.cdl" DETAILS="${DETAILS}" +CANTRIP_OUT="${ROOTDIR}/out/cantrip/${TARGET}/${BUILD}" +exec awk -f "${ROOTDIR}/scripts/mem.awk" "${CANTRIP_OUT}/system.cdl" DETAILS="${DETAILS}"
diff --git a/kshell.sh b/kshell.sh index 3d173b3..d6075a6 100755 --- a/kshell.sh +++ b/kshell.sh
@@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Connect to the kata console shell & optionally tee output +# Connect to the cantrip console shell & optionally tee output # to /tmp/kshell*.log # Usage: kshell [-l] [port]
diff --git a/kupload.sh b/kupload.sh index 5c6761d..effa18e 100755 --- a/kupload.sh +++ b/kupload.sh
@@ -14,6 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# ZMODEM upload to the Kata rz command over the pty simulating the UART +# ZMODEM upload to the Cantrip rz command over the pty simulating the UART sz -O $1 < /tmp/term > /tmp/term
diff --git a/preupload-hooks/rustfmt.py b/preupload-hooks/rustfmt.py index 5e92401..7922788 100755 --- a/preupload-hooks/rustfmt.py +++ b/preupload-hooks/rustfmt.py
@@ -53,8 +53,8 @@ if not file_list: sys.exit(0) - nightly_flag = os.getenv("KATA_RUST_VERSION") if os.getenv( - "KATA_RUST_VERSION") else "nightly-2021-11-05" + nightly_flag = os.getenv("CANTRIP_RUST_VERSION") if os.getenv( + "CANTRIP_RUST_VERSION") else "nightly-2021-11-05" cmd = [opts.rustfmt_path, f"+{nightly_flag}", "--check", "--color", "never"]