No public description PiperOrigin-RevId: 638751141 Change-Id: I01f585f06f3a07deb297c56eb149d04c10e7d78a
diff --git a/WORKSPACE b/WORKSPACE index 43cc395..4937898 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -14,15 +14,21 @@ workspace(name = "com_google_mpact-cheriot") -# First load the immediate repo dependencies (mpact-sim). +# First load the immediate repo dependencies (mpact-riscv). load("@com_google_mpact-cheriot//:repos.bzl", "mpact_cheriot_repos") mpact_cheriot_repos() -# Next load in the transitive repo dependencies. -load("@com_google_mpact-cheriot//:dep_repos.bzl", "mpact_cheriot_dep_repos") +# Next load in the riscv immediate dependency. +load("@com_google_mpact-cheriot//:riscv_repos.bzl", "mpact_cheriot_riscv_repos") -mpact_cheriot_dep_repos() +mpact_cheriot_riscv_repos() + +# Next load in the transitive repo dependencies. +load("@com_google_mpact-cheriot//:riscv_dep_repos.bzl", + "mpact_cheriot_riscv_dep_repos") + +mpact_cheriot_riscv_dep_repos() # Call the deps function. It will call any other dependent deps functions. load("@com_google_mpact-cheriot//:deps.bzl", "mpact_cheriot_deps");
diff --git a/repos.bzl b/repos.bzl index 6490680..7692c61 100644 --- a/repos.bzl +++ b/repos.bzl
@@ -22,7 +22,7 @@ if not native.existing_rule("com_google_mpact-riscv"): http_archive( name = "com_google_mpact-riscv", - sha256 = "43606c66d9664f824967345036c5a6c808f9a1f219a082a078382ef091c13ae3", - strip_prefix = "mpact-riscv-116a72298bc6c012644739cb84e7ff593673cb84", - url = "https://github.com/google/mpact-riscv/archive/116a72298bc6c012644739cb84e7ff593673cb84.tar.gz", + sha256 = "7c12d949d13ce86d61fa360d562cff5cd10a7cf9c25a10bee7cba1d852c503f7", + strip_prefix = "mpact-riscv-59226a24935d2a0036c797c44c472c8b538af662", + url = "https://github.com/google/mpact-riscv/archive/59226a24935d2a0036c797c44c472c8b538af662.tar.gz", )
diff --git a/gitfiles/dep_repos.bzl b/riscv_dep_repos.bzl similarity index 86% rename from gitfiles/dep_repos.bzl rename to riscv_dep_repos.bzl index ba185a7..1b9a4f6 100644 --- a/gitfiles/dep_repos.bzl +++ b/riscv_dep_repos.bzl
@@ -14,9 +14,9 @@ """Call the first level dependent repos to load their dependencies.""" -load("@com_google_mpact-riscv//:repos.bzl", "mpact_riscv_dep_repos") +load("@com_google_mpact-riscv//:dep_repos.bzl", "mpact_riscv_dep_repos") -def mpact_cheriot_dep_repos(): +def mpact_cheriot_riscv_dep_repos(): """ Extra dependencies to finish setting up repositories""" mpact_riscv_dep_repos()
diff --git a/gitfiles/dep_repos.bzl b/riscv_repos.bzl similarity index 84% copy from gitfiles/dep_repos.bzl copy to riscv_repos.bzl index ba185a7..3def0d4 100644 --- a/gitfiles/dep_repos.bzl +++ b/riscv_repos.bzl
@@ -14,9 +14,9 @@ """Call the first level dependent repos to load their dependencies.""" -load("@com_google_mpact-riscv//:repos.bzl", "mpact_riscv_dep_repos") +load("@com_google_mpact-riscv//:repos.bzl", "mpact_riscv_repos") -def mpact_cheriot_dep_repos(): +def mpact_cheriot_riscv_repos(): """ Extra dependencies to finish setting up repositories""" - mpact_riscv_dep_repos() + mpact_riscv_repos()