v0.19.2

nerves-project · Dec 6, 2017 · 4e9504f · 4e9504f
1 parent 89958a4
commit 4e9504f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## v0.19.2
+
+  * Bug fixes
+    * Updated toolchains to 0.12.1 which fixes issues with missing app files.
+
+## v0.19.1
+
+  * Bug fixes
+    * Rollback release due to errors with toolchains not defining erlang app files
+
 ## v0.19.0
 
   * Updated dependencies

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.19.0
+0.19.2
diff --git a/mix.exs b/mix.exs
@@ -5,7 +5,7 @@ defmodule NervesSystemRpi0.Mixfile do
   @version Path.join(__DIR__, "VERSION")
     |> File.read!
     |> String.trim
-
+  
   def project do
     [
       app: @app,
@@ -41,8 +41,8 @@ defmodule NervesSystemRpi0.Mixfile do
   defp deps do
     [
       {:nerves, "~> 0.8", runtime: false },
-      {:nerves_system_br, "~> 0.15.1", runtime: false, app: false},
-      {:nerves_toolchain_armv6_rpi_linux_gnueabi, "~> 0.12.0", runtime: false, app: false},
+      {:nerves_system_br, "~> 0.15.1", runtime: false},
+      {:nerves_toolchain_armv6_rpi_linux_gnueabi, "~> 0.12.1", runtime: false},
     ]
   end
 

diff --git a/mix.lock b/mix.lock
@@ -1,5 +1,5 @@
 %{"distillery": {:hex, :distillery, "1.5.2", "eec18b2d37b55b0bcb670cf2bcf64228ed38ce8b046bb30a9b636a6f5a4c0080", [:mix], [], "hexpm"},
   "nerves": {:hex, :nerves, "0.8.3", "cd3db3adadf5d4191249770ff2f247884408722f1fef2fa1e24f3145972bcf6f", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"},
   "nerves_system_br": {:hex, :nerves_system_br, "0.15.1", "990b374cb18050c3e908e6334268eab85e2639219badab6a602a9c81f764acf9", [:mix], [], "hexpm"},
-  "nerves_toolchain_armv6_rpi_linux_gnueabi": {:hex, :nerves_toolchain_armv6_rpi_linux_gnueabi, "0.12.0", "9d403a8e1a1a3542f34f7537cc2cdcb043f7da3097634f15598dce72691724d5", [:mix], [{:nerves, "~> 0.8", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.2", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
-  "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.2.0", "ee7fafe2ba64f10330993dbfbee942d064905c3a5f746076c098e5a61e4aab01", [:mix], [], "hexpm"}}
+  "nerves_toolchain_armv6_rpi_linux_gnueabi": {:hex, :nerves_toolchain_armv6_rpi_linux_gnueabi, "0.12.1", "b4960a83b27d682b902d72615f657e8326ff0d87c886244f5585e614332f5678", [:mix], [{:nerves, "~> 0.8", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.2", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
+  "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.2.1", "78c7c6cbd086f6b5c0302ed4f1950a3eb9ae8a38d97a98d5266a67d53008b40d", [:mix], [], "hexpm"}}
diff --git a/nerves_defconfig b/nerves_defconfig
@@ -5,7 +5,7 @@ BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_NERVES_PATH}/patches"
 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.11.0/nerves_toolchain_armv6_rpi_linux_gnueabi-0.11.0.linux-x86_64.tar.xz"
+BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v0.12.1/nerves_toolchain_armv6_rpi_linux_gnueabi-0.12.1.linux-x86_64.tar.xz"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="armv6-rpi-linux-gnueabi"
 BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
@@ -40,7 +40,7 @@ BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_NERVES_SYSTEM_NAME="nerves_system_rpi0"
-BR2_NERVES_ADDITIONAL_IMAGE_FILES="$(NERVES_DEFCONFIG_DIR)/fwup.conf ${NERVES_DEFCONFIG_DIR}/cmdline.txt ${NERVES_DEFCONFIG_DIR}/config.txt"
+BR2_NERVES_ADDITIONAL_IMAGE_FILES="${NERVES_DEFCONFIG_DIR}/fwup.conf ${NERVES_DEFCONFIG_DIR}/cmdline.txt ${NERVES_DEFCONFIG_DIR}/config.txt"
 BR2_PACKAGE_NBTTY=y
 BR2_PACKAGE_NERVES_CONFIG=y
 BR2_PACKAGE_PIGPIO=y