Skip to content

Commit

Permalink
Upgraded to latest Nerves version
Browse files Browse the repository at this point in the history
  • Loading branch information
mrusme committed Jun 6, 2021
1 parent 6b0bf2e commit a913326
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 50 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ firmware:

sdcard:
export MIX_TARGET=rpi0 \
&& mix deps.clean --all \
&& mix deps.get \
&& mix deps.compile --all \
&& mix firmware.burn -d ${SD_CARD}

release:
Expand Down
38 changes: 25 additions & 13 deletions mix.exs
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
defmodule Kiwi.MixProject do
use Mix.Project

@app :kiwi
@all_targets [:rpi, :rpi0, :rpi2, :rpi3, :rpi3a, :bbb, :x86_64]

def project do
[
app: :kiwi,
version: "0.1.0",
elixir: "~> 1.8",
archives: [nerves_bootstrap: "~> 1.5"],
app: @app,
version: "1.0.1",
elixir: "~> 1.9",
archives: [nerves_bootstrap: "~> 1.10"],
start_permanent: Mix.env() == :prod,
build_embedded: true,
preferred_cli_target: [run: :host, test: :host],
aliases: [loadconfig: [&bootstrap/1]],
releases: [{@app, release()}],
deps: deps()
]
end
Expand All @@ -29,11 +32,20 @@ defmodule Kiwi.MixProject do
]
end

def release do
[
overwrite: true,
cookie: "#{@app}_cookie",
include_erts: &Nerves.Release.erts/0,
steps: [&Nerves.Release.init/1, :assemble],
strip_beams: Mix.env() == :prod
]
end
defp deps do
[
# Dependencies for all targets
{:nerves, "~> 1.4", runtime: false},
{:shoehorn, "~> 0.4"},
{:nerves, "~> 1.7", runtime: false},
{:shoehorn, "~> 0.6"},
{:ring_logger, "~> 0.6"},
{:toolshed, "~> 0.2"},
{:circuits_gpio, "~> 0.4"},
Expand All @@ -51,13 +63,13 @@ defmodule Kiwi.MixProject do
{:nerves_init_gadget, "~> 0.4", targets: @all_targets},

# Dependencies for specific targets
{:nerves_system_rpi, "~> 1.6", runtime: false, targets: :rpi},
{:nerves_system_rpi0, "~> 1.6", runtime: false, targets: :rpi0},
{:nerves_system_rpi2, "~> 1.6", runtime: false, targets: :rpi2},
{:nerves_system_rpi3, "~> 1.6", runtime: false, targets: :rpi3},
{:nerves_system_rpi3a, "~> 1.6", runtime: false, targets: :rpi3a},
{:nerves_system_bbb, "~> 2.0", runtime: false, targets: :bbb},
{:nerves_system_x86_64, "~> 1.6", runtime: false, targets: :x86_64},
{:nerves_system_rpi, "~> 1.8", runtime: false, targets: :rpi},
{:nerves_system_rpi0, "~> 1.8", runtime: false, targets: :rpi0},
{:nerves_system_rpi2, "~> 1.8", runtime: false, targets: :rpi2},
{:nerves_system_rpi3, "~> 1.8", runtime: false, targets: :rpi3},
{:nerves_system_rpi3a, "~> 1.8", runtime: false, targets: :rpi3a},
{:nerves_system_x86_64, "~> 1.8", runtime: false, targets: :x86_64},
{:nerves_system_bbb, "~> 2.3", runtime: false, targets: :bbb},
]
end
end
33 changes: 0 additions & 33 deletions rel/config.exs

This file was deleted.

3 changes: 0 additions & 3 deletions rel/plugins/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion rel/vm.args
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
## for read only filesystem.

# -name [email protected]
-setcookie 5p6zs3f364hm56663jccfqpbt7jtirdmqswquixuktrr7qmdezq4tpsti4ckvlbp
-setcookie <%= @release.options[:cookie] %>

## Use Ctrl-C to interrupt the current shell rather than invoking the emulator's
## break handler and possibly exiting the VM.
Expand Down

0 comments on commit a913326

Please sign in to comment.