Skip to content

Commit 68665ab

Browse files
author
connor rigby
committed
Pull in upstream nerves 20.0
2 parents 1e1ca7b + 921db0c commit 68665ab

19 files changed

+44
-536
lines changed

‎.circleci/config.yml

-187
This file was deleted.

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
erl_crash.dump
55
*.ez
66
build.log
7+
archive.log
78
.nerves

‎CHANGELOG.md

+18-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## v0.20.0
4+
5+
Updated dependencies
6+
* [nerves_system_br v0.17.0](https://github.com/nerves-project/nerves_system_br/releases/tag/v0.17.0)
7+
* [nerves_toolchain v0.13.0](https://github.com/nerves-project/toolchains/releases/tag/v0.13.0)
8+
* [nerves v0.9.0](https://github.com/nerves-project/nerves/releases/tag/v0.9.0)
9+
10+
## v0.19.1
11+
12+
Updated dependencies
13+
* [nerves_system_br v0.16.3](https://github.com/nerves-project/nerves_system_br/releases/tag/v0.16.3)
14+
This fixes the call to otp_build so that it always uses Buildroot's version
15+
the autoconf tools.
16+
317
## v0.19.0
418

519
Updated dependencies
@@ -11,14 +25,14 @@
1125
* Start running nerves_system_linter to check for configuration errors.
1226
* Disable console blanking for HDMI to make it easier to capture error messages.
1327
* Automount the boot partition readonly at `/boot`
14-
* Support for reverting firmware.
15-
28+
* Support for reverting firmware.
29+
1630
See [Reverting Firmware](https://hexdocs.pm/nerves_runtime/readme.html#reverting-firmware) for more info on reverting firmware.
17-
31+
1832
See [fwup-revert.conf](https://github.com/nerves-project/nerves_system_rpi/blob/master/fwup-revert.conf) for more information on how fwup handles reverting.
1933

2034
## v0.18.0
21-
35+
2236
Updated dependencies
2337
* [nerves_system_br v0.15.0](https://github.com/nerves-project/nerves_system_br/releases/tag/v0.15.0)
2438
* [toolchain v0.12.1](https://github.com/nerves-project/toolchains/releases/tag/v0.12.1)

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.19.0-farmbot
1+
0.20.0-farmbot

‎mix.exs

+7-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ defmodule NervesSystemFarmbotRpi3.Mixfile do
1616
description: description(),
1717
package: package(),
1818
deps: deps(),
19-
aliases: ["deps.precompile": ["nerves.env", "deps.precompile"]]
19+
aliases: [
20+
"deps.precompile": ["nerves.env", "deps.precompile"],
21+
"deps.get": ["deps.get", "nerves.deps.get"]]
2022
]
2123
end
2224

@@ -28,7 +30,7 @@ defmodule NervesSystemFarmbotRpi3.Mixfile do
2830
[
2931
type: :system,
3032
artifact_url: [
31-
"https://github.com/farmbot-labs/#{@app}/releases/download/v#{@version}/#{@app}-v#{@version}.tar.gz",
33+
{:github_releases, "farmbot-labs/#{@app}"},
3234
],
3335
platform: Nerves.System.BR,
3436
platform_config: [
@@ -40,9 +42,9 @@ defmodule NervesSystemFarmbotRpi3.Mixfile do
4042

4143
defp deps do
4244
[
43-
{:nerves, "~> 0.8", runtime: false},
44-
{:nerves_system_br, "0.16.3", runtime: false},
45-
{:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.12.1", runtime: false},
45+
{:nerves, "~> 0.9", runtime: false },
46+
{:nerves_system_br, "0.17.0", runtime: false},
47+
{:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.13.0", runtime: false},
4648
{:nerves_system_linter, "~> 0.2.2", runtime: false}
4749
]
4850
end

‎mix.lock

+12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
1+
<<<<<<< HEAD
12
%{"distillery": {:hex, :distillery, "1.5.2", "eec18b2d37b55b0bcb670cf2bcf64228ed38ce8b046bb30a9b636a6f5a4c0080", [:mix], [], "hexpm"},
23
"nerves": {:hex, :nerves, "0.8.3", "cd3db3adadf5d4191249770ff2f247884408722f1fef2fa1e24f3145972bcf6f", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"},
34
"nerves_system_br": {:hex, :nerves_system_br, "0.16.3", "3144ebc10fef4e35bf42f05279566efb92b4f81d938dbba096aab50e102dfccc", [:mix], [], "hexpm"},
45
"nerves_system_linter": {:hex, :nerves_system_linter, "0.2.3", "288a04f3d6dd08f97c839b5a5480c511f4c55bd193bc9dffe6f025de79108cea", [:mix], [], "hexpm"},
56
"nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.12.1", "8a65f0123cfee1d229b32c03ce5ee87ce587e6dc0b2dda7de71f290b2fa24386", [:mix], [{:nerves, "~> 0.8", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.2", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
67
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.2.1", "78c7c6cbd086f6b5c0302ed4f1950a3eb9ae8a38d97a98d5266a67d53008b40d", [:mix], [], "hexpm"}}
8+
=======
9+
%{
10+
"distillery": {:hex, :distillery, "1.5.2", "eec18b2d37b55b0bcb670cf2bcf64228ed38ce8b046bb30a9b636a6f5a4c0080", [:mix], [], "hexpm"},
11+
"nerves": {:hex, :nerves, "0.9.0", "41f95cb299565f0b759924430f62d1ae7399f4552d8dcbf83699103fda8fd5ad", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"},
12+
"nerves_system_br": {:hex, :nerves_system_br, "0.17.0", "f7c0d1b6b11e9a1c187b17f2401a00956bebd5c45946bfe2a332ad26ecbf18f9", [:mix], [], "hexpm"},
13+
"nerves_system_linter": {:hex, :nerves_system_linter, "0.2.3", "288a04f3d6dd08f97c839b5a5480c511f4c55bd193bc9dffe6f025de79108cea", [:mix], [], "hexpm"},
14+
"nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.13.0", "998a206d011351be34a95f63362c8195a4e81be81496206390258442166a8353", [:mix], [{:nerves, "~> 0.9", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.3", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
15+
"nerves_toolchain_armv6_rpi_linux_gnueabi": {:hex, :nerves_toolchain_armv6_rpi_linux_gnueabi, "0.12.1", "b4960a83b27d682b902d72615f657e8326ff0d87c886244f5585e614332f5678", [], [{:nerves, "~> 0.8", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.2", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
16+
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.3.0", "37486214f043e695b256785647f33e00b0ea4dcec2dfacd6e2c044c15d656e9d", [:mix], [{:nerves, "~> 0.9", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"},
17+
}
18+
>>>>>>> 9bbf2b8d26c8077f54f7b3bfc7ccfe63c358bdae

‎nerves_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_NERVES_PATH}/patches"
66
BR2_TOOLCHAIN_EXTERNAL=y
77
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
88
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
9-
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v0.12.1/nerves_toolchain_arm_unknown_linux_gnueabihf-0.12.1.linux-x86_64.tar.xz"
9+
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v0.13.0/nerves_toolchain_arm_unknown_linux_gnueabihf-linux_x86_64-0.13.0-D25664C99BC7E3023A2C093C726649E7D50333B9F3887738634F124C9B5BA173.tar.xz"
1010
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-unknown-linux-gnueabihf"
1111
BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
1212
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y

‎rootfs_overlay/etc/erlinit.config

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
# Mount the application partition (run "man fstab" for field names)
3939
# NOTE: This must match the location in the fwup.conf. If it doesn't the system
4040
# will probably still work fine, but you won't get shell history since
41-
# bootloader/nerves_runtime can't mount the application filesystem before
41+
# shoehorn/nerves_runtime can't mount the application filesystem before
4242
# the history is loaded. If this mount fails due to corruption, etc.,
4343
# nerves_runtime will auto-format it. Your applications will need to handle
4444
# initializing any expected files and folders.
@@ -52,7 +52,7 @@
5252
-d "/usr/bin/boardid -b rpi -n 4"
5353
-n farmbot-%.4s
5454

55-
# If using bootloader (https://github.com/nerves-project/bootloader), start the
56-
# bootloader OTP release up first. If bootloader isn't around, erlinit fails back
55+
# If using shoehorn (https://github.com/nerves-project/shoehorn), start the
56+
# shoehorn OTP release up first. If shoehorn isn't around, erlinit fails back
5757
# to the main OTP release.
58-
--boot bootloader
58+
--boot shoehorn

‎test/.gitignore

-12
This file was deleted.

‎test/README.md

-65
This file was deleted.

0 commit comments

Comments
 (0)