diff --git a/Cargo.lock b/Cargo.lock index 867c643..a3cfcb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bindgen" @@ -36,15 +36,15 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.60", + "syn 2.0.68", "which", ] [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block-buffer" @@ -72,9 +72,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -123,15 +123,15 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys", @@ -190,9 +190,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -202,15 +202,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", "windows-targets", @@ -218,9 +218,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -234,15 +234,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "minimal-lexical" @@ -303,7 +303,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.68", ] [[package]] @@ -319,19 +319,19 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.60", + "syn 2.0.68", ] [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -347,9 +347,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -359,9 +359,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -370,9 +370,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rustc-hash" @@ -404,9 +404,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scopeguard" @@ -417,7 +417,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sel4" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "cfg-if", "sel4-config", @@ -427,12 +427,12 @@ dependencies = [ [[package]] name = "sel4-bitfield-ops" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" [[package]] name = "sel4-bitfield-parser" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "pest", "pest_derive", @@ -442,12 +442,12 @@ dependencies = [ [[package]] name = "sel4-build-env" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" [[package]] name = "sel4-config" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "sel4-config-data", "sel4-config-generic", @@ -458,7 +458,7 @@ dependencies = [ [[package]] name = "sel4-config-data" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "lazy_static", "sel4-build-env", @@ -469,7 +469,7 @@ dependencies = [ [[package]] name = "sel4-config-generic" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "fallible-iterator", "proc-macro2", @@ -481,7 +481,7 @@ dependencies = [ [[package]] name = "sel4-config-generic-types" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "serde", ] @@ -489,7 +489,7 @@ dependencies = [ [[package]] name = "sel4-config-macros" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "sel4-config-data", "sel4-config-generic", @@ -498,7 +498,7 @@ dependencies = [ [[package]] name = "sel4-dlmalloc" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "dlmalloc", "lock_api", @@ -507,17 +507,17 @@ dependencies = [ [[package]] name = "sel4-elf-header" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" [[package]] name = "sel4-immediate-sync-once-cell" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" [[package]] name = "sel4-initialize-tls" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "cfg-if", ] @@ -525,7 +525,7 @@ dependencies = [ [[package]] name = "sel4-panicking" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "cfg-if", "rustc_version", @@ -537,12 +537,12 @@ dependencies = [ [[package]] name = "sel4-panicking-env" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" [[package]] name = "sel4-root-task" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "sel4", "sel4-dlmalloc", @@ -557,7 +557,7 @@ dependencies = [ [[package]] name = "sel4-root-task-macros" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "proc-macro2", "quote", @@ -567,7 +567,7 @@ dependencies = [ [[package]] name = "sel4-runtime-common" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "cfg-if", "sel4", @@ -580,7 +580,7 @@ dependencies = [ [[package]] name = "sel4-rustfmt-helper" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "which", ] @@ -588,7 +588,7 @@ dependencies = [ [[package]] name = "sel4-sync" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "lock_api", "sel4", @@ -598,7 +598,7 @@ dependencies = [ [[package]] name = "sel4-sys" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#96e2b8c74d8fa1308d221e98134acaff68d151a6" +source = "git+https://github.com/seL4/rust-sel4#be7d740dc70e8f438b31cb6a069261a5b5af109d" dependencies = [ "bindgen", "glob", @@ -617,35 +617,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.68", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -682,9 +682,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -693,22 +693,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.68", ] [[package]] diff --git a/docker/Dockerfile b/docker/Dockerfile index 6c93ed1..bb85b91 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -28,7 +28,7 @@ RUN set -eux; \ https://github.com/seL4/seL4.git \ --config advice.detachedHead=false; \ cd seL4; \ - git checkout 0260fba168b74dd2504c9447f2fa8da1161ead87; + git checkout cd6d3b8c25d49be2b100b0608cf0613483a6fffa; RUN set -eux; \ cd seL4; \ @@ -36,7 +36,6 @@ RUN set -eux; \ -DCROSS_COMPILER_PREFIX=aarch64-linux-gnu- \ -DCMAKE_INSTALL_PREFIX=$SEL4_INSTALL_DIR \ -DKernelPlatform=qemu-arm-virt \ - # TODO further develop kernel loader to make KernelArmHypervisorSupport=ON unecessary -DKernelArmHypervisorSupport=ON \ -DKernelVerificationBuild=OFF \ -DARM_CPU=cortex-a57 \ @@ -49,7 +48,7 @@ RUN set -eux; \ RUN set -eux; \ url="https://github.com/seL4/rust-sel4"; \ - rev="a20aab14c0533d3145a2db75020e60151ce9b78f"; \ + rev="be7d740dc70e8f438b31cb6a069261a5b5af109d"; \ common_args="--git $url --rev $rev --root $SEL4_INSTALL_DIR"; \ CC_aarch64_unknown_none=aarch64-linux-gnu-gcc \ SEL4_PREFIX=$SEL4_INSTALL_DIR \