bump nerves versions

.gitignore

@@ -31,7 +31,8 @@ Makefile.bac
 # releases generated by the Makefile
 /release-*
 
-_images
+/images
+/_nerves-tmp
 Makefile
 release-*
 dump.rdb

.travis.yml

@@ -10,7 +10,7 @@ addons:
     - libssl-dev
 env:
   global:
-  - ELIXIR_VERSION=1.4.0 ERLANG_VERSION=19.0
+  - ELIXIR_VERSION=1.4.1 ERLANG_VERSION=19.3
 before_install:
 - wget https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_$ERLANG_VERSION-1~ubuntu~trusty_amd64.deb;
 - sudo dpkg -i esl-erlang_$ERLANG_VERSION-1~ubuntu~trusty_amd64.deb;
@@ -21,7 +21,6 @@ before_script:
 script:
 - mix local.hex --force
 - mix local.rebar --force
-- mix archive.install https://github.com/nerves-project/archives/raw/master/nerves_bootstrap.ez
-  --force
-- elixir generate_makefile.exs
+- mix archive.install https://github.com/nerves-project/archives/raw/master/nerves_bootstrap.ez --force
+- elixir scripts/generate_makefile.exs
 - make travis_test

config/hardware/rpi/rootfs-addition-dev/etc/erlinit.config

@@ -25,7 +25,7 @@
 # Run a program if the Erlang VM exits
 --run-on-exit "/bin/sh"
 # Run a program before the Erlang VM starts
---pre-run-exec "/bin/sh -e /usr/bin/pre_erl.sh"
+# --pre-run-exec "/bin/sh -e /usr/bin/pre_erl.sh"
 
 -m /dev/mmcblk0p3:/state:ext4::
 

config/hardware/rpi/rootfs-additions-prod/etc/erlinit.config

@@ -25,7 +25,7 @@
 # Run a program if the Erlang VM exits
 --run-on-exit "/bin/sh"
 # Run a program before the Erlang VM starts
---pre-run-exec "/bin/sh -e /usr/bin/pre_erl.sh"
+# --pre-run-exec "/bin/sh -e /usr/bin/pre_erl.sh"
 
 -m /dev/mmcblk0p3:/state:ext4::
 

config/hardware/rpi2/rootfs-additions-dev/etc/erlinit.config

@@ -25,7 +25,7 @@
 # Run a program if the Erlang VM exits
 --run-on-exit "/bin/sh"
 # Run a program before the Erlang VM starts
---pre-run-exec "/bin/sh -e /usr/bin/pre_erl.sh"
+# --pre-run-exec "/bin/sh -e /usr/bin/pre_erl.sh"
 
 -m /dev/mmcblk0p3:/state:ext4::
 

config/hardware/rpi2/rootfs-additions-prod/etc/erlinit.config

@@ -25,7 +25,7 @@
 # Run a program if the Erlang VM exits
 --run-on-exit "/bin/sh"
 # Run a program before the Erlang VM starts
---pre-run-exec "/bin/sh -e /usr/bin/pre_erl.sh"
+# --pre-run-exec "/bin/sh -e /usr/bin/pre_erl.sh"
 
 -m /dev/mmcblk0p3:/state:ext4::
 

config/hardware/rpi3/rootfs-additions-dev/etc/erlinit.config

@@ -29,7 +29,7 @@
 --run-on-exit "/bin/sh"
 
 # Run a program before the Erlang VM starts
---pre-run-exec "/bin/sh -e /usr/bin/pre_erl.sh"
+# --pre-run-exec "/bin/sh -e /usr/bin/pre_erl.sh"
 
 -m /dev/mmcblk0p3:/state:ext4::
 

config/hardware/rpi3/rootfs-additions-prod/etc/erlinit.config

@@ -29,7 +29,7 @@
 --run-on-exit "reboot"
 
 # Run a program before the Erlang VM starts
---pre-run-exec "/bin/sh -e /usr/bin/pre_erl.sh"
+# --pre-run-exec "/bin/sh -e /usr/bin/pre_erl.sh"
 
 -m /dev/mmcblk0p3:/state:ext4::
 

lib/mix/tasks/env.ex

@@ -0,0 +1,8 @@
+defmodule Mix.Tasks.Farmbot.Env do
+  @moduledoc false
+  use Mix.Task
+  def run(_) do
+    Mix.shell.info([:green, "Building initial environment for Farmbot OS"])
+    Code.eval_file("scripts/generate_makefile.exs", File.cwd!)
+  end
+end

lib/mix/tasks/upload.ex

@@ -9,7 +9,7 @@ defmodule Mix.Tasks.Farmbot.Upload do
     # TODO(Connor) change this back when nerves is stable again
     # img_path = Mix.Project.config[:images_path]
     # fw_file = Path.join(img_path, "#{otp_app}.fw")
-    fw_file = Path.join(["_images", "#{target}", "#{otp_app}.fw"])
+    fw_file = Path.join(["images", "#{Mix.env()}", "#{target}", "#{otp_app}.fw"])
     unless File.exists?(fw_file) do
        raise "Could not find Firmware!"
     end

mix.exs

@@ -112,6 +112,10 @@ defmodule Farmbot.Mixfile do
 
   defp deps do
     [
+
+      {:nerves, "0.5.1"},
+      {:nerves_runtime, "~> 0.1.0"},
+
       # Hardware stuff
       {:nerves_uart, "0.1.2"}, # uart handling
       {:nerves_lib, github: "nerves-project/nerves_lib"}, # this has a good uuid
@@ -194,10 +198,12 @@ defmodule Farmbot.Mixfile do
   # the nerves_system_* dir to use for this build.
   defp system("host"), do: []
   defp system(sys) do
-    if File.exists?("nerves/NERVES_SYSTEM_#{sys}"),
-      do: System.put_env("NERVES_SYSTEM", Path.absname("nerves/NERVES_SYSTEM_#{sys}", File.cwd!)),
-    else: Mix.shell.info([:yellow, "No Buildroot dir found!"])
-
+    if File.exists?("nerves/NERVES_SYSTEM_#{sys}") do
+      sys_path = Path.absname("nerves/NERVES_SYSTEM_#{sys}", File.cwd!)
+      System.put_env("NERVES_SYSTEM", sys_path)
+    else
+      Mix.shell.info([:yellow, "No Buildroot dir found!"])
+    end
     # if the system is local (because we have changes to it) use that
     if File.exists?("nerves/nerves_system_#{sys}"),
       do: [

mix.lock

@@ -9,7 +9,7 @@
   "cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], []},
   "credo": {:hex, :credo, "0.6.0-rc1", "3db898270ba651aa7d8dc8d844f2827e0111526a01474ab088c7f7f677e83778", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, optional: false]}]},
   "dialyxir": {:hex, :dialyxir, "0.4.3", "a4daeebd0107de10d3bbae2ccb6b8905e69544db1ed5fe9148ad27cd4cb2c0cd", [:mix], []},
-  "distillery": {:hex, :distillery, "1.1.2", "4cf32ecc70ca7eecca9e52e111edf320bd78011050825863cd8bc7ffee686c5d", [:mix], []},
+  "distillery": {:hex, :distillery, "1.2.2", "d5a52920cbe2378c8a21dfc83b526b4225944b9dce7bf170fe5f5cddda81ffb3", [:mix], []},
   "earmark": {:hex, :earmark, "1.0.3", "89bdbaf2aca8bbb5c97d8b3b55c5dd0cff517ecc78d417e87f1d0982e514557b", [:mix], []},
   "elixir_make": {:hex, :elixir_make, "0.4.0", "992f38fabe705bb45821a728f20914c554b276838433349d4f2341f7a687cddf", [:mix], []},
   "ex_doc": {:hex, :ex_doc, "0.14.5", "c0433c8117e948404d93ca69411dd575ec6be39b47802e81ca8d91017a0cf83c", [:mix], [{:earmark, "~> 1.0", [hex: :earmark, optional: false]}]},
