Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,19 @@ conflated how the provider resolves the value with how the key hashes it.
version is pinned in code, so `--flutter-version` and `globals.json`'s
`flutter_version` still decide what gets checked out.

- docs: `extends:` is documented unqualified-first. The multi-source section
presented `<source>/<target>` as how `extends:` resolves, without saying that
an unqualified name resolves across every source and that a source name is a
local choice in `boards.yaml` — so a manifest written from the docs only
resolved for someone who picked the same name. The same paragraph claimed
names never collide; board files do not, board names do, which is what the
ambiguity error is for. #273.

- docs: the cross examples no longer carry a `build:` block. `emb cross` and
`emb matrix` never read it — `build.app_path` is parsed by `BuildConfig` and
consumed only by `emb build` — so eight example manifests declared a field
with no effect on the command they demonstrate. #272.



# 0.4.1
Expand Down
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1283,8 +1283,15 @@ shows every path that was tried.
##### Multiple board sources

Board files can come from more than one repository. Each source is named and
installed into its own subdirectory, so names never collide. `extends:` resolves
as `<source>/<target>` (e.g. `extends: raspi-emb/my-board`).
installed into its own subdirectory, so board *files* never collide on disk.
Board *names* still can — that is what the qualified form below is for.

`extends:` takes an unqualified board name (`extends: my-board`) and resolves it
against every configured source. **Prefer that form in a manifest**: a source
name is a local choice recorded in `boards.yaml`, so a manifest that embeds one
only resolves for someone who happened to choose the same name. A name found in
more than one source is a hard error listing the qualified alternatives — reach
for `extends: <source>/<target>` there, and only there.

```sh
# Add a source (GitHub, HTTPS transport — uses the contents API + a PAT):
Expand Down Expand Up @@ -1319,7 +1326,7 @@ sources:

| Field | Default | Description |
|---|---|---|
| `name` | — | Unique name; used in `extends: <name>/<target>` and on disk. |
| `name` | — | Unique name: the install subdirectory, and the prefix in a qualified `extends: <name>/<target>`. Local to this machine, so prefer unqualified board names in manifests. |
| `repo` | — | GitHub `owner/repo`. |
| `path` | `boards` | Subdirectory containing `*.emb.yaml` board files. |
| `ref` | `main` | Git ref to fetch. `auto` resolves to the tag matching this emb (`v<version>`). |
Expand Down
6 changes: 0 additions & 6 deletions examples/cross/agl_sdk_local.emb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ type: app
supported_archs: [arm64]
supported_host_types: [ubuntu, fedora]

build:
app_path: .
archs: [arm64]
modes: [release]
output: bundles

cross:
provider: yocto-sdk
triple: aarch64-agl-linux # AGL distro triple; do not omit
Expand Down
6 changes: 0 additions & 6 deletions examples/cross/agl_sdk_url.emb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ type: app
supported_archs: [arm64]
supported_host_types: [ubuntu, fedora]

build:
app_path: .
archs: [arm64]
modes: [release]
output: bundles

cross:
provider: yocto-sdk
triple: aarch64-agl-linux # AGL distro triple; do not omit
Expand Down
6 changes: 0 additions & 6 deletions examples/cross/beagleplay.emb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@ type: app
supported_archs: [arm64]
supported_host_types: [ubuntu, fedora]

build:
app_path: .
archs: [arm64]
modes: [release]
output: bundles

cross:
provider: arm-gnu
triple: aarch64-none-linux-gnu
Expand Down
6 changes: 0 additions & 6 deletions examples/cross/nitrogen8mm.emb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ type: app
supported_archs: [arm64]
supported_host_types: [ubuntu, fedora]

build:
app_path: .
archs: [arm64]
modes: [release]
output: bundles

cross:
provider: yocto-recipe
triple: aarch64-poky-linux
Expand Down
6 changes: 0 additions & 6 deletions examples/cross/pi5.emb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ type: app
supported_archs: [arm64]
supported_host_types: [ubuntu, fedora]

build:
app_path: .
archs: [arm64]
modes: [release]
output: bundles

cross:
provider: arm-gnu
triple: aarch64-none-linux-gnu
Expand Down
6 changes: 0 additions & 6 deletions examples/cross/radxa_zero3.emb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ type: app
supported_archs: [arm64]
supported_host_types: [ubuntu, fedora]

build:
app_path: .
archs: [arm64]
modes: [release]
output: bundles

cross:
provider: arm-gnu
triple: aarch64-none-linux-gnu
Expand Down
6 changes: 0 additions & 6 deletions examples/cross/raspberry-pi-family.emb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@ type: app
supported_archs: [arm64]
supported_host_types: [ubuntu, fedora]

build:
app_path: .
archs: [arm64]
modes: [release]
output: bundles

cross:
# Merged into every backend (a backend's own key wins on a clash).
defines:
Expand Down
6 changes: 0 additions & 6 deletions examples/cross/unoq.emb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@ type: app
supported_archs: [arm64]
supported_host_types: [ubuntu, fedora]

build:
app_path: .
archs: [arm64]
modes: [release]
output: bundles

cross:
provider: arm-gnu
triple: aarch64-none-linux-gnu
Expand Down
Loading