spacecruft
/
farmbot_os
1
0
Fork 0
Code Issues Pull Requests Releases Activity

rpi2 is working as intended

pull/224/head
connor rigby 2017-01-10 12:16:17 -08:00
parent 8d72ed51ab
commit 1ee118e1cc
15 changed files with 23 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/farmbot/mix.exs
View File

@ -1,7 +1,12 @@
defmodule Farmbot.Mixfile do
use Mix.Project
def target(:prod), do: System.get_env("NERVES_TARGET") || "rpi3"
def target(:prod) do
blah = System.get_env("NERVES_TARGET") || "rpi3"
System.put_env("NERVES_TARGET", blah)
blah
end
def target(_), do: "development"
@version Path.join(__DIR__, "VERSION") |> File.read! |> String.strip

1
apps/farmbot_auth/mix.exs
View File

@ -2,7 +2,6 @@ defmodule Farmbot.Auth.Mixfile do
use Mix.Project
@version Path.join([__DIR__, "..", "farmbot", "VERSION"]) |> File.read! |> String.strip
def project do
[app: :farmbot_auth,
version: @version,

2
apps/farmbot_configurator/mix.exs
View File

@ -1,7 +1,7 @@
defmodule Farmbot.Configurator.Mixfile do
use Mix.Project
System.put_env("NODE_ENV", Mix.env |> Atom.to_string)
def target(:prod), do: System.get_env("NERVES_TARGET") || "rpi3"
def target(:prod), do: System.get_env("NERVES_TARGET")
def target(_), do: "development"
def project do

6
apps/farmbot_system/mix.exs
View File

@ -1,9 +1,11 @@
defmodule Farmbot.System.Mixfile do
use Mix.Project
@version Path.join([__DIR__, "..", "farmbot", "VERSION"]) |> File.read! |> String.strip
@version Path.join([__DIR__, "..", "farmbot", "VERSION"])
|> File.read!
|> String.strip
def target(:prod), do: System.get_env("NERVES_TARGET") || "rpi3"
def target(:prod), do: System.get_env("NERVES_TARGET")
def target(_), do: "development"
def project do

4
apps/farmbot_system_development/mix.exs
View File

@ -1,6 +1,8 @@
defmodule Module.concat([Farmbot,System,"development",Mixfile]) do
use Mix.Project
@version Path.join([__DIR__, "..", "farmbot", "VERSION"]) |> File.read! |> String.strip
@version Path.join([__DIR__, "..", "farmbot", "VERSION"])
|> File.read!
|> String.strip
def project do
[app: :farmbot_system_development,

2
apps/farmbot_system_rpi/mix.exs
View File

@ -5,7 +5,7 @@ defmodule Module.concat([Farmbot, System, "rpi", Mixfile]) do
|> String.strip
def project do
[app: :farmbot_system_rpi3,
[app: :farmbot_system_rpi,
version: @version,
build_path: "../../_build",
config_path: "../../config/config.exs",

2
apps/farmbot_system_rpi2/mix.exs
View File

@ -5,7 +5,7 @@ defmodule Module.concat([Farmbot, System, "rpi2", Mixfile]) do
|> String.strip
def project do
[app: :farmbot_system_rpi3,
[app: :farmbot_system_rpi2,
version: @version,
build_path: "../../_build",
config_path: "../../config/config.exs",

40
apps/nerves_system_rpi/rootfs-additions/etc/erlinit.config
View File

@ -1,40 +0,0 @@
# Additional configuration for erlinit
# Turn on the debug prints
#-v
# Specify the UART port that the shell should use.
-c tty1
# If more than one tty are available, always warn if the user is looking at
# the wrong one.
--warn-unused-tty
# Use dtach to capture the iex session so that it can be redirected
# to the app's GUI
#-s "/usr/bin/dtach -N /tmp/iex_prompt"
# Specify the user and group IDs for the Erlang VM
#--uid 100
#--gid 200
# Uncomment to hang the board rather than rebooting when Erlang exits
--hang-on-exit
# Optionally run a program if the Erlang VM exits
#--run-on-exit /bin/sh
# Enable UTF-8 filename handling in Erlang and custom inet configuration
-e LANG=en_US.UTF-8;LANGUAGE=en;ERL_INETRC=/etc/erl_inetrc
# Mount the application partition
# See http://www.linuxfromscratch.org/lfs/view/6.3/chapter08/fstab.html about
# ignoring warning the Linux kernel warning about using UTF8 with vfat.
-m /dev/mmcblk0p3:/root:vfat::
# Erlang release search path
-r /srv/erlang
# Assign a unique hostname based on the board id
-d "/usr/bin/boardid -b rpi -n 4"
-n nerves-%.4s

2
apps/nerves_system_rpi2/busybox_defconfig
View File

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.25.0
# Fri Jan 6 08:49:34 2017
# Tue Jan 10 12:03:41 2017
#
CONFIG_HAVE_DOT_CONFIG=y

4
apps/nerves_system_rpi2/fwup.conf
View File

@ -93,7 +93,7 @@ mbr mbr-a {
partition 0 {
block-offset = ${BOOT_PART_OFFSET}
block-count = ${BOOT_PART_COUNT}
type = 0x83 # Linux
type = 0xc # FAT32
boot = true
}
partition 1 {
@ -113,7 +113,7 @@ mbr mbr-b {
partition 0 {
block-offset = ${BOOT_PART_OFFSET}
block-count = ${BOOT_PART_COUNT}
type = 0x83 # Linux
type = 0xc # FAT32
boot = true
}
partition 1 {

4
apps/nerves_system_rpi2/nerves.exs
View File

@ -11,7 +11,9 @@ config pkg, :nerves_env,
type: :system,
version: version,
compiler: :nerves_package,
artifact_url: [],
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"

2
apps/nerves_system_rpi2/nerves_defconfig
View File

@ -31,7 +31,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b"
BR2_LINUX_KERNEL_EXT_KERNEL_WIRELESS_REGDB=y
BR2_PACKAGE_BUSYBOX_CONFIG="${NERVES_SYSTEM}/board/nerves-common/busybox-1.22.config"
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(NERVES_DEFCONFIG_DIR)/busybox_defconfig"
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="${NERVES_DEFCONFIG_DIR/busybox_defconfig}"
BR2_PACKAGE_E2FSPROGS=y
# BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
# BR2_PACKAGE_E2FSPROGS_CHATTR is not set

40
apps/nerves_system_rpi2/rootfs-additions/etc/erlinit.config
View File

@ -1,40 +0,0 @@
# Additional configuration for erlinit
# Turn on the debug prints
#-v
# Specify the UART port that the shell should use.
-c tty1
# If more than one tty are available, always warn if the user is looking at
# the wrong one.
--warn-unused-tty
# Use dtach to capture the iex session so that it can be redirected
# to the app's GUI
#-s "/usr/bin/dtach -N /tmp/iex_prompt"
# Specify the user and group IDs for the Erlang VM
#--uid 100
#--gid 200
# Uncomment to hang the board rather than rebooting when Erlang exits
--hang-on-exit
# Optionally run a program if the Erlang VM exits
#--run-on-exit /bin/sh
# Enable UTF-8 filename handling in Erlang and custom inet configuration
-e LANG=en_US.UTF-8;LANGUAGE=en;ERL_INETRC=/etc/erl_inetrc
# Mount the application partition
# See http://www.linuxfromscratch.org/lfs/view/6.3/chapter08/fstab.html about
# ignoring warning the Linux kernel warning about using UTF8 with vfat.
-m /dev/mmcblk0p3:/root:vfat::
# Erlang release search path
-r /srv/erlang
# Assign a unique hostname based on the board id
-d "/usr/bin/boardid -b rpi -n 4"
-n nerves-%.4s

1
apps/nerves_system_rpi2/rootfs-additions/root
View File

@ -1 +0,0 @@
/tmp

40
apps/nerves_system_rpi3/rootfs-additions/etc/erlinit.config
View File

@ -1,40 +0,0 @@
# Additional configuration for erlinit
# Turn on the debug prints
#-v
# Specify the UART port that the shell should use.
-c ttyS0
# If more than one tty are available, always warn if the user is looking at
# the wrong one.
--warn-unused-tty
# Use dtach to capture the iex session so that it can be redirected
# to the app's GUI
#-s "/usr/bin/dtach -N /tmp/iex_prompt"
# Specify the user and group IDs for the Erlang VM
#--uid 100
#--gid 200
# Uncomment to hang the board rather than rebooting when Erlang exits
--hang-on-exit
# Run a program if the Erlang VM exits
--run-on-exit "/bin/sh"
# Run a program before the Erlang VM starts
# --pre-run-exec "/bin/sh -e /usr/bin/pre_erl.sh"
-m /dev/mmcblk0p3:/state:ext4::
# Enable UTF-8 filename handling in Erlang and custom inet configuration
-e LANG=en_US.UTF-8;LANGUAGE=en;ERL_INETRC=/etc/erl_inetrc
# Erlang release search path
-r /srv/erlang
# Assign a unique hostname based on the board id
-d "/usr/bin/boardid -b rpi -n 4"
-n nerves-%.4s