Merge pull request #4 from nerves-project/pkg

Support for nerves ~> 0.4.0

.gitignore

@@ -4,3 +4,4 @@
 erl_crash.dump
 *.ez
 build.log
+.nerves

.travis.yml

@@ -48,18 +48,19 @@ script:
   - mix deps.get
   - mix archive.install https://github.com/nerves-project/archives/raw/master/nerves_bootstrap.ez --force
   - mix compile
-  - export NERVES_SYSTEM=$NERVES_PACKAGE/_build/dev/nerves/system
-  - export NERVES_TOOLCHAIN=$NERVES_PACKAGE/_build/dev/nerves/toolchain
-  - git clone https://github.com/nerves-project/nerves-examples
-  - cd nerves-examples/hello_gpio
-  - MIX_ENV=travis mix deps.get
-  - MIX_ENV=travis mix compile
-  - MIX_ENV=travis mix firmware
+  # - export NERVES_SYSTEM=$NERVES_PACKAGE/_build/dev/nerves/system
+  # - export NERVES_TOOLCHAIN=$NERVES_PACKAGE/_build/dev/nerves/toolchain
+  # - git clone https://github.com/nerves-project/nerves-examples
+  # - cd nerves-examples/hello_gpio
+  # - MIX_ENV=travis mix deps.get
+  # - MIX_ENV=travis mix compile
+  # - MIX_ENV=travis mix firmware
 
 # Deploy the build products
 before_deploy:
+    - cd $NERVES_PACKAGE/.nerves/artifacts/*
+    - make system
     - cd $NERVES_PACKAGE
-    - mix compress.nerves_system
     - $NERVES_PACKAGE/deps/nerves_system_br/scripts/ci-deploy.sh
 
 deploy:

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v0.9.0
+
+This version switches to using the `nerves_package` compiler. This will
+consolidate overall deps and compilers.
+
+  * Nerves.System.BR v0.8.1
+    * Support for distillery
+    * Support for nerves_package compiler
+
 ## v0.7.0
 
 When upgrading to this version, be sure to review the updates to

VERSION

@@ -1 +1 @@
-0.7.0
+0.9.0

mix.exs

@@ -9,20 +9,20 @@ defmodule NervesSystemRpi3.Mixfile do
     [app: :nerves_system_rpi3,
      version: @version,
      elixir: "~> 1.2",
-     compilers: Mix.compilers ++ [:nerves_system],
-     description: description,
-     package: package,
-     deps: deps]
+     compilers: Mix.compilers ++ [:nerves_package],
+     description: description(),
+     package: package(),
+     deps: deps()]
   end
 
   def application do
    []
   end
 
   defp deps do
-    [{:nerves_system, "~> 0.1.5"},
-     {:nerves_system_br, "~> 0.7.0"},
-     {:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.7.0"}]
+    [{:nerves, "~> 0.4.0"},
+     {:nerves_system_br, "~> 0.8.1"},
+     {:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.8.0"}]
   end
 
   defp description do

mix.lock

@@ -1,15 +1,5 @@
-%{"certifi": {:hex, :certifi, "0.4.0", "a7966efb868b179023618d29a407548f70c52466bf1849b9e8ebd0e34b7ea11f", [:rebar3], []},
-  "cf": {:hex, :cf, "0.2.1", "69d0b1349fd4d7d4dc55b7f407d29d7a840bf9a1ef5af529f1ebe0ce153fc2ab", [:rebar3], []},
-  "erlware_commons": {:hex, :erlware_commons, "0.21.0", "a04433071ad7d112edefc75ac77719dd3e6753e697ac09428fc83d7564b80b15", [:rebar3], [{:cf, "0.2.1", [hex: :cf, optional: false]}]},
-  "hackney": {:hex, :hackney, "1.6.0", "8d1e9440c9edf23bf5e5e2fe0c71de03eb265103b72901337394c840eec679ac", [:rebar3], [{:ssl_verify_fun, "1.1.0", [hex: :ssl_verify_fun, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:idna, "1.2.0", [hex: :idna, optional: false]}, {:certifi, "0.4.0", [hex: :certifi, optional: false]}]},
-  "httpoison": {:hex, :httpoison, "0.8.3", "b675a3fdc839a0b8d7a285c6b3747d6d596ae70b6ccb762233a990d7289ccae4", [:mix], [{:hackney, "~> 1.6.0", [hex: :hackney, optional: false]}]},
-  "idna": {:hex, :idna, "1.2.0", "ac62ee99da068f43c50dc69acf700e03a62a348360126260e87f2b54eced86b2", [:rebar3], []},
-  "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], []},
-  "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], []},
-  "nerves_system": {:hex, :nerves_system, "0.1.6", "d3cff2ae40d3764c75b187cbbdb09985ae169489c26178d765edc9b66bc4e355", [:mix], []},
-  "nerves_system_br": {:hex, :nerves_system_br, "0.7.0", "e838dbec1079fa326d958a3aef4ee14f22d8ffbc91ce7f6b28fc7d9f3197dfa7", [:mix], []},
-  "nerves_toolchain": {:hex, :nerves_toolchain, "0.7.1", "164f5fcf07f717d5e8f918965ea043c860b75065768c93a726f763498a7d8792", [:mix], []},
-  "nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.7.1", "44753bb9c301704de8b5d238cda7eba8a96b9975563d1b146316699c5c0cb129", [:mix], [{:nerves_toolchain, "~> 0.7", [hex: :nerves_toolchain, optional: false]}, {:nerves_toolchain_ctng, "~> 0.7", [hex: :nerves_toolchain_ctng, optional: false]}]},
-  "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "0.7.1", "6f46b1591b23d1a017347f8cd9962c24775b2a6fde4e2f2b5251439efef8d6a4", [:mix], []},
-  "porcelain": {:hex, :porcelain, "2.0.2", "c1d4863de3e391195e36457bb3d7e17ee1bca5a44f1d708bc037c313342f58e9", [:mix], []},
-  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.0", "edee20847c42e379bf91261db474ffbe373f8acb56e9079acb6038d4e0bf414f", [:rebar, :make], []}}
+%{"distillery": {:hex, :distillery, "1.0.0", "a866a72bf2a3a5f078f5a249017ed951acda88a760d200512f91f585d74db1ec", [:mix], []},
+  "nerves": {:hex, :nerves, "0.4.0", "ea9f281f84573d3a3b060dbc1135bdcf6304cb87a23b7509187b949bfe1d9a52", [:mix], [{:distillery, "~> 1.0.0", [hex: :distillery, optional: false]}]},
+  "nerves_system_br": {:hex, :nerves_system_br, "0.8.1", "86889f97719eae6ec243ba0b8f445a25cabc0463d2e9606293cb4033f2c6b9e4", [:mix], []},
+  "nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.8.0", "873f8d6f74413c14eda3462b397a88f043a6c3bd65f56ff57db4e2e1eaf48994", [: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.exs

@@ -5,21 +5,25 @@ version =
   |> File.read!
   |> String.strip
 
-config :nerves_system_rpi3, :nerves_env,
+pkg = :nerves_system_rpi3
+
+config pkg, :nerves_env,
   type: :system,
   version: version,
-  mirrors: [
-    "https://github.com/nerves-project/nerves_system_rpi3/releases/download/v#{version}/nerves_system_rpi3-v#{version}.tar.gz",
-    "https://s3.amazonaws.com/nerves/artifacts/nerves_system_rpi3-#{version}.tar.gz"],
-  build_platform: Nerves.System.Platforms.BR,
-  build_config: [
+  compiler: :nerves_package,
+  artifact_url: [
+    "https://github.com/nerves-project/#{pkg}/releases/download/v#{version}/#{pkg}-v#{version}.tar.gz",
+  ],
+  platform: Nerves.System.BR,
+  platform_config: [
     defconfig: "nerves_defconfig",
-    package_files: [
-      "rootfs-additions",
-      "linux-4.4.defconfig",
-      "fwup.conf",
-      "cmdline.txt",
-      "config.txt",
-      "post-createfs.sh"
-    ]
+  ],
+  checksum: [
+    "rootfs-additions",
+    "linux-4.4.defconfig",
+    "fwup.conf",
+    "cmdline.txt",
+    "config.txt",
+    "post-createfs.sh",
+    "VERSION"
   ]

nerves_defconfig

@@ -4,7 +4,7 @@ BR2_ARM_FPU_NEON_VFPV4=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.7.1/nerves_toolchain_arm_unknown_linux_gnueabihf-0.7.1.linux-x86_64.tar.xz"
+BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v0.8.0/nerves_toolchain_arm_unknown_linux_gnueabihf-0.8.0.linux-x86_64.tar.xz"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-unknown-linux-gnueabihf"
 BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_4=y