From 021b50d2703770970ac6c236edcc07016d678232 Mon Sep 17 00:00:00 2001 From: connor rigby Date: Thu, 4 May 2017 07:43:40 -0700 Subject: [PATCH] dont use master for buildroot lol --- mix.exs | 6 +++--- mix.lock | 2 +- scripts/clone_system.sh | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mix.exs b/mix.exs index 05a061f1..f3cb0532 100644 --- a/mix.exs +++ b/mix.exs @@ -218,14 +218,14 @@ defmodule Farmbot.Mixfile do do: [ {:"nerves_system_#{sys}", warn_missing: false, path: "nerves/nerves_system_#{sys}"}, # {:nerves_interim_wifi, "~> 0.2.0"}, - {:nerves_interim_wifi, path: "../nerves_interim_wifi"}, - # {:nerves_interim_wifi, github: "nerves-project/nerves_interim_wifi"}, + # {:nerves_interim_wifi, path: "../nerves_interim_wifi"}, + {:nerves_interim_wifi, github: "nerves-project/nerves_interim_wifi"}, {:nerves_firmware_http, "~> 0.3.1"}, # {:nerves_firmware, "~> 0.3"}, # {:nerves_firmware, path: "../nerves_firmware", override: true}, - {:nerves_firmware, github: "nerves-project/nerves_firmware", override: true}, + {:nerves_firmware, github: "nerves-project/nerves_firmware", tag: "0f558ad2402cbd5b36bd7a8a10bc2b53167de14e", override: true}, {:nerves_ssdp_server, "~> 0.2.1"}, ], diff --git a/mix.lock b/mix.lock index 5a65cbe2..945b4352 100644 --- a/mix.lock +++ b/mix.lock @@ -40,7 +40,7 @@ "mock": {:hex, :mock, "0.2.1", "bfdba786903e77f9c18772dee472d020ceb8ef000783e737725a4c8f54ad28ec", [:mix], [{:meck, "~> 0.8.2", [hex: :meck, optional: false]}]}, "mustache": {:hex, :mustache, "0.0.2", "870fbef411c47d17df06a57b8b3f69e26eb110cba0177c34e273db5d94369d9b", [:mix], []}, "nerves": {:hex, :nerves, "0.5.1", "a55d73752e8f271c7aca5fbe47747f07d0e7760b5e858e7f8da17ab06287f49c", [:mix], [{:distillery, "~> 1.0", [hex: :distillery, optional: false]}]}, - "nerves_firmware": {:git, "https://github.com/nerves-project/nerves_firmware.git", "0f558ad2402cbd5b36bd7a8a10bc2b53167de14e", []}, + "nerves_firmware": {:git, "https://github.com/nerves-project/nerves_firmware.git", "0f558ad2402cbd5b36bd7a8a10bc2b53167de14e", [tag: "0f558ad2402cbd5b36bd7a8a10bc2b53167de14e"]}, "nerves_firmware_http": {:hex, :nerves_firmware_http, "0.3.1", "e6ed2f8aa216df424a18ee56b6160b2aa7df9c3783406c93a61d92efd94acfac", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, optional: false]}, {:nerves_firmware, "~> 0.3", [hex: :nerves_firmware, optional: false]}]}, "nerves_hal": {:git, "https://github.com/LeToteTeam/nerves_hal.git", "249139e985017fdf0c5839eefc59788f575c48dd", []}, "nerves_interim_wifi": {:git, "https://github.com/nerves-project/nerves_interim_wifi.git", "42a70b8773adbbf2918e68262b47241c6fb61947", []}, diff --git a/scripts/clone_system.sh b/scripts/clone_system.sh index 6a79453c..1aa8b722 100755 --- a/scripts/clone_system.sh +++ b/scripts/clone_system.sh @@ -1,13 +1,18 @@ #!/bin/bash SYSTEM=$1 NERVES_SYSTEM_BR_GIT="https://github.com/nerves-project/nerves_system_br" +NERVES_SYSTEM_BR_COMMIT="049d8e19b69b0f84084182d9bdd915e4eb431ed5" if [ -d "nerves/NERVES_SYSTEM_$SYSTEM" ]; then # Control will enter here if $DIRECTORY exists. echo "NERVES_SYSTEM_$SYSTEM dir found." else echo "NERVES_SYSTEM_$SYSTEM dir not found." + CWD=$(pwd) git clone $NERVES_SYSTEM_BR_GIT nerves/nerves_system_br + cd nerves/nerves_system_br + git checkout $NERVES_SYSTEM_BR_COMMIT + cd $CWD fi nerves/nerves_system_br/create-build.sh nerves/nerves_system_$SYSTEM/nerves_defconfig nerves/NERVES_SYSTEM_$SYSTEM