Bump deps to latest; add osd32mp1

Author: fhunleth

.circleci/config.yml

@@ -1,10 +1,10 @@
 defaults: &defaults
   working_directory: /nerves/build
   docker:
-    - image: nervesproject/nerves_system_br:1.11.0
+    - image: nervesproject/nerves_system_br:1.13.2
 
 elixir_version: &elixir_version
-  ELIXIR_VERSION: 1.10.2-otp-22
+  ELIXIR_VERSION: 1.11.1-otp-23
 
 install_elixir: &install_elixir
   run:
@@ -92,6 +92,13 @@ build: &build
 version: 2.0
 
 jobs:
+  build_osd32mp1:
+    <<: *defaults
+    environment:
+      <<: *elixir_version
+      MIX_TARGET: osd32mp1
+    <<: *build
+
   build_rpi4:
     <<: *defaults
     environment:
@@ -156,6 +163,11 @@ jobs:
       - run:
           name: Create Artifacts Dir
           command: mkdir -p /home/nerves/deploy
+      - run:
+          name: osd32mp1
+          command: echo "osd32mp1" > .target
+      - restore_cache:
+          key: nerves/deploy/{{ checksum ".target" }}-{{ .Revision }}-{{ .Environment.CIRCLE_TAG }}
       - run:
           name: rpi4
           command: echo "rpi4" > .target
@@ -211,6 +223,11 @@ workflows:
   version: 2
   build_deploy:
     jobs:
+      - build_osd32mp1:
+          context: org-global
+          filters:
+            tags:
+              only: /.*/
       - build_rpi4:
           context: org-global
           filters:
@@ -254,6 +271,7 @@ workflows:
       - deploy:
           context: org-global
           requires:
+            - build_osd32mp1
             - build_rpi4
             - build_rpi3a
             - build_rpi3

README.md

@@ -47,6 +47,7 @@ by the boards they support:
 * `rpi3` - Raspberry Pi 3 Model B and Model B+
 * `rpi3a` - Raspberry Pi 3 Model A+
 * `rpi4` - Raspberry Pi 4 Model B
+* `osd32mp1` - Octavo OSD32MP1-BRK
 
 Once that's done, you're ready to burn the firmware to the MicroSD card.
 

config/config.exs

@@ -5,6 +5,9 @@
 # is restricted to this project.
 import Config
 
+# Enable the Nerves integration with Mix
+Application.start(:nerves_bootstrap)
+
 config :circuits_quickstart, target: Mix.target()
 
 # Customize non-Elixir parts of the firmware. See
@@ -15,7 +18,7 @@ config :nerves, :firmware, rootfs_overlay: "rootfs_overlay"
 # Set the SOURCE_DATE_EPOCH date for reproducible builds.
 # See https://reproducible-builds.org/docs/source-date-epoch/ for more information
 
-config :nerves, source_date_epoch: "1584774910"
+config :nerves, source_date_epoch: "1603310828"
 
 # Use Ringlogger as the logger backend and remove :console.
 # See https://hexdocs.pm/ring_logger/readme.html for more information on

config/target.exs

@@ -14,8 +14,22 @@ config :shoehorn,
 
 config :nerves_runtime, :kernel, use_system_registry: false
 
-config :nerves_pack,
-  ssh_user_passwords: [{"circuits", "circuits"}]
+# Erlinit can be configured without a rootfs_overlay. See
+# https://github.com/nerves-project/erlinit/ for more information on
+# configuring erlinit.
+
+config :nerves,
+  erlinit: [
+    hostname_pattern: "nerves-%s"
+  ]
+
+# Configure the device for SSH IEx prompt access and firmware updates
+#
+# * See https://hexdocs.pm/nerves_ssh/readme.html for general SSH configuration
+# * See https://hexdocs.pm/ssh_subsystem_fwup/readme.html for firmware updates
+
+config :nerves_ssh,
+  user_passwords: [{"circuits", "circuits"}]
 
 # Configure the network using vintage_net
 # See https://github.com/nerves-networking/vintage_net for more information

mix.exs

@@ -3,30 +3,22 @@ defmodule CircuitsQuickstart.MixProject do
 
   @app :circuits_quickstart
   @version "0.3.0"
