Skip to content

Commit

Permalink
update for nerves v0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
mobileoverlord committed Jan 25, 2018
1 parent 354b5d0 commit 771b0b8
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 26 deletions.
21 changes: 14 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ install_hex_rebar: &install_hex_rebar
run:
name: Install hex and rebar
command: |
cd /tmp
mix local.hex --force
mix local.rebar --force
install_nerves_bootstrap: &install_nerves_bootstrap
run:
name: Install nerves_bootstrap
command: mix archive.install hex nerves_bootstrap --force
command: |
cd /tmp
mix archive.install github nerves-project/nerves_bootstrap --force
version: 2.0

Expand All @@ -46,10 +49,13 @@ jobs:
- run:
name: Build
command: mix compile
- run:
name: Lint
command: mix nerves.system.lint nerves_defconfig
- save_cache:
key: nerves/cache-{{ .Environment.CIRCLE_PROJECT_USERNAME}}-{{ .Environment.CIRCLE_PROJECT_REPONAME}}
key: nerves/dl-{{ .Environment.CIRCLE_PROJECT_USERNAME}}-{{ .Environment.CIRCLE_PROJECT_REPONAME}}
paths:
- "/nerves/cache"
- "/nerves/dl"
- run:
name: "Create artifact dir"
command: mkdir -p /nerves/deploy/system/artifacts
Expand All @@ -60,15 +66,13 @@ jobs:
- run:
name: "Create artifacts"
command: |
cd /nerves/build/.nerves/artifacts/*
make system
if [ -n "$CIRCLE_TAG" ]; then
TAG=$CIRCLE_TAG
else
TAG=$CIRCLE_SHA1
fi
cp ${CIRCLE_PROJECT_REPONAME}.tar.gz /nerves/deploy/system/artifacts/${CIRCLE_PROJECT_REPONAME}-${TAG}.tar.gz
cp images/${CIRCLE_PROJECT_REPONAME}.fw /nerves/deploy/system/artifacts/${CIRCLE_PROJECT_REPONAME}-${TAG}.fw
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
Expand All @@ -92,6 +96,9 @@ jobs:
- <<: *install_elixir
- <<: *install_hex_rebar
- <<: *install_nerves_bootstrap
- run:
name: Create Nerves paths
command: mkdir -p ~/.nerves/artifacts
- run:
name: Install test dependencies
command: mix deps.get
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
erl_crash.dump
*.ez
build.log
archive.log
.nerves
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog

## v0.15.2-dev
## v0.16.0

Updated dependencies
* [nerves_system_br v0.17.0](https://github.com/nerves-project/nerves_system_br/releases/tag/v0.17.0)
* [nerves_toolchain v0.13.0](https://github.com/nerves-project/toolchains/releases/tag/v0.13.0)
* [nerves v0.9.0](https://github.com/nerves-project/nerves/releases/tag/v0.9.0)

## v0.15.1

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.15.2-dev
0.16.0
16 changes: 9 additions & 7 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ defmodule NervesSystemQemuArm.Mixfile do
description: description(),
package: package(),
deps: deps(),
aliases: ["deps.precompile": ["nerves.env", "deps.precompile"]]
aliases: [
"deps.loadpaths": ["nerves.env", "deps.loadpaths"],
"deps.get": ["deps.get", "nerves.deps.get"]]
]
end

Expand All @@ -27,8 +29,8 @@ defmodule NervesSystemQemuArm.Mixfile do
def nerves_package do
[
type: :system,
artifact_url: [
"https://github.com/nerves-project/#{@app}/releases/download/v#{@version}/#{@app}-v#{@version}.tar.gz"
artifact_sites: [
{:github_releases, "nerves-project/#{@app}"}
],
platform: Nerves.System.BR,
platform_config: [
Expand All @@ -40,10 +42,10 @@ defmodule NervesSystemQemuArm.Mixfile do

defp deps do
[
{:nerves, "~> 0.8", runtime: false},
{:nerves_system_br, "0.16.4", runtime: false},
{:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.12.1", runtime: false},
{:nerves_system_linter, "~> 0.2.2", runtime: false}
{:nerves, "~> 0.9", runtime: false },
{:nerves_system_br, "0.17.0", runtime: false},
{:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.13.0", runtime: false},
{:nerves_system_linter, "~> 0.3.0", runtime: false}
]
end

Expand Down
10 changes: 5 additions & 5 deletions mix.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
%{
"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.16.4", "070d88b5ef5b507b1604ac158051860cee3100501b05913ad181d9ea583f06d7", [:mix], [], "hexpm"},
"nerves_system_linter": {:hex, :nerves_system_linter, "0.2.3", "288a04f3d6dd08f97c839b5a5480c511f4c55bd193bc9dffe6f025de79108cea", [:mix], [], "hexpm"},
"nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.12.1", "8a65f0123cfee1d229b32c03ce5ee87ce587e6dc0b2dda7de71f290b2fa24386", [: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"},
"nerves": {:hex, :nerves, "0.9.0", "41f95cb299565f0b759924430f62d1ae7399f4552d8dcbf83699103fda8fd5ad", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"},
"nerves_system_br": {:hex, :nerves_system_br, "0.17.0", "f7c0d1b6b11e9a1c187b17f2401a00956bebd5c45946bfe2a332ad26ecbf18f9", [:mix], [], "hexpm"},
"nerves_system_linter": {:hex, :nerves_system_linter, "0.3.0", "84e0f63c8ac196b16b77608bbe7df66dcf352845c4e4fb394bffd2b572025413", [:mix], [], "hexpm"},
"nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.13.0", "998a206d011351be34a95f63362c8195a4e81be81496206390258442166a8353", [:mix], [{:nerves, "~> 0.9", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.3", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.3.0", "37486214f043e695b256785647f33e00b0ea4dcec2dfacd6e2c044c15d656e9d", [:mix], [{:nerves, "~> 0.9", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"},
}
2 changes: 1 addition & 1 deletion nerves_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,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.12.1/nerves_toolchain_arm_unknown_linux_gnueabihf-0.12.1.linux-x86_64.tar.xz"
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v0.13.0/nerves_toolchain_arm_unknown_linux_gnueabihf-linux_x86_64-0.13.0-D25664C99BC7E3023A2C093C726649E7D50333B9F3887738634F124C9B5BA173.tar.xz"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-unknown-linux-gnueabihf"
BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
Expand Down
8 changes: 4 additions & 4 deletions rootfs_overlay/etc/erlinit.config
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
# Mount the application partition (run "man fstab" for field names)
# NOTE: This must match the location in the fwup.conf. If it doesn't the system
# will probably still work fine, but you won't get shell history since
# bootloader/nerves_runtime can't mount the application filesystem before
# shoehorn/nerves_runtime can't mount the application filesystem before
# the history is loaded. If this mount fails due to corruption, etc.,
# nerves_runtime will auto-format it. Your applications will need to handle
# initializing any expected files and folders.
Expand All @@ -52,7 +52,7 @@
-d "/usr/bin/boardid -b cpuinfo -n 4"
-n nerves-%.4s

# If using bootloader (https://github.com/nerves-project/bootloader), start the
# bootloader OTP release up first. If bootloader isn't around, erlinit fails back
# If using shoehorn (https://github.com/nerves-project/shoehorn), start the
# shoehorn OTP release up first. If shoehorn isn't around, erlinit fails back
# to the main OTP release.
--boot bootloader
--boot shoehorn

0 comments on commit 771b0b8

Please sign in to comment.