chore: rename :bivouac
-> :bivouac_nerves
.
This commit is contained in:
parent
39591409c9
commit
2bc600960f
7 changed files with 25 additions and 41 deletions
|
@ -8,7 +8,7 @@ import Config
|
||||||
# Enable the Nerves integration with Mix
|
# Enable the Nerves integration with Mix
|
||||||
Application.start(:nerves_bootstrap)
|
Application.start(:nerves_bootstrap)
|
||||||
|
|
||||||
config :bivouac, target: Mix.target()
|
config :bivouac_nerves, target: Mix.target()
|
||||||
|
|
||||||
# Customize non-Elixir parts of the firmware. See
|
# Customize non-Elixir parts of the firmware. See
|
||||||
# https://hexdocs.pm/nerves/advanced-configuration.html for details.
|
# https://hexdocs.pm/nerves/advanced-configuration.html for details.
|
||||||
|
|
|
@ -23,7 +23,7 @@ config :nerves_runtime,
|
||||||
config :git_ops,
|
config :git_ops,
|
||||||
mix_project: Mix.Project.get!(),
|
mix_project: Mix.Project.get!(),
|
||||||
changelog_file: "CHANGELOG.md",
|
changelog_file: "CHANGELOG.md",
|
||||||
repository_url: "https://code.harton.nz/james/bivouac",
|
repository_url: "https://code.harton.nz/bivouac/bivouac_nerves",
|
||||||
manage_mix_version?: true,
|
manage_mix_version?: true,
|
||||||
version_tag_prefix: "v",
|
version_tag_prefix: "v",
|
||||||
manage_readme_version: "README.md"
|
manage_readme_version: "README.md"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
defmodule Bivouac do
|
defmodule BivouacNerves do
|
||||||
@moduledoc """
|
@moduledoc """
|
||||||
Documentation for Bivouac.
|
Documentation for BivouacNerves.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
|
@ -8,7 +8,7 @@ defmodule Bivouac do
|
||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
|
||||||
iex> Bivouac.hello
|
iex> BivouacNerves.hello
|
||||||
:world
|
:world
|
||||||
|
|
||||||
"""
|
"""
|
|
@ -1,4 +1,4 @@
|
||||||
defmodule Bivouac.Application do
|
defmodule BivouacNerves.Application do
|
||||||
# See https://hexdocs.pm/elixir/Application.html
|
# See https://hexdocs.pm/elixir/Application.html
|
||||||
# for more information on OTP Applications
|
# for more information on OTP Applications
|
||||||
@moduledoc false
|
@moduledoc false
|
||||||
|
@ -10,7 +10,7 @@ defmodule Bivouac.Application do
|
||||||
def start(_type, _args) do
|
def start(_type, _args) do
|
||||||
# See https://hexdocs.pm/elixir/Supervisor.html
|
# See https://hexdocs.pm/elixir/Supervisor.html
|
||||||
# for other strategies and supported options
|
# for other strategies and supported options
|
||||||
opts = [strategy: :one_for_one, name: Bivouac.Supervisor]
|
opts = [strategy: :one_for_one, name: BivouacNerves.Supervisor]
|
||||||
|
|
||||||
children =
|
children =
|
||||||
[
|
[
|
||||||
|
@ -43,6 +43,6 @@ defmodule Bivouac.Application do
|
||||||
|
|
||||||
@doc false
|
@doc false
|
||||||
def target do
|
def target do
|
||||||
Application.get_env(:bivouac, :target)
|
Application.get_env(:bivouac_nerves, :target)
|
||||||
end
|
end
|
||||||
end
|
end
|
29
mix.exs
29
mix.exs
|
@ -1,21 +1,9 @@
|
||||||
defmodule Bivouac.MixProject do
|
defmodule BivouacNerves.MixProject do
|
||||||
use Mix.Project
|
use Mix.Project
|
||||||
|
|
||||||
@app :bivouac
|
@app :bivouac_nerves
|
||||||
@version "0.1.0"
|
@version "0.1.0"
|
||||||
@all_targets [
|
@all_targets [:rpi4, :x86_64]
|
||||||
:rpi,
|
|
||||||
:rpi0,
|
|
||||||
:rpi2,
|
|
||||||
:rpi3,
|
|
||||||
:rpi3a,
|
|
||||||
:rpi4,
|
|
||||||
:bbb,
|
|
||||||
:osd32mp1,
|
|
||||||
:x86_64,
|
|
||||||
:grisp2,
|
|
||||||
:mangopi_mq_pro
|
|
||||||
]
|
|
||||||
|
|
||||||
def project do
|
def project do
|
||||||
[
|
[
|
||||||
|
@ -33,7 +21,7 @@ defmodule Bivouac.MixProject do
|
||||||
# Run "mix help compile.app" to learn about applications.
|
# Run "mix help compile.app" to learn about applications.
|
||||||
def application do
|
def application do
|
||||||
[
|
[
|
||||||
mod: {Bivouac.Application, []},
|
mod: {BivouacNerves.Application, []},
|
||||||
extra_applications: [:logger, :runtime_tools]
|
extra_applications: [:logger, :runtime_tools]
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
@ -61,17 +49,8 @@ defmodule Bivouac.MixProject do
|
||||||
# bumps to Nerves systems. Since these include Linux kernel and Erlang
|
# bumps to Nerves systems. Since these include Linux kernel and Erlang
|
||||||
# version updates, please review their release notes in case
|
# version updates, please review their release notes in case
|
||||||
# changes to your application are needed.
|
# changes to your application are needed.
|
||||||
{:nerves_system_rpi, "~> 1.19", runtime: false, targets: :rpi},
|
|
||||||
{:nerves_system_rpi0, "~> 1.19", runtime: false, targets: :rpi0},
|
|
||||||
{:nerves_system_rpi2, "~> 1.19", runtime: false, targets: :rpi2},
|
|
||||||
{:nerves_system_rpi3, "~> 1.19", runtime: false, targets: :rpi3},
|
|
||||||
{:nerves_system_rpi3a, "~> 1.19", runtime: false, targets: :rpi3a},
|
|
||||||
{:nerves_system_rpi4, "~> 1.19", runtime: false, targets: :rpi4},
|
{:nerves_system_rpi4, "~> 1.19", runtime: false, targets: :rpi4},
|
||||||
{:nerves_system_bbb, "~> 2.14", runtime: false, targets: :bbb},
|
|
||||||
{:nerves_system_osd32mp1, "~> 0.15", runtime: false, targets: :osd32mp1},
|
|
||||||
{:nerves_system_x86_64, "~> 1.19", runtime: false, targets: :x86_64},
|
{:nerves_system_x86_64, "~> 1.19", runtime: false, targets: :x86_64},
|
||||||
{:nerves_system_grisp2, "~> 0.8", runtime: false, targets: :grisp2},
|
|
||||||
{:nerves_system_mangopi_mq_pro, "~> 0.4", runtime: false, targets: :mangopi_mq_pro},
|
|
||||||
|
|
||||||
# Dev/test deps
|
# Dev/test deps
|
||||||
|
|
||||||
|
|
13
run-qemu.sh
13
run-qemu.sh
|
@ -28,11 +28,16 @@ help() {
|
||||||
[ -f "$IMAGE" ] || (echo "Error: can't find '$IMAGE'"; help)
|
[ -f "$IMAGE" ] || (echo "Error: can't find '$IMAGE'"; help)
|
||||||
|
|
||||||
echo "Starting QEMU..."
|
echo "Starting QEMU..."
|
||||||
|
screen -S bivouac-session \
|
||||||
qemu-system-x86_64 \
|
qemu-system-x86_64 \
|
||||||
|
-m 4G \
|
||||||
-drive file="$IMAGE",if=virtio,format=raw \
|
-drive file="$IMAGE",if=virtio,format=raw \
|
||||||
-drive file="tmp/disk0.img",if=virtio,format=raw \
|
-drive file="tmp/disk0.img",if=virtio,format=qcow2 \
|
||||||
-drive file="tmp/disk1.img",if=virtio,format=raw \
|
-drive file="tmp/disk1.img",if=virtio,format=qcow2 \
|
||||||
-drive file="tmp/disk2.img",if=virtio,format=raw \
|
-drive file="tmp/disk2.img",if=virtio,format=qcow2 \
|
||||||
|
-nographic \
|
||||||
-net nic,model=virtio \
|
-net nic,model=virtio \
|
||||||
-net user,hostfwd=tcp::10022-:22 \
|
-net user,hostfwd=tcp::10022-:22 \
|
||||||
-serial stdio
|
-smp cpus=4,maxcpus=4 \
|
||||||
|
-accel kvm
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
defmodule BivouacTest do
|
defmodule BivouacNervesTest do
|
||||||
use ExUnit.Case
|
use ExUnit.Case
|
||||||
doctest Bivouac
|
doctest BivouacNerves
|
||||||
|
|
||||||
test "greets the world" do
|
test "greets the world" do
|
||||||
assert Bivouac.hello() == :world
|
assert BivouacNerves.hello() == :world
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue