pull in upstream nerves

Author: Connor Rigby

CHANGELOG.md

@@ -1,13 +1,32 @@
 # Changelog
 
-## v0.16.2-dev
+## v0.17.1
+  Updated dependencies
+  * [nerves_system_br v0.14.1](https://github.com/nerves-project/nerves_system_br/releases/tag/v0.14.1)
+
+## v0.17.0
+
+  Updated dependencies
+  * [nerves_system_br v0.14.0](https://github.com/nerves-project/nerves_system_br/releases/tag/v0.14.0)
+    * [Buildroot 2017.08](https://git.busybox.net/buildroot/plain/CHANGES?id=2017.08)
+    * [fwup 0.17.0](https://github.com/fhunleth/fwup/releases/tag/v0.17.0)
+    * [erlinit 1.2.0](https://github.com/nerves-project/erlinit/releases/tag/v1.2.0)
+    * [nbtty 0.3.0](https://github.com/fhunleth/nbtty/releases/tag/v0.3.0)
+
+  * Enhancements
+    * Add global patch directory
+
+    This is required to pull in the e2fsprogs patch that's needed now that
+    util-linux's uuid_generate function calls getrandom and can block
+    indefinitely for the urandom pool to initialize
 
 ## v0.16.1
 
   Updated dependencies
   * nerves_system_br v0.13.7
 
 ## v0.16.0
+
   This release contains an updated toolchain with Linux 4.1 Headers.
   You will have to clean and compile any c/c++ code in your project and
   dependencies. Failure to do so will result in an error when producing firmware.

VERSION

@@ -1 +1 @@
-0.16.2-farmbot
+0.17.2-farmbot

fwup.conf

@@ -236,7 +236,7 @@ task upgrade.a {
     require-uboot-variable(uboot-env, "b.nerves_fw_architecture", "${NERVES_FW_ARCHITECTURE}")
 
     on-init {
-        info("Upgrading the A partition")
+        info("Upgrading partition A")
 
         # Clear some firmware information just in case this update gets
         # interrupted midway.
@@ -296,7 +296,7 @@ task upgrade.b {
     require-uboot-variable(uboot-env, "a.nerves_fw_architecture", "${NERVES_FW_ARCHITECTURE}")
 
     on-init {
-        info("Upgrading the B partition")
+        info("Upgrading partition B")
 
         # Clear some firmware information just in case this update gets
         # interrupted midway.

mix.exs

@@ -2,8 +2,8 @@ defmodule NervesSystemFarmbotRpi3.Mixfile do
   use Mix.Project
 
   @version Path.join(__DIR__, "VERSION")
-    |> File.read!
-    |> String.trim
+           |> File.read!()
+           |> String.trim()
 
   def project do
     [app: :nerves_system_farmbot_rpi3,
@@ -17,27 +17,42 @@ defmodule NervesSystemFarmbotRpi3.Mixfile do
   end
 
   def application do
-   []
+    []
   end
 
   defp deps do
     [
-      {:nerves, "~> 0.7", runtime: false },
-      {:nerves_system_br, "~> 0.13.7", runtime: false },
+      {:nerves, "~> 0.7", runtime: false},
+      {:nerves_system_br, "~> 0.14.1", runtime: false},
       {:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.11.0", runtime: false}
     ]
   end
 
   defp description do
-   """
-   Nerves System - Raspberry Pi 3 B
-   """
+    """
+    Nerves System - Raspberry Pi 3 B
+    """
   end
 
   defp package do
-   [maintainers: ["Farmbot Team"],
-    files: ["LICENSE", "mix.exs", "nerves_defconfig", "nerves.exs", "README.md", "VERSION", "rootfs_overlay", "fwup.conf", "cmdline.txt", "linux-4.4.defconfig", "config.txt", "post-createfs.sh"],
-    licenses: ["Apache 2.0"],
-    links: %{"Github" => "https://github.com/farmbot-labs/nerves_system_farmbot_rpi3"}]
+    [
+      maintainers: ["Frank Hunleth", "Justin Schneck"],
+      files: [
+        "LICENSE",
+        "mix.exs",
+        "nerves_defconfig",
+        "nerves.exs",
+        "README.md",
+        "VERSION",
+        "rootfs_overlay",
+        "fwup.conf",
+        "cmdline.txt",
+        "linux-4.4.defconfig",
+        "config.txt",
+        "post-createfs.sh"
+      ],
+      licenses: ["Apache 2.0"],
+      links: %{"Github" => "https://github.com/nerves-project/nerves_system_rpi3"}
+    ]
   end
 end

mix.lock

@@ -1,5 +1,5 @@
-%{"distillery": {:hex, :distillery, "1.5.1", "7ad7354214959c0f65f57ddd49478c81c3b2733ca2e5ccfb9eb55351108466aa", [:mix], [], "hexpm"},
+%{"distillery": {:hex, :distillery, "1.5.2", "eec18b2d37b55b0bcb670cf2bcf64228ed38ce8b046bb30a9b636a6f5a4c0080", [:mix], [], "hexpm"},
   "nerves": {:hex, :nerves, "0.7.5", "3aa6a336b2ad6c1c9589cc2b577511b3c4c375c1ba6c533ab9f88adb8c21f0c3", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"},
-  "nerves_system_br": {:hex, :nerves_system_br, "0.13.7", "85399547717c0386a4f2039e3467c14a23c3b77f66a4b97c2a67e48734dab2bb", [:mix], [], "hexpm"},
+  "nerves_system_br": {:hex, :nerves_system_br, "0.14.1", "b108f8e12b2fd5cfd75be72d8ade4a1cfa9b9fd9076380c431ad930a7ccd5526", [:mix], [], "hexpm"},
   "nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.11.0", "8d7606275a2d19de26ae238cd59475f4c06679aa9222b8987518d7c8a7beae51", [:mix], [{:nerves, "~> 0.7", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.1", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
   "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.1.0", "0f03e4a3f3beef5fe271de0148b9f106c417e57f303f635c21c74b4bd6eb68ee", [:mix], [], "hexpm"}}

nerves_defconfig

@@ -11,11 +11,9 @@ BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
-BR2_TARGET_GENERIC_HOSTNAME=""
-BR2_TARGET_GENERIC_ISSUE=""
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/skeleton"
 BR2_INIT_NONE=y
-# BR2_TARGET_GENERIC_GETTY is not set
-# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_ENABLE_LOCALE_WHITELIST="locale-archive"
 BR2_GENERATE_LOCALE="en_US.UTF-8"
 BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/rootfs_overlay ${NERVES_DEFCONFIG_DIR}/rootfs_overlay"
@@ -69,3 +67,4 @@ BR2_PACKAGE_NERVES_CONFIG=y
 BR2_PACKAGE_NERVES_CONFIG_NO_ERLINIT_CONF=y
 BR2_PACKAGE_NERVES_CONFIG_APPS="crypto"
 BR2_PACKAGE_NERVES_CONFIG_SNAME="farmbot"
+BR2_PACKAGE_PIGPIO=y

test/config/config.exs

@@ -20,28 +20,25 @@ websocket_protocol = System.get_env("WEBSOCKET_PROTOCOL") || "ws"
 # Common configuration
 
 # Configure bootloader boot order.
-config :bootloader,
-  app: :nerves_system_test,
-  init: [:nerves_runtime, :nerves_network]
+config(:bootloader, app: :nerves_system_test, init: [:nerves_runtime, :nerves_network])
 
 # Only trust signed firmware
-config :nerves_system_test, :firmware,
-  public_key: System.get_env("NERVES_FW_PUB_KEY")
+config(:nerves_system_test, :firmware, public_key: System.get_env("NERVES_FW_PUB_KEY"))
 
 # Configure system_registry term storage to store the wifi credentials on the
 #  app data partition. If the device is using eth0 as the primary connection
 #  mechanism the wlan0 settings do not need to be configured.
-config :system_registry, SystemRegistry.TermStorage,
-  path: "/root/system_registry",
-  scopes: [
-    [:config, :network_interface, "wlan0", :ssid],
-    [:config, :network_interface, "wlan0", :psk]
-  ]
+config(:system_registry, SystemRegistry.TermStorage, path: "/root/system_registry", scopes: [
+  [:config, :network_interface, "wlan0", :ssid],
+  [:config, :network_interface, "wlan0", :psk]
+])
 
 # Configure the default interface settings.
 # wlan0 | eth0 - Used to establish a connection to the test server.
 # usb0 - configured with linklocal to be validated as part of the test results.
-config :nerves_network, :default,
+config(
+  :nerves_network,
+  :default,
   eth0: [
     ipv4_address_method: :dhcp
   ],
@@ -51,10 +48,14 @@ config :nerves_network, :default,
   usb0: [
     ipv4_address_method: :linklocal
   ]
+)
 
 # Configure the url for the connection to the test server phoenix channel socket.
-config :nerves_system_test, NervesTestServer.Socket,
+config(
+  :nerves_system_test,
+  NervesTestServer.Socket,
   url: "#{websocket_protocol}://#{test_server}/socket/websocket"
+)
 
 # Configure the test suite. nerves_system_test needs to know information such as
 #  system - the name of the system repo the tests are being executed on
@@ -65,24 +66,24 @@ config :nerves_system_test, NervesTestServer.Socket,
 #    of the app and dependencies. The default layout runs tests that are common
 #    across devices (:nerves_system_test) and those that are specific to the
 #    device (this app)
-config :nerves_system_test,
-  system: system,
-  network_interface: network_interface,
-  tests: [
-    {:test, :priv_dir, "test"},
-    {:nerves_system_test, :priv_dir, "test"}
-  ]
+config(:nerves_system_test, system: system, network_interface: network_interface, tests: [
+  {:test, :priv_dir, "test"},
+  {:nerves_system_test, :priv_dir, "test"}
+])
 
 # The configuration stored here is duplicated from the project so it can be
 #  validated by nerves_system_test because the source is unavailable at runtime.
-config :nerves_runtime, :kv,
+config(
+  :nerves_runtime,
+  :kv,
   nerves_fw_application_part0_devpath: app_part_devparth,
   nerves_fw_application_part0_fstype: "ext4",
   nerves_fw_application_part0_target: "/root",
   nerves_fw_architecture: arch,
   nerves_fw_author: "The Nerves Team",
-  nerves_fw_description: Mix.Project.config[:description],
+  nerves_fw_description: Mix.Project.config()[:description],
   nerves_fw_platform: platform,
-  nerves_fw_product: Mix.Project.config[:app],
+  nerves_fw_product: Mix.Project.config()[:app],
   nerves_fw_vcs_identifier: System.get_env("NERVES_FW_VCS_IDENTIFIER"),
-  nerves_fw_version: Mix.Project.config[:version]
+  nerves_fw_version: Mix.Project.config()[:version]
+)

test/lib/test.ex

@@ -1,3 +1,2 @@
 defmodule Test do
-  
 end

test/mix.exs

@@ -1,22 +1,26 @@
-if Mix.env == :test do
-  hash = :os.cmd('git rev-parse HEAD')
+if Mix.env() == :test do
+  hash =
+    :os.cmd('git rev-parse HEAD')
     |> to_string
-    |> String.trim
+    |> String.trim()
+
   System.put_env("NERVES_FW_VCS_IDENTIFIER", hash)
 end
 
 defmodule Test.Mixfile do
   use Mix.Project
 
   def project do
-    [app: :test,
-     version: "0.1.0",
-     elixir: "~> 1.4",
-     archives: [nerves_bootstrap: "~> 0.6"],
-     build_embedded: Mix.env == :prod,
-     start_permanent: Mix.env == :prod,
-     aliases: aliases(),
-     deps: deps()]
+    [
+      app: :test,
+      version: "0.1.0",
+      elixir: "~> 1.4",
+      archives: [nerves_bootstrap: "~> 0.6"],
+      build_embedded: Mix.env() == :prod,
+      start_permanent: Mix.env() == :prod,
+      aliases: aliases(),
+      deps: deps()
+    ]
   end
 
   # Configuration for the OTP application.
@@ -38,13 +42,14 @@ defmodule Test.Mixfile do
       {:nerves, "~> 0.7", runtime: false},
       {:nerves_system_farmbot_rpi3, path: "../", runtime: false},
       {:nerves_system_test, github: "nerves-project/nerves_system_test"}
-      #{:nerves_system_test, path: "../../nerves_system_test"}
+      # {:nerves_system_test, path: "../../nerves_system_test"}
     ]
   end
 
   def aliases() do
-    ["deps.precompile": ["nerves.precompile", "deps.precompile"],
-     "deps.loadpaths":  ["deps.loadpaths", "nerves.loadpaths"]]
+    [
+      "deps.precompile": ["nerves.precompile", "deps.precompile"],
+      "deps.loadpaths": ["deps.loadpaths", "nerves.loadpaths"]
+    ]
   end
-
 end

test/priv/test/test_helper.exs

@@ -1 +1 @@
-ExUnit.start
+ExUnit.start()

test/rel/config.exs

@@ -1,24 +1,21 @@
-use Mix.Releases.Config,
-    # This sets the default release built by `mix release`
-    default_release: :default,
-    # This sets the default environment used by `mix release`
-    default_environment: :dev
+# This sets the default release built by `mix release`
+# This sets the default environment used by `mix release`
+use Mix.Releases.Config, default_release: :default, default_environment: :dev
 
 # For a full list of config options for both releases
 # and environments, visit https://hexdocs.pm/distillery/configuration.html
 
-
 # You may define one or more environments in this file,
 # an environment's settings will override those of a release
 # when building in that environment, this combination of release
 # and environment configuration is called a profile
 
 environment :dev do
-  set cookie: :"eeW260*@lLKngEX.N;Ke>Lu:UWX{WHz_%Z($yrn=YYYU$UuB>2sftLYf!X[}/*Mo"
+  set(cookie: :"eeW260*@lLKngEX.N;Ke>Lu:UWX{WHz_%Z($yrn=YYYU$UuB>2sftLYf!X[}/*Mo")
 end
 
 environment :prod do
-  set cookie: :"eeW260*@lLKngEX.N;Ke>Lu:UWX{WHz_%Z($yrn=YYYU$UuB>2sftLYf!X[}/*Mo"
+  set(cookie: :"eeW260*@lLKngEX.N;Ke>Lu:UWX{WHz_%Z($yrn=YYYU$UuB>2sftLYf!X[}/*Mo")
 end
 
 # You may define one or more releases in this file.
@@ -27,14 +24,14 @@ end
 # will be used by default
 
 release :test do
-  set version: current_version(:test)
-  plugin Bootloader.Plugin
+  set(version: current_version(:test))
+  plugin(Bootloader.Plugin)
+
   if System.get_env("NERVES_SYSTEM") do
-    set dev_mode: false
-    set include_src: false
-    set include_erts: System.get_env("ERL_LIB_DIR")
-    set include_system_libs: System.get_env("ERL_SYSTEM_LIB_DIR")
-    set vm_args: "rel/vm.args"
+    set(dev_mode: false)
+    set(include_src: false)
+    set(include_erts: System.get_env("ERL_LIB_DIR"))
+    set(include_system_libs: System.get_env("ERL_SYSTEM_LIB_DIR"))
+    set(vm_args: "rel/vm.args")
   end
 end
-