@@ -37,17 +37,18 @@
   "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], []},
   "mock": {:hex, :mock, "0.2.1", "bfdba786903e77f9c18772dee472d020ceb8ef000783e737725a4c8f54ad28ec", [:mix], [{:meck, "~> 0.8.2", [hex: :meck, optional: false]}]},
   "mustache": {:hex, :mustache, "0.0.2", "870fbef411c47d17df06a57b8b3f69e26eb110cba0177c34e273db5d94369d9b", [:mix], []},
-  "nerves": {:hex, :nerves, "0.4.8", "aedce69c1eff33dada9457ab24fefdaf0fec877254721871f91c51365f89a5c2", [:mix], [{:distillery, "~> 1.0", [hex: :distillery, optional: false]}]},
+  "nerves": {:hex, :nerves, "0.5.1", "a55d73752e8f271c7aca5fbe47747f07d0e7760b5e858e7f8da17ab06287f49c", [:mix], [{:distillery, "~> 1.0", [hex: :distillery, optional: false]}]},
   "nerves_firmware": {:hex, :nerves_firmware, "0.3.0", "e04dda1dc6ce13bc39f79596a14805e233e5fa78b29e21c2a71eb65691753fe9", [:mix], []},
   "nerves_firmware_http": {:hex, :nerves_firmware_http, "0.3.1", "e6ed2f8aa216df424a18ee56b6160b2aa7df9c3783406c93a61d92efd94acfac", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, optional: false]}, {:nerves_firmware, "~> 0.3", [hex: :nerves_firmware, optional: false]}]},
   "nerves_interim_wifi": {:hex, :nerves_interim_wifi, "0.1.1", "88c65ced1440e96b954189ccfc8a55cb4575cb64a8725907c3e8a9900adb2a70", [:make, :mix], [{:elixir_make, "~> 0.3", [hex: :elixir_make, optional: false]}, {:nerves_network_interface, "~> 0.3.1", [hex: :nerves_network_interface, optional: false]}, {:nerves_wpa_supplicant, "~> 0.2.2", [hex: :nerves_wpa_supplicant, optional: false]}]},
   "nerves_lib": {:git, "https://github.com/nerves-project/nerves_lib.git", "aac351cb3e621831a317f2d2a078257161efa551", []},
   "nerves_network_interface": {:hex, :nerves_network_interface, "0.3.2", "e7450f7eccd7387ceebee6096a0646bcdc0dd4aa77077e5fa81f6767da9b77af", [:make, :mix], [{:elixir_make, "~> 0.3", [hex: :elixir_make, optional: false]}]},
+  "nerves_runtime": {:hex, :nerves_runtime, "0.1.1", "efa80e0dab93a53cb44dacdb6e2a326dfe4b54b94a0da6173c10f410e08fecb5", [:make, :mix], [{:elixir_make, "~> 0.3", [hex: :elixir_make, optional: false]}, {:gen_stage, "~> 0.4", [hex: :gen_stage, optional: false]}, {:nerves_uart, "~> 0.1.0", [hex: :nerves_uart, optional: true]}]},
   "nerves_ssdp_server": {:hex, :nerves_ssdp_server, "0.2.1", "2d010552023fc1a724e8cb5c92479a58552976e6f805b6dbf09babd31f923b8f", [:mix], []},
   "nerves_system_br": {:hex, :nerves_system_br, "0.9.4", "5096a9dfec49d4663ccb94c4a4fe45885303fbf31108f7e9400369bdec94b5e7", [:mix], []},
-  "nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.9.0", "5a1bca8c46776ad24c358ab58800ed470f91a3e294ac6eb8ffda0041954781e1", [:mix], [{:nerves, "~> 0.4.0", [hex: :nerves, optional: false]}, {:nerves_toolchain_ctng, "~> 0.8.0", [hex: :nerves_toolchain_ctng, optional: false]}]},
+  "nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.10.0", "18200c6cc3fcda1cbe263b7f7d50ff05db495b881ade9436cd1667b3e8e62429", [:mix], [{:nerves, "~> 0.4", [hex: :nerves, optional: false]}, {:nerves_toolchain_ctng, "~> 0.9", [hex: :nerves_toolchain_ctng, optional: false]}]},
   "nerves_toolchain_armv6_rpi_linux_gnueabi": {:hex, :nerves_toolchain_armv6_rpi_linux_gnueabi, "0.9.0", "11618febee06ceb16eae5833e0df331599c135727630e1aedec7b2677a5fa9dc", [:mix], [{:nerves, "~> 0.4.0", [hex: :nerves, optional: false]}, {:nerves_toolchain_ctng, "~> 0.8.0", [hex: :nerves_toolchain_ctng, optional: false]}]},
-  "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "0.8.0", "6dff7ed51e1711c5f4da3d559bc528a8265e3dd950dda95f4d6832aed9dbe320", [:mix], []},
+  "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "0.9.0", "825b2b5bbacc3ad20c8513baafd44978616d5b451e6e052cdb727be81e7cdcac", [:mix], []},
   "nerves_uart": {:hex, :nerves_uart, "0.1.2", "4310dbb1721a5a007b8e5c416cf81754415bde6b7e2c9aa65a059886b85e637c", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, optional: false]}]},
   "nerves_wpa_supplicant": {:hex, :nerves_wpa_supplicant, "0.2.3", "2666b21bf0868f0d3b127930c3bacf59b178a0d015d308ae3985dcb7c1595870", [:make, :mix], [{:elixir_make, "~> 0.3", [hex: :elixir_make, optional: false]}]},
   "plug": {:hex, :plug, "1.3.0", "6e2b01afc5db3fd011ca4a16efd9cb424528c157c30a44a0186bcc92c7b2e8f3", [:mix], [{:cowboy, "~> 1.0.1 or ~> 1.1", [hex: :cowboy, optional: true]}, {:mime, "~> 1.0", [hex: :mime, optional: false]}]},

nerves/nerves_system_rpi/rootfs-additions/usr/bin/pre_erl.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-# TODO(Connor): Move this into buildroot patches or something
-
-mkdir -p /tmp/images

nerves/nerves_system_rpi2/rootfs-additions/usr/bin/pre_erl.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-# TODO(Connor): Move this into buildroot patches or something
-
-mkdir -p /tmp/images

nerves/nerves_system_rpi3/mix.exs

@@ -22,15 +22,14 @@ defmodule NervesSystemRpi3.Mixfile do
   end
 
   defp find_nerves_toolchain() do
-    {:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.9.0"}
+    {:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.10.0"}
   end
 
   defp find_nerves() do
     if File.exists?("../nerves") do
       {:nerves, path: "../nerves", override: true}
     else
-      # {:nerves, github: "nerves-project/nerves", tag: "4d1f9bee92b65fc6fbd4f1c1685e46a55baebee1", override: true}
-      {:nerves,  "~> 0.4.8"}
+      {:nerves, "0.5.1"}
     end
   end
 

nerves/nerves_system_rpi3/nerves_defconfig

@@ -5,7 +5,7 @@ BR2_CCACHE=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
 BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
-BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v0.9.0/nerves_toolchain_arm_unknown_linux_gnueabihf-0.9.0.linux-x86_64.tar.xz"
+BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v0.10.0/nerves_toolchain_arm_unknown_linux_gnueabihf-0.9.0.linux-x86_64.tar.xz"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-unknown-linux-gnueabihf"
 BR2_TOOLCHAIN_EXTERNAL_GCC_5=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_4=y

nerves/nerves_system_rpi3/rootfs-additions/usr/bin/pre_erl.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-# TODO(Connor): Move this into buildroot patches or something
-
-mkdir -p /tmp/images

scripts/generate_makefile.exs

@@ -1,4 +1,4 @@
-version = Path.join(__DIR__, "VERSION") |> File.read! |> String.strip
+version = Path.join([__DIR__, "..", "VERSION"]) |> File.read! |> String.strip
 IO.puts version
 
 {commitish, _} = System.cmd("git", ["log", "--pretty=format:%hQQ%adQQ%f", "-1"])
@@ -33,6 +33,9 @@ clean:
 \trm -rf _build
 \trm -rf images
 \trm -rf _images
+\trm -rf latest-release
+\trm Makefile
+\telixir scripts/generate_makefile.exs
 
 test: dev_env
 \tscripts/run_tests.sh