Skip to content

Commit 0e8044d

Browse files
committed
Merge branch 'clean' into staging
Change-Id: I330925669d29d3d9815a180309748116bc939168 GitOrigin-RevId: 599a29533bf4c83ef9b9752c47d920321b54c363
1 parent 37cfcbc commit 0e8044d

File tree

4 files changed

+30
-2
lines changed

4 files changed

+30
-2
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ To use crates from Sparrow you can reference them from a local repository or
4545
directly from GitHub using git; e.g. in a Config.toml:
4646
```
4747
kata-os-common = { path = "../system/components/kata-os-common" }
48-
kata-os-common = { git = "https://github.com/google/AmbiML/sparrow/kata" }
48+
kata-os-common = { git = "https://github.com/AmbiML/sparrow/kata" }
4949
```
5050
NB: the git usage depends on cargo's support for searching for a crate
5151
named "kata-os-common" in the kata repo.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INTERFACES=../../../../interfaces
1+
INTERFACES=${OUT}/kata/components
22

33
${INTERFACES}/CamkesBindings.h: src/lib.rs cbindgen.toml
44
cbindgen -c cbindgen.toml src/lib.rs -o $@

easy-settings.cmake

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2022 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# https://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
set(CAMKES_APP "system" CACHE STRING "The one and only CAmkES application in this project")
216
#set(CAPDL_LOADER_APP "capdl-loader-app" CACHE STRING "")
317
set(CAPDL_LOADER_APP "kata-os-rootserver" CACHE STRING "")

rustfmt.toml

+14
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,16 @@
1+
# Copyright 2022 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# https://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
fn_call_width = 70
216
fn_single_line = true

0 commit comments

Comments
 (0)