Commit b40f2c79 authored by Csoregi Natalia's avatar Csoregi Natalia
Browse files

Backed out 2 changesets (bug 1710685) for causing build bustage. CLOSED TREE 

Backed out changeset 52b5058cff53 (bug 1710685)
Backed out changeset 0693e56e6e85 (bug 1710685)
parent 2af226f8

.cargo/config.in

+2 −2
Original line number Diff line number Diff line
@@ -120,12 +120,12 @@ rev = "6b77786a6e758e91da9484a1c80b6fa5f88e1b3d" 
[source."https://github.com/PLSysSec/rlbox_lucet_sandbox/"]

git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/"

replace-with = "vendored-sources"

rev = "681af065e4f1f0f4d053604e47c04a7351c21d78"

rev = "f3cace4fb8b53db0849c62af4fa62bade5a620f7"



[source."https://github.com/PLSysSec/lucet_sandbox_compiler"]

git = "https://github.com/PLSysSec/lucet_sandbox_compiler"

replace-with = "vendored-sources"

rev = "78bf9e2e59536489260d12f1871931e36b2c2e15"

rev = "cd07861d1c92147b35b538e6f94fde7d1986f9ad"



[source.crates-io]

replace-with = "vendored-sources"

Cargo.lock

+7 −6
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ source = "git+https://github.com/bytecodealliance/wasmtime?rev=6b77786a6e758e91d 
[[package]]

name = "cranelift-entity"

version = "0.41.0"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=78bf9e2e59536489260d12f1871931e36b2c2e15#78bf9e2e59536489260d12f1871931e36b2c2e15"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=cd07861d1c92147b35b538e6f94fde7d1986f9ad#cd07861d1c92147b35b538e6f94fde7d1986f9ad"



[[package]]

name = "cranelift-entity"
@@ -2843,7 +2843,7 @@ dependencies = [ 
[[package]]

name = "lucet-module-wasmsbx"

version = "0.1.1"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=78bf9e2e59536489260d12f1871931e36b2c2e15#78bf9e2e59536489260d12f1871931e36b2c2e15"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=cd07861d1c92147b35b538e6f94fde7d1986f9ad#cd07861d1c92147b35b538e6f94fde7d1986f9ad"

dependencies = [

 "bincode",

 "byteorder",
@@ -2859,7 +2859,7 @@ dependencies = [ 
[[package]]

name = "lucet-runtime-internals-wasmsbx"

version = "0.1.1"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=78bf9e2e59536489260d12f1871931e36b2c2e15#78bf9e2e59536489260d12f1871931e36b2c2e15"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=cd07861d1c92147b35b538e6f94fde7d1986f9ad#cd07861d1c92147b35b538e6f94fde7d1986f9ad"

dependencies = [

 "bincode",

 "bitflags",
@@ -2881,7 +2881,7 @@ dependencies = [ 
[[package]]

name = "lucet-runtime-wasmsbx"

version = "0.1.1"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=78bf9e2e59536489260d12f1871931e36b2c2e15#78bf9e2e59536489260d12f1871931e36b2c2e15"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=cd07861d1c92147b35b538e6f94fde7d1986f9ad#cd07861d1c92147b35b538e6f94fde7d1986f9ad"

dependencies = [

 "cc",

 "libc",
@@ -2894,7 +2894,7 @@ dependencies = [ 
[[package]]

name = "lucet-wasi-wasmsbx"

version = "0.1.1"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=78bf9e2e59536489260d12f1871931e36b2c2e15#78bf9e2e59536489260d12f1871931e36b2c2e15"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=cd07861d1c92147b35b538e6f94fde7d1986f9ad#cd07861d1c92147b35b538e6f94fde7d1986f9ad"

dependencies = [

 "cast",

 "failure",
@@ -2903,6 +2903,7 @@ dependencies = [ 
 "lucet-module-wasmsbx",

 "lucet-runtime-internals-wasmsbx",

 "lucet-runtime-wasmsbx",

 "mach",

 "nix",

 "rand",

]
@@ -4300,7 +4301,7 @@ dependencies = [ 
[[package]]

name = "rlbox_lucet_sandbox"

version = "0.1.0"

source = "git+https://github.com/PLSysSec/rlbox_lucet_sandbox/?rev=681af065e4f1f0f4d053604e47c04a7351c21d78#681af065e4f1f0f4d053604e47c04a7351c21d78"

source = "git+https://github.com/PLSysSec/rlbox_lucet_sandbox/?rev=f3cace4fb8b53db0849c62af4fa62bade5a620f7#f3cace4fb8b53db0849c62af4fa62bade5a620f7"

dependencies = [

 "failure",

 "goblin",

Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ chardetng = { git = "https://github.com/hsivonen/chardetng", rev="39f95e2f7cd6e6 
chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" }

libudev-sys = { path = "dom/webauthn/libudev-sys" }

packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" }

rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="681af065e4f1f0f4d053604e47c04a7351c21d78" }

rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="f3cace4fb8b53db0849c62af4fa62bade5a620f7" }

nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }

spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu5" }

minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "5cea1c9a3d8ed3ed2d7bdd5be3285e7821400b7f" }

taskcluster/ci/fetch/toolchains.yml

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ lucetc-source: 
    fetch:

        type: git

        repo: https://github.com/PLSysSec/lucet_sandbox_compiler/

        revision: 78bf9e2e59536489260d12f1871931e36b2c2e15

        revision: cd07861d1c92147b35b538e6f94fde7d1986f9ad



dump-syms:

    description: dump_syms source code

third_party/rust/ashmem/Cargo.toml

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file