[HACK] extra goop to paper over the passage of time
Change-Id: I6ae33ade1f2c1201855b275419bfce5d61395391
diff --git a/src/storage/fuchsia-fatfs/mounter/meta/fatfs_mounter.cml b/src/storage/fuchsia-fatfs/mounter/meta/fatfs_mounter.cml
index 1db633e..48b0a8b 100644
--- a/src/storage/fuchsia-fatfs/mounter/meta/fatfs_mounter.cml
+++ b/src/storage/fuchsia-fatfs/mounter/meta/fatfs_mounter.cml
@@ -19,12 +19,12 @@
{
protocol: "fuchsia.fs.Query",
from: "self",
- as: "svc-fuchsia.fat.Query",
+ as: "fuchsia.fat.Query",
},
{
protocol: "fuchsia.fs.Admin",
from: "self",
- as: "svc-fuchsia.fat.Admin",
+ as: "fuchsia.fat.Admin",
},
],
}
diff --git a/src/sys/appmgr/meta/appmgr.cml b/src/sys/appmgr/meta/appmgr.cml
index 8717390..9c191bd 100644
--- a/src/sys/appmgr/meta/appmgr.cml
+++ b/src/sys/appmgr/meta/appmgr.cml
@@ -336,6 +336,10 @@
path: "/svc_for_sys/fuchsia.space.Manager",
},
{
+ protocol: "fuchsia.pkg.LocalMirror",
+ path: "/svc_for_sys/fuchsia.pkg.LocalMirror",
+ },
+ {
protocol: "fuchsia.feedback.LastRebootInfoProvider",
path: "/svc_for_sys/fuchsia.feedback.LastRebootInfoProvider",
},
diff --git a/src/sys/core/meta/core.cml b/src/sys/core/meta/core.cml
index d6198e8..3997afb 100644
--- a/src/sys/core/meta/core.cml
+++ b/src/sys/core/meta/core.cml
@@ -93,6 +93,10 @@
name: "fatfs-mounter",
url: "fuchsia-pkg://fuchsia.com/fuchsia-fatfs#meta/fatfs-mounter.cm",
},
+ {
+ name: "pkg-local-mirror",
+ url: "fuchsia-pkg://fuchsia.com/pkg-local-mirror#meta/component.cm",
+ },
],
capabilities: [
{
@@ -183,6 +187,13 @@
"fuchsia.fat.Query",
],
from: "#fatfs-mounter",
+ to: [ "#appmgr", "#pkg-local-mirror" ],
+ },
+ {
+ protocol: [
+ "fuchsia.pkg.LocalMirror",
+ ],
+ from: "#pkg-local-mirror",
to: [ "#appmgr" ],
},
{
@@ -350,6 +361,7 @@
"#last_reboot",
"#log-stats",
"#pkg-cache",
+ "#pkg-local-mirror",
"#remote-control",
"#sampler",
"#session-manager",
@@ -502,6 +514,13 @@
subdir: "class/thermal",
},
{
+ directory: "dev",
+ from: "parent",
+ as: "dev-class-block",
+ to: [ "#fatfs-mounter" ],
+ subdir: "class/block",
+ },
+ {
directory: "config-data",
from: "parent",
to: [ "#temperature-logger" ],
diff --git a/src/sys/pkg/BUILD.gn b/src/sys/pkg/BUILD.gn
index 4c96898..bb77ce2 100644
--- a/src/sys/pkg/BUILD.gn
+++ b/src/sys/pkg/BUILD.gn
@@ -84,7 +84,6 @@
merge_sysmgr_config("core_config") {
output = "pkg.config"
deps = [
- "bin/pkg-local-mirror:config",
"bin/pkg-resolver:config",
"bin/system-updater:config",
]
diff --git a/src/sys/pkg/bin/pkg-local-mirror/BUILD.gn b/src/sys/pkg/bin/pkg-local-mirror/BUILD.gn
index 393df0a..1be0929 100644
--- a/src/sys/pkg/bin/pkg-local-mirror/BUILD.gn
+++ b/src/sys/pkg/bin/pkg-local-mirror/BUILD.gn
@@ -27,10 +27,6 @@
sources = [ "src/main.rs" ]
}
-sysmgr_config("config") {
- source = "sysmgr.config"
-}
-
rustc_library("lib") {
visibility = [
":bin",
@@ -61,5 +57,5 @@
}
fuchsia_package("pkg-local-mirror") {
- deps = [":component"]
+ deps = [ ":component" ]
}
diff --git a/src/sys/pkg/bin/pkg-local-mirror/meta/pkg-local-mirror.cml b/src/sys/pkg/bin/pkg-local-mirror/meta/pkg-local-mirror.cml
index 0e4e5e0..06d57df 100644
--- a/src/sys/pkg/bin/pkg-local-mirror/meta/pkg-local-mirror.cml
+++ b/src/sys/pkg/bin/pkg-local-mirror/meta/pkg-local-mirror.cml
@@ -12,12 +12,6 @@
],
use: [
{
- directory: "usb",
- from: "parent",
- rights: [ "r*" ],
- path: "/usb",
- },
- {
protocol: "fuchsia.fat.Admin",
from: "parent",
},
diff --git a/src/sys/pkg/bin/usb-updater/BUILD.gn b/src/sys/pkg/bin/usb-updater/BUILD.gn
index b52c541..4f5bb8e 100644
--- a/src/sys/pkg/bin/usb-updater/BUILD.gn
+++ b/src/sys/pkg/bin/usb-updater/BUILD.gn
@@ -56,6 +56,6 @@
# Run with `fx test usb-updater-unittests`.
fuchsia_unittest_package("usb-updater-unittests") {
- executable_path = "bin/usb_updater_bin_test"
+ #executable_path = "bin/usb_updater_bin_test"
deps = [ ":bin_test" ]
}
diff --git a/src/sys/pkg/bin/usb-updater/meta/usb-updater.cmx b/src/sys/pkg/bin/usb-updater/meta/usb-updater.cmx
index 03df9bb..27c76de 100644
--- a/src/sys/pkg/bin/usb-updater/meta/usb-updater.cmx
+++ b/src/sys/pkg/bin/usb-updater/meta/usb-updater.cmx
@@ -1,10 +1,12 @@
{
+ "include": [
+ "sdk/lib/diagnostics/syslog/client.shard.cmx"
+ ],
"program": {
"binary": "bin/usb_updater"
},
"sandbox": {
"services": [
- "fuchsia.logger.LogSink",
"fuchsia.pkg.RepositoryManager",
"fuchsia.update.usb.Checker"
]
