Revert "[components] Add Components v2's component_manager to the running system"
This reverts commit 7b40f79df1115611c01ba2fd5e100d6328d51e56.
Reason for revert: Change break the fx workflow.
Running: 'fx set workstation.x64 --with=//topaz/packages:all,//garnet/packages:all,//peridot/packages:all' fails with:
FAILED: build.ninja
../../buildtools/linux-x64/gn --root=../.. -q --check, --export-compile-commands gen .
ERROR at //products/workstation.gni:25:1: Replacing nonempty list.
kernel_cmdline_args = [
^------------------
This overwrites a previously-defined nonempty list with another nonempty list.
See //products/bringup.gni:12:23: for previous definition
kernel_cmdline_args = [ "bootsvc.next=bin/component_manager,fuchsia-boot:///boot#meta/root.cm,--use-builtin-process-launcher" ]
^-------------------------------------------------------------------------------------------------------
Did you mean to append/modify instead? If you really want to overwrite, do:
foo = []
before reassigning.
See build arg file (use "gn args <out_dir>" to edit):1:1: whence it was imported.
import("//products/workstation.gni")
^----------------------------------
Original change's description:
> [components] Add Components v2's component_manager to the running system
>
> Makes devcoordinator a v2 Component. Start component_manager from
> bootsvc rather than devcoordinator, with devcoordinator being the first
> (and only) component loaded during boot (for now).
>
> This only currently affects builds produced from one of the Fuchsia
> product configurations, not standalone Zircon builds, pending completion
> of BLD-382. When BLD-382 is complete we will update the default
> 'bootsvc.next' in bootsvc.
>
> CF-659 #comment
> BLD-382 #comment
>
> Test: Tested by existing CQ/CI bots; failures would most likely manifest
> as a boot failure, which would be loud and obvious.
> Test: Passed GI and Astro E2E test dry-run.
>
> Change-Id: I2cc7e64a8fa4e2899f4dc685161412c945aeb52f
TBR=jamesr@google.com,jeffbrown@google.com,geb@google.com,shayba@google.com,dgonyeo@google.com,bryanhenry@google.com
Change-Id: Ie0028de72e3611610cd0a3b50875bf89f0d65640
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
diff --git a/build/images/BUILD.gn b/build/images/BUILD.gn
index e22f2ab..ec3a329 100644
--- a/build/images/BUILD.gn
+++ b/build/images/BUILD.gn
@@ -614,13 +614,6 @@
component_manager_manifest =
component_manager_target_dir + "/" + component_manager_target_name
-root_manifests_label = "//src/sys/root:root_manifests.bootfs"
-root_manifests_target_dir =
- get_label_info(root_manifests_label, "target_out_dir")
-root_manifests_target_name = get_label_info(root_manifests_label, "name")
-root_manifests_manifest =
- root_manifests_target_dir + "/" + root_manifests_target_name
-
# The main bootable image, which requires `blob.blk` to appear on some
# attached storage device at runtime.
zbi("fuchsia") {
@@ -630,12 +623,10 @@
":devmgr_config.txt",
":system_image.manifest",
component_manager_label,
- root_manifests_label,
]
inputs = [
- boot_manifest,
component_manager_manifest,
- root_manifests_manifest,
+ boot_manifest,
zircon_kernel_zbi,
]
manifest = [
diff --git a/build/images/zedboot/BUILD.gn b/build/images/zedboot/BUILD.gn
index 71a53d8..06becf44 100644
--- a/build/images/zedboot/BUILD.gn
+++ b/build/images/zedboot/BUILD.gn
@@ -116,20 +116,14 @@
contents = zxcrypt_key_source
}
-component_manager_label = "//src/sys/component_manager:component_manager.bootfs"
+component_manager_label =
+ "//src/sys/component_manager:component_manager.bootfs"
component_manager_target_dir =
get_label_info(component_manager_label, "target_out_dir")
component_manager_target_name = get_label_info(component_manager_label, "name")
component_manager_manifest =
component_manager_target_dir + "/" + component_manager_target_name
-root_manifests_label = "//src/sys/root:root_manifests.bootfs"
-root_manifests_target_dir =
- get_label_info(root_manifests_label, "target_out_dir")
-root_manifests_target_name = get_label_info(root_manifests_label, "name")
-root_manifests_manifest =
- root_manifests_target_dir + "/" + root_manifests_target_name
-
zbi("zbi") {
output_name = "zedboot"
deps = [
@@ -137,11 +131,9 @@
":zedboot.manifest",
":zxcrypt_config.txt",
component_manager_label,
- root_manifests_label,
]
inputs = [
component_manager_manifest,
- root_manifests_manifest,
zircon_kernel_zbi,
manifest_file,
]
diff --git a/products/bringup.gni b/products/bringup.gni
index 8e2e1a2..babaccd 100644
--- a/products/bringup.gni
+++ b/products/bringup.gni
@@ -7,10 +7,6 @@
zircon_enable_kernel_debugging_features = true
zircon_enable_netsvc_debugging_features = true
-# TODO(BLD-382): Once everything is moved over to using these product configs,
-# update the bootsvc default to this.
-kernel_cmdline_args = [ "bootsvc.next=bin/component_manager,fuchsia-boot:///boot#meta/root.cm,--use-builtin-process-launcher" ]
-
meta_package_labels = [ "//build/images:config-data" ]
base_package_labels = []
diff --git a/src/sys/root/BUILD.gn b/src/sys/root/BUILD.gn
deleted file mode 100644
index 1ac88d8..0000000
--- a/src/sys/root/BUILD.gn
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/cmx/cmx.gni")
-import("//build/images/manifest.gni")
-
-cm_compile("root.cm") {
- data = rebase_path("meta/root.cml")
-}
-
-# TODO(BLD-448): This should move into the devcoordinator package that's
-# included in bootfs along with devcoordinator's binary and other
-# resources/libraries. For now it's here since cm_compile doesn't exist in
-# //zircon.
-cm_compile("devcoordinator.cm") {
- data = rebase_path("meta/devcoordinator.cml")
-}
-
-# TODO(BLD-448): Should become a package just containing the root manifests.
-generate_manifest("root_manifests.bootfs") {
- deps = [
- ":devcoordinator.cm",
- ":root.cm",
- ]
-
- root_cm_out = get_target_outputs(":root.cm")
- devc_cm_out = get_target_outputs(":devcoordinator.cm")
- args = [
- "--entry=meta/root.cm=" + rebase_path(root_cm_out[0]),
- "--entry=meta/devcoordinator.cm=" + rebase_path(devc_cm_out[0]),
- ]
-}
diff --git a/src/sys/root/meta/devcoordinator.cml b/src/sys/root/meta/devcoordinator.cml
deleted file mode 100644
index f2a940c..0000000
--- a/src/sys/root/meta/devcoordinator.cml
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "program": { "binary": "bin/devcoordinator" },
- "use": [
- { "directory": "/boot" },
- // TODO: Update to use /svc once this won't conflict with svchost's /svc
- { "service": "/bootsvc/fuchsia.boot.RootResource" },
- { "service": "/bootsvc/fuchsia.boot.RootJob" },
- { "service": "/bootsvc/fuchsia.boot.Arguments" },
- { "service": "/bootsvc/fuchsia.boot.Items" },
- { "service": "/bootsvc/fuchsia.boot.Log" },
- { "service": "/builtin/fuchsia.process.Launcher" },
- ],
-}
diff --git a/src/sys/root/meta/root.cml b/src/sys/root/meta/root.cml
deleted file mode 100644
index 2b3f98f..0000000
--- a/src/sys/root/meta/root.cml
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- "children": [
- {
- "name": "devcoordinator",
- "url": "fuchsia-boot:///boot#meta/devcoordinator.cm",
- "startup": "eager",
- },
- ],
- "offer": [
- {
- "directory": "/boot",
- "from": "realm",
- "to": [ { "dest": "#devcoordinator" } ],
- },
- // TODO: Update bootsvc to export services under /svc instead of /bootsvc
- {
- "service": "/bootsvc/fuchsia.boot.RootJob",
- "from": "realm",
- "to": [ { "dest": "#devcoordinator" } ],
- },
- {
- "service": "/bootsvc/fuchsia.boot.RootResource",
- "from": "realm",
- "to": [ { "dest": "#devcoordinator" } ],
- },
- {
- "service": "/bootsvc/fuchsia.boot.Arguments",
- "from": "realm",
- "to": [ { "dest": "#devcoordinator" } ],
- },
- {
- "service": "/bootsvc/fuchsia.boot.Items",
- "from": "realm",
- "to": [ { "dest": "#devcoordinator" } ],
- },
- {
- "service": "/bootsvc/fuchsia.boot.Log",
- "from": "realm",
- "to": [ { "dest": "#devcoordinator" } ],
- },
- // TODO: Implement routing from /builtin
- {
- "service": "/builtin/fuchsia.process.Launcher",
- "from": "realm",
- "to": [ { "dest": "#devcoordinator" } ],
- },
- ],
-}
-
