v1.17.3-farmbot.2

RickCarlino · RickCarlino · commit e9440ed027b2 · 2021-12-29T13:32:48.000-06:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,29 +1,22 @@
 exec: &exec
   name: build-tools/nerves-system-br
-  version: 1.18.0
-  elixir: 1.13.1-otp-24
+  version: 1.17.4
+  elixir: 1.12.3-otp-24
 
 version: 2.1
 
 orbs:
-  build-tools: nerves-project/build-tools@0.2.1
+  build-tools: nerves-project/build-tools@0.1.5
 
 workflows:
   version: 2
   build_test_deploy:
     jobs:
-      - build-tools/get-br-dependencies:
-          exec:
-            <<: *exec
-          context: org-global
-          push-to-download-site: true
       - build-tools/build-system:
           exec:
             <<: *exec
           resource-class: large
           context: org-global
-          requires:
-            - build-tools/get-br-dependencies
           filters:
             tags:
               only: /.*/
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ erl_crash.dump
 /build.log
 /archive.log
 /.nerves
+farmbot_system_rpi4-portable-*
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1,2 @@
+elixir 1.12.3-otp-24
+erlang 24.1.7
diff --git a/Config.in b/Config.in
@@ -0,0 +1,4 @@
+# Add project-specific packages for Buildroot here
+#
+# If these are non-proprietary, please consider contributing them back to
+# Nerves or Buildroot.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.18.0-dev
+1.17.3-farmbot.2
diff --git a/fwup-revert.conf b/fwup-revert.conf
@@ -23,12 +23,12 @@ require-fwup-version="0.19.0"
 #  Use 'fw_printenv' to query values on the target.
 #
 # These are used by Nerves libraries to introspect.
-define(NERVES_FW_PRODUCT, "Nerves Firmware")
+define(NERVES_FW_PRODUCT, "FarmBot OS")
 define(NERVES_FW_DESCRIPTION, "")
 define(NERVES_FW_VERSION, "${NERVES_SDK_VERSION}")
 define(NERVES_FW_PLATFORM, "rpi4")
 define(NERVES_FW_ARCHITECTURE, "arm")
-define(NERVES_FW_AUTHOR, "The Nerves Team")
+define(NERVES_FW_AUTHOR, "FarmBot, Inc.")
 
 define(NERVES_FW_DEVPATH, "/dev/mmcblk0")
 define(NERVES_FW_APPLICATION_PART0_DEVPATH, "/dev/mmcblk0p3") # Linux part number is 1-based
diff --git a/fwup.conf b/fwup.conf
@@ -12,12 +12,12 @@ require-fwup-version="0.15.0"  # For the trim() call
 #  Use 'fw_printenv' to query values on the target.
 #
 # These are used by Nerves libraries to introspect.
-define(NERVES_FW_PRODUCT, "Nerves Firmware")
+define(NERVES_FW_PRODUCT, "FarmBot OS")
 define(NERVES_FW_DESCRIPTION, "")
 define(NERVES_FW_VERSION, "${NERVES_SDK_VERSION}")
 define(NERVES_FW_PLATFORM, "rpi4")
 define(NERVES_FW_ARCHITECTURE, "arm")
-define(NERVES_FW_AUTHOR, "The Nerves Team")
+define(NERVES_FW_AUTHOR, "FarmBot, Inc.")
 
 define(NERVES_FW_DEVPATH, "/dev/mmcblk0")
 define(NERVES_FW_APPLICATION_PART0_DEVPATH, "/dev/mmcblk0p3") # Linux part number is 1-based
