update deps and project for nerves 1.0

.circleci/config.yml

@@ -1,11 +1,11 @@
 defaults: &defaults
   working_directory: /nerves/build
   docker:
-    - image: nervesproject/nerves:1.0.0-rc.0
+    - image: nervesproject/nerves:1.0.0
   environment:
     ENV: CI
     MIX_ENV: test
-    ELIXIR_VERSION: 1.6.1
+    ELIXIR_VERSION: 1.6.4
 
 install_elixir: &install_elixir
   run:
@@ -26,7 +26,7 @@ install_nerves_bootstrap: &install_nerves_bootstrap
   run:
     name: Install nerves_bootstrap
     command: |
-      mix archive.install github nerves-project/nerves_bootstrap --force
+      mix archive.install hex nerves_bootstrap "~> 1.0" --force
 
 version: 2.0
 
@@ -70,7 +70,6 @@ jobs:
               TAG=$CIRCLE_SHA1
             fi
             mix nerves.artifact ${CIRCLE_PROJECT_REPONAME} --path /nerves/deploy/system/artifacts
-            cp .nerves/artifacts/*/images/${CIRCLE_PROJECT_REPONAME}.fw /nerves/deploy/system/artifacts/${CIRCLE_PROJECT_REPONAME}-${TAG}.fw
       - store_artifacts:
           path: /nerves/deploy/system/artifacts
           destination: system

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.0.0
+
+  * Updated dependencies
+    * [nerves_system_br v1.0.0](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.0.0)
+    * [nerves_toolchain v1.0.0](https://github.com/nerves-project/toolchains/releases/tag/v1.0.0)
+    * [nerves v1.0.0](https://github.com/nerves-project/nerves/releases/tag/v1.0.0)
+  * Enhancements
+    * Remove linux console from rendering on the main display
+    * Display Nerves boot logo
+    * Include basic Nerves boot logo web page at /var/www
+
 ## v1.0.0-rc.0
 
   * Updated Dependencies

VERSION

@@ -1 +1 @@
-1.0.0-rc.1
+1.0.0

example/config/config.exs

@@ -20,9 +20,6 @@ config :shoehorn,
   init: [:nerves_runtime, :nerves_init_gadget],
   app: Mix.Project.config()[:app]
 
-config :nerves, :firmware,
-  rootfs_overlay: "rootfs_overlay"
-
 # Add the LoggerCircularBuffer backend. This removes the
 # default :console backend.
 config :logger, backends: [RingLogger]

example/mix.exs

@@ -10,7 +10,7 @@ defmodule Example.MixProject do
       version: "0.1.0",
       elixir: "~> 1.4",
       target: @target,
-      archives: [nerves_bootstrap: "~> 1.0-rc"],
+      archives: [nerves_bootstrap: "~> 1.0"],
       deps_path: "deps/#{@target}",
       build_path: "_build/#{@target}",
       lockfile: "mix.lock.#{@target}",
@@ -29,25 +29,16 @@ defmodule Example.MixProject do
   end
 
   # Run "mix help compile.app" to learn about applications.
-  def application, do: application(@target)
-
-  # Specify target specific application configurations
-  # It is common that the application start function will start and supervise
-  # applications which could cause the host to fail. Because of this, we only
-  # invoke Example.start/2 when running on a target.
-  def application("host") do
-    [extra_applications: [:logger]]
-  end
-
-  def application(_target) do
+  def application do
     [mod: {Example.Application, []}, extra_applications: [:logger]]
   end
 
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:nerves, "~> 1.0-rc", runtime: false},
-      {:ring_logger, "~> 0.4"}
+      {:nerves, "~> 1.0", runtime: false},
+      {:ring_logger, "~> 0.4"},
+      {:shoehorn, "~> 0.2"}
     ] ++ deps(@target)
   end
 
@@ -56,7 +47,6 @@ defmodule Example.MixProject do
 
   defp deps(target) do
     [
-      {:shoehorn, "~> 0.2"},
       {:nerves_runtime, "~> 0.4"},
       {:nerves_network, "~> 0.3"},
       {:nerves_init_gadget, "~> 0.1"},

linux-4.13.defconfig

@@ -112,5 +112,6 @@ CONFIG_EXT4_FS=y
 CONFIG_FUSE_FS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_FILE_DIRECT=y
 CONFIG_CRYPTO_CRC32C_INTEL=y
 CONFIG_CRYPTO_ARC4=y

mix.exs

@@ -56,9 +56,9 @@ defmodule KioskSystemx8664.Mixfile do
 
   defp deps do
     [
-      {:nerves, "~> 1.0-rc", runtime: false},
-      {:nerves_system_br, "~> 1.0-rc", runtime: false},
-      {:nerves_toolchain_x86_64_unknown_linux_gnu , "~> 1.0-rc", runtime: false},
+      {:nerves, "~> 1.0", runtime: false},
+      {:nerves_system_br, "~> 1.0.0", runtime: false},
+      {:nerves_toolchain_x86_64_unknown_linux_gnu , "~> 1.0.0", runtime: false},
       {:nerves_system_linter, "~> 0.3.0", runtime: false}
     ]
   end

mix.lock

@@ -1,9 +1,8 @@
 %{
   "distillery": {:hex, :distillery, "1.5.2", "eec18b2d37b55b0bcb670cf2bcf64228ed38ce8b046bb30a9b636a6f5a4c0080", [:mix], [], "hexpm"},
-  "nerves": {:hex, :nerves, "1.0.0-rc.0", "5c6cf122611d0024d06b88593aa9af46180d30712fc6ff07fa25fb9100125f1e", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"},
-  "nerves_system_br": {:hex, :nerves_system_br, "1.0.0-rc.0", "63400e1a12baa307603d9d0b30fe87de1f67623f71156b278f0be5ce74c7d117", [:mix], [], "hexpm"},
+  "nerves": {:hex, :nerves, "1.0.0", "c5b91388fc15661149bfbe8e85fec70b7034f291a484f2b4f10994d20a03d6d1", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
+  "nerves_system_br": {:hex, :nerves_system_br, "1.0.0", "ea53a05d3a9c5eed1a632757b7014a205cb17f7e415f5f3f3832d48c58aadfb8", [:mix], [], "hexpm"},
   "nerves_system_linter": {:hex, :nerves_system_linter, "0.3.0", "84e0f63c8ac196b16b77608bbe7df66dcf352845c4e4fb394bffd2b572025413", [:mix], [], "hexpm"},
-  "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.4.0-rc.0", "1766752c2a854af5e0f102892d947f787f8f47ee500f564e7fdb50c4d1c4789c", [:mix], [{:nerves, "~> 1.0-rc", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"},
-  "nerves_toolchain_x86_64_unknown_linux_gnu": {:hex, :nerves_toolchain_x86_64_unknown_linux_gnu, "1.0.0-rc.0", "885b813d416ca9428b81def8a45c6abdb16618ec3a87351f7964e297064d2f7d", [:mix], [{:nerves, "~> 1.0-rc", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.4-rc", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
-  "nerves_toolchain_x86_64_unknown_linux_musl": {:hex, :nerves_toolchain_x86_64_unknown_linux_musl, "0.11.0", "15adde7a5df1d35d0f3f9c46cc3784c2d5e4f2b3a5bff7023f33b7799ddef997", [: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.4.0", "ec844dd286a5281223e023edb1359c8763fef79a3af9daac45397713cff1cb88", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"},
+  "nerves_toolchain_x86_64_unknown_linux_gnu": {:hex, :nerves_toolchain_x86_64_unknown_linux_gnu, "1.0.0", "96ba1449387a2445db907ba33ef750648e6637565e4613db0e9a16b82c1430e0", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.4", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
 }

nerves_defconfig

@@ -2,7 +2,7 @@ BR2_x86_64=y
 BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_NERVES_PATH}/patches ${NERVES_DEFCONFIG_DIR}/patches/buildroot"
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
-BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v1.0.0-rc.0/nerves_toolchain_x86_64_unknown_linux_gnu-linux_x86_64-1.0.0-rc.0-7328AFD.tar.xz"
+BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v1.0.0/nerves_toolchain_x86_64_unknown_linux_gnu-linux_x86_64-1.0.0-77CA02D.tar.xz"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-unknown-linux-gnu"
 BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y
@@ -35,7 +35,7 @@ BR2_PACKAGE_LZ4=y
 BR2_PACKAGE_E2FSPROGS=y
 # BR2_PACKAGE_E2FSPROGS_FSCK is not set
 BR2_PACKAGE_DEJAVU=y
-BR2_PACKAGE_CUSTOMLOGO_PATH="$(NERVES_DEFCONFIG_DIR)/logo_custom_clut224.ppm"
+BR2_PACKAGE_CUSTOMLOGO_PATH="${NERVES_DEFCONFIG_DIR}/logo_custom_clut224.ppm"
 BR2_PACKAGE_MESA3D=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y
 BR2_PACKAGE_MESA3D_DRI_DRIVER_I915=y