-  @all_targets [:rpi, :rpi0, :rpi2, :rpi3, :rpi3a, :rpi4, :bbb, :x86_64]
+  @all_targets [:rpi, :rpi0, :rpi2, :rpi3, :rpi3a, :rpi4, :bbb, :osd32mp1, :x86_64]
 
   def project do
     [
       app: @app,
       version: @version,
-      elixir: "~> 1.9",
-      archives: [nerves_bootstrap: "~> 1.8"],
+      elixir: "~> 1.10",
+      archives: [nerves_bootstrap: "~> 1.9"],
       start_permanent: Mix.env() == :prod,
       build_embedded: true,
-      aliases: [loadconfig: [&bootstrap/1]],
       deps: deps(),
       releases: [{@app, release()}],
       preferred_cli_target: [run: :host, test: :host]
     ]
   end
 
-  # Starting nerves_bootstrap adds the required aliases to Mix.Project.config()
-  # Aliases are only added if MIX_TARGET is set.
-  def bootstrap(args) do
-    Application.start(:nerves_bootstrap)
-    Mix.Task.run("loadconfig", args)
-  end
-
   def application do
     [
       extra_applications: [:logger, :runtime_tools, :inets]
@@ -36,10 +28,10 @@ defmodule CircuitsQuickstart.MixProject do
   defp deps do
     [
       # Dependencies for all targets
-      {:nerves, "~> 1.6.0", runtime: false},
-      {:shoehorn, "~> 0.6"},
-      {:ring_logger, "~> 0.6"},
-      {:toolshed, "~> 0.2"},
+      {:nerves, "~> 1.7.0", runtime: false},
+      {:shoehorn, "~> 0.7.0"},
+      {:ring_logger, "~> 0.8.1"},
+      {:toolshed, "~> 0.2.13"},
 
       # Circuits projects
       {:circuits_uart, "~> 1.3"},
@@ -50,19 +42,19 @@ defmodule CircuitsQuickstart.MixProject do
       {:ramoops_logger, "~> 0.1"},
 
       # Dependencies for all targets except :host
-      {:nerves_runtime, "~> 0.6", targets: @all_targets},
-      {:nerves_pack, "~> 0.3",
-       github: "nerves-project/nerves_pack", branch: "user_password", targets: @all_targets},
+      {:nerves_runtime, "~> 0.11.3", targets: @all_targets},
+      {:nerves_pack, "~> 0.4.0", targets: @all_targets},
 
       # Dependencies for specific targets
-      {:nerves_system_rpi, "~> 1.11", runtime: false, targets: :rpi},
-      {:nerves_system_rpi0, "~> 1.11", runtime: false, targets: :rpi0},
-      {:nerves_system_rpi2, "~> 1.11", runtime: false, targets: :rpi2},
-      {:nerves_system_rpi3, "~> 1.11", runtime: false, targets: :rpi3},
-      {:nerves_system_rpi3a, "~> 1.11", runtime: false, targets: :rpi3a},
-      {:nerves_system_rpi4, "~> 1.11", runtime: false, targets: :rpi4},
-      {:nerves_system_bbb, "~> 2.6", runtime: false, targets: :bbb},
-      {:nerves_system_x86_64, "~> 1.11", runtime: false, targets: :x86_64}
+      {:nerves_system_rpi, "~> 1.13", runtime: false, targets: :rpi},
+      {:nerves_system_rpi0, "~> 1.13", runtime: false, targets: :rpi0},
+      {:nerves_system_rpi2, "~> 1.13", runtime: false, targets: :rpi2},
+      {:nerves_system_rpi3, "~> 1.13", runtime: false, targets: :rpi3},
+      {:nerves_system_rpi3a, "~> 1.13", runtime: false, targets: :rpi3a},
+      {:nerves_system_rpi4, "~> 1.13", runtime: false, targets: :rpi4},
+      {:nerves_system_bbb, "~> 2.8", runtime: false, targets: :bbb},
+      {:nerves_system_osd32mp1, "~> 0.4", runtime: false, targets: :osd32mp1},
+      {:nerves_system_x86_64, "~> 1.13", runtime: false, targets: :x86_64}
     ]
   end