@@ -94,10 +94,10 @@ meta-misc = ${NERVES_FW_MISC}
 # This is important, since this is the order that they're written on a firmware
 # update due to the event driven nature of the update system.
 file-resource fixup.dat {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/fixup4x.dat"
+    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/fixup.dat"
 }
 file-resource start.elf {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/start4x.elf"
+    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/start.elf"
 }
 file-resource config.txt {
     host-path = "${NERVES_SYSTEM}/images/config.txt"
diff --git a/mix.exs b/mix.exs
@@ -1,8 +1,8 @@
-defmodule NervesSystemRpi4.MixProject do
+defmodule FarmbotSystemRpi4.MixProject do
   use Mix.Project
 
-  @github_organization "nerves-project"
-  @app :nerves_system_rpi4
+  @github_organization "farmbot"
+  @app :farmbot_system_rpi4
   @source_url "https://github.com/#{@github_organization}/#{@app}"
   @version Path.join(__DIR__, "VERSION")
            |> File.read!()
@@ -65,7 +65,7 @@ defmodule NervesSystemRpi4.MixProject do
   defp deps do
     [
       {:nerves, "~> 1.5.4 or ~> 1.6.0 or ~> 1.7.3", runtime: false},
-      {:nerves_system_br, "1.18.0", runtime: false},
+      {:nerves_system_br, "1.17.4", runtime: false},
       {:nerves_toolchain_aarch64_nerves_linux_gnu, "~> 1.4.3", runtime: false},
       {:nerves_system_linter, "~> 0.4", only: [:dev, :test], runtime: false},
       {:ex_doc, "~> 0.22", only: :docs, runtime: false}
@@ -91,7 +91,7 @@ defmodule NervesSystemRpi4.MixProject do
   defp package do
     [
       files: package_files(),
-      licenses: ["Apache-2.0"],
+      licenses: ["Apache 2.0"],
       links: %{"GitHub" => @source_url}
     ]
   end
diff --git a/mix.lock b/mix.lock
@@ -1,15 +1,14 @@
 %{
-  "castore": {:hex, :castore, "0.1.14", "3f6d7c7c1574c402fef29559d3f1a7389ba3524bc6a090a5e9e6abc3af65dcca", [:mix], [], "hexpm", "b34af542eadb727e6c8b37fdf73e18b2e02eb483a4ea0b52fd500bc23f052b7b"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.18", "e1b2be73eb08a49fb032a0208bf647380682374a725dfb5b9e510def8397f6f2", [:mix], [], "hexpm", "114a0e85ec3cf9e04b811009e73c206394ffecfcc313e0b346de0d557774ee97"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.17", "6f3c7e94170377ba45241d394389e800fb15adc5de51d0a3cd52ae766aafd63f", [:mix], [], "hexpm", "f93ac89c9feca61c165b264b5837bf82344d13bebc634cd575cb711e2e342023"},
   "elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
   "ex_doc": {:hex, :ex_doc, "0.26.0", "1922164bac0b18b02f84d6f69cab1b93bc3e870e2ad18d5dacb50a9e06b542a3", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2775d66e494a9a48355db7867478ffd997864c61c65a47d31c4949459281c78d"},
   "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.15.2", "dc72dfe17eb240552857465cc00cce390960d9a0c055c4ccd38b70629227e97c", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "fd23ae48d09b32eff49d4ced2b43c9f086d402ee4fd4fcb2d7fad97fa8823e75"},
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
-  "nerves": {:hex, :nerves, "1.7.13", "3a3c4aedd0d7204748c2e7f4d0acac9bfb8c022d2e489d5018cea5be733d2525", [:make, :mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "906a67bbe35970a0a09cff32b137fa8db8f661a672a7b853115af0f9eba9a321"},
-  "nerves_system_br": {:hex, :nerves_system_br, "1.18.0", "2f3f2bcf0c3805b3a1ddfc029039d31b43655d464169e6827e910003b0370880", [:mix], [], "hexpm", "e8987194ae05837f4616918f7701eaa3973f297e82a793e764942aa2710b9655"},
+  "nerves": {:hex, :nerves, "1.7.12", "7fbe49c14c9f17efdb8213cb86ebf6b186437cfbbf10a9c6ab132bc61eb2ec27", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "43806d6c310959ebdff4e6998a5c330782d1a4bed1267950f4a7ebe9edad3344"},
+  "nerves_system_br": {:hex, :nerves_system_br, "1.17.4", "5583f4104f76253c742748ca5e21f54ad9e112abe9270e1ad78d56bebaabd011", [:mix], [], "hexpm", "69a3d3e96b70f0201c17993bc4a95a1c776fb45f6fcac89be8b4297272b7a8aa"},
   "nerves_system_linter": {:hex, :nerves_system_linter, "0.4.0", "81e9a6f5018fe5fb67d7b43a04dca36156f62b55b5554eb2fa3964d3889d09cd", [:mix], [], "hexpm", "b5bd8480ce7a6317f4601ff41fd2f594bdf76aff0bdf6dcfac571c3fa1ec5f82"},
   "nerves_toolchain_aarch64_nerves_linux_gnu": {:hex, :nerves_toolchain_aarch64_nerves_linux_gnu, "1.4.3", "6aa784fd3779251a4438e9874ed646492c3a4289f10581d01c4d61acda7d0b2d", [:mix], [{:nerves, "~> 1.4", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.8.4", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "75ab06af12118b423b4bba870a4f10d81f83678fd7fc57278927ce9d52516c5e"},
-  "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.8.5", "f2dfd6e3b5f85889561b9f00c71510eea87c3d05760d20780285deb3c29ca212", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "2f65b1866f034054f3d61ee672b6d02f4de1d0b40bef74f49527b98ab46a39fc"},
+  "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.8.4", "2f6b4153e3904502d117f9d957c12eaafd490e1d2bdf20a85328ada46a1350da", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "6194be9b1364fdc1db6b2a0e98fa8dcb94fe1af373dcf8149298d62ce9b1b369"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.2.0", "b44d75e2a6542dcb6acf5d71c32c74ca88960421b6874777f79153bbbbd7dccc", [:mix], [], "hexpm", "52b2871a7515a5ac49b00f214e4165a40724cf99798d8e4a65e4fd64ebd002c1"},
 }
diff --git a/nerves_defconfig b/nerves_defconfig
@@ -2,7 +2,6 @@ BR2_aarch64=y
 BR2_cortex_a72=y
 BR2_ARM_FPU_VFPV4=y
 BR2_TAR_OPTIONS="--no-same-owner"
-BR2_BACKUP_SITE="http://dl.nerves-project.org"
 BR2_ENABLE_DEBUG=y
 BR2_OPTIMIZE_2=y
 BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_NERVES_PATH}/patches"
@@ -35,7 +34,6 @@ BR2_LINUX_KERNEL_XZ=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-400"
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="${NERVES_DEFCONFIG_DIR}/ramoops.dts"
-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/busybox.config"
 BR2_PACKAGE_ALSA_UTILS=y
 # BR2_PACKAGE_ALSA_UTILS_ALSAMIXER is not set
@@ -48,8 +46,9 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y
 BR2_PACKAGE_MESA3D_OPENGL_ES=y
 BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
 BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="1.20211007"
-BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X=y
+BR2_PACKAGE_RPI_FIRMWARE_X=y
 BR2_PACKAGE_PIGPIO=y
 # BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set
 BR2_PACKAGE_RPI_USERLAND=y
@@ -72,7 +71,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPA3=y
 BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y
 # BR2_TARGET_ROOTFS_TAR is not set
-BR2_NERVES_SYSTEM_NAME="nerves_system_rpi4"
+BR2_NERVES_SYSTEM_NAME="farmbot_system_rpi4"
 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
diff --git a/rootfs_overlay/etc/erlinit.config b/rootfs_overlay/etc/erlinit.config
@@ -67,10 +67,10 @@
 # Erlang release search path
 -r /srv/erlang
 
-# Assign a hostname of the form "nerves-<serial_number>".
+# Assign a hostname of the form "farmbot-<serial_number>".
 # See /etc/boardid.config for locating the serial number.
 -d /usr/bin/boardid
--n nerves-%s
+-n farmbot-%s
 
 # If using shoehorn (https://github.com/nerves-project/shoehorn), start the
 # shoehorn OTP release up first. If shoehorn isn't around, erlinit fails back
diff --git a/test/config/config.exs b/test/config/config.exs
@@ -45,7 +45,7 @@ config :nerves_runtime, :kv,
   nerves_fw_application_part0_fstype: "f2fs",
   nerves_fw_application_part0_target: "/root",
   nerves_fw_architecture: arch,
-  nerves_fw_author: "The Nerves Team",
+  nerves_fw_author: "FarmBot, Inc.",
   nerves_fw_description: Mix.Project.config()[:description],
   nerves_fw_platform: platform,
   nerves_fw_product: Mix.Project.config()[:app],
diff --git a/test/mix.lock b/test/mix.lock
diff --git a/users_table.txt b/users_table.txt

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+elixir 1.12.3-otp-24`
	`2`	`+erlang 24.1.7`