Merge pull request #20 from bcdevices/upstream_v15

Merge upstream nerves system v15
bcdevices · Apr 5, 2021 · 1a90c30 · 1a90c30
2 parents 7bf0e71 + b54bd0b
commit 1a90c30
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 26 deletions.
diff --git a/.github/actions/build/Dockerfile b/.github/actions/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM nervesproject/nerves_system_br:1.13.5
+FROM nervesproject/nerves_system_br:1.15.0
 LABEL "com.github.actions.name"="Build System"
 LABEL "com.github.actions.description"="Build Nerves System"
 LABEL "com.github.actions.icon"="package"
@@ -8,7 +8,7 @@ LABEL "repository"="https://github.com/bcdevices/ly11-system-rpi4"
 LABEL "homepage"="https://github.com/bcdevices/ly11-system-rpi4"
 LABEL "maintainer"="Blue Clover Devices"
 
-ENV ELIXIR_VERSION=1.10.4-otp-23
+ENV ELIXIR_VERSION=1.11.4-otp-23
 
 RUN apt-get update && \
       apt-get install -y \

diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
-elixir 1.10.4-otp-23
-erlang 23.0.3
+elixir 1.11.4-otp-23
+erlang 23.2.7
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## v1.15.0
+
+This release updates to Buildroot 2021.02 and OTP 23.2.7. If you have made a
+custom system off this one, please review the `nerves_system_br v1.15.0` release
+notes.
+
+The Nerves toolchain has also been updated to v1.4.2. This brings in Linux 4.14
+headers to enable use of cdev and eBPF. This won't affect most users.
+
+* Updated dependencies
+  * [nerves_system_br v1.15.0](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.15.0)
+  * [Buildroot 2021.02](http://lists.busybox.net/pipermail/buildroot/2021-March/305168.html)
+  * [Erlang/OTP 23.2.7](https://erlang.org/download/OTP-23.2.7.README)
+  * [nerves toolchains v1.4.2](https://github.com/nerves-project/toolchains/releases/tag/v1.4.2)
+
 ## v1.14.0
 
 This release updates to Buildroot 2020.11.2, GCC 10.2 and OTP 23.2.4.

diff --git a/Config.in b/Config.in
@@ -16,4 +16,3 @@ source "$NERVES_DEFCONFIG_DIR/package/pickle/Config.in"
 source "$NERVES_DEFCONFIG_DIR/package/python-pyocd/Config.in"
 source "$NERVES_DEFCONFIG_DIR/package/python-intervaltree/Config.in"
 source "$NERVES_DEFCONFIG_DIR/package/python-prettytable/Config.in"
-source "$NERVES_DEFCONFIG_DIR/package/openssh_ly/Config.in"
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nervesproject/nerves_system_br:1.13.5
+FROM nervesproject/nerves_system_br:1.15.0
 LABEL "com.github.actions.name"="Build System"
 LABEL "com.github.actions.description"="Build Nerves System"
 LABEL "com.github.actions.icon"="package"
@@ -8,7 +8,7 @@ LABEL "repository"="https://github.com/bcdevices/ly11-system-rpi4"
 LABEL "homepage"="https://github.com/bcdevices/ly11-system-rpi4"
 LABEL "maintainer"="Blue Clover Devices"
 
-ENV ELIXIR_VERSION=1.10.4-otp-23
+ENV ELIXIR_VERSION=1.11.4-otp-23
 
 RUN apt-get update && \
     apt-get install -y \

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.15.3
+0.16.0
diff --git a/mix.exs b/mix.exs
@@ -66,8 +66,8 @@ defmodule LY11SystemRpi4.MixProject do
   defp deps do
     [
       {:nerves, "~> 1.5.4 or ~> 1.6.0 or ~> 1.7.4", runtime: false},
-      {:nerves_system_br, "1.14.5", runtime: false},
-      {:nerves_toolchain_aarch64_nerves_linux_gnu, "~> 1.4.0", runtime: false},
+      {:nerves_system_br, "1.15.0", runtime: false},
+      {:nerves_toolchain_aarch64_nerves_linux_gnu, "~> 1.4.2", runtime: false},
       {:nerves_system_linter, "~> 0.4", only: [:dev, :test], runtime: false},
       {:ex_doc, "~> 0.22", only: :docs, runtime: false}
     ]

diff --git a/mix.lock b/mix.lock
@@ -1,13 +1,14 @@
 %{
   "earmark_parser": {:hex, :earmark_parser, "1.4.12", "b245e875ec0a311a342320da0551da407d9d2b65d98f7a9597ae078615af3449", [:mix], [], "hexpm", "711e2cc4d64abb7d566d43f54b78f7dc129308a63bc103fbd88550d2174b3160"},
   "elixir_make": {:hex, :elixir_make, "0.6.2", "7dffacd77dec4c37b39af867cedaabb0b59f6a871f89722c25b28fcd4bd70530", [:mix], [], "hexpm", "03e49eadda22526a7e5279d53321d1cced6552f344ba4e03e619063de75348d9"},
-  "ex_doc": {:hex, :ex_doc, "0.23.0", "a069bc9b0bf8efe323ecde8c0d62afc13d308b1fa3d228b65bca5cf8703a529d", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "f5e2c4702468b2fd11b10d39416ddadd2fcdd173ba2a0285ebd92c39827a5a16"},
+  "ex_doc": {:hex, :ex_doc, "0.24.1", "15673de99154f93ca7f05900e4e4155ced1ee0cd34e0caeee567900a616871a4", [: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", "07972f17bdf7dc7b5bd76ec97b556b26178ed3f056e7ec9288eb7cea7f91cce2"},
   "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.1", "b5888c880d17d1cc3e598f05cdb5b5a91b7b17ac4eaf5f297cb697663a1094dd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "db68c173234b07ab2a07f645a5acdc117b9f99d69ebf521821d89690ae6c6ec8"},
-  "nerves": {:hex, :nerves, "1.7.4", "6dc9c9c79baf9af540e34638e2fd964700f68f8dcece7cad26048c3a89ef6788", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "ac99ab1aa27ace81fd6d49e311697e8027b5c34b00728523e0721a8e2f4414eb"},
-  "nerves_system_br": {:hex, :nerves_system_br, "1.14.5", "f98ccc1e24f98d510ec2fd60952b30ae687076e93e138c30eb1411e58ddff286", [:mix], [], "hexpm", "705fe767c37c05d855ed6efb19e8f3192ee5c6d44f6531307bd515c755ac265c"},
+  "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.5", "a70d3ecb64cbe92518b92dca9ef6c126b5be1a25f1601f3ecadb22b3ac8b7b3a", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "209ada12aace0e0d1c0cd19f0be71bb9f9fafe43d029b49152218bdc77a3628b"},
+  "nerves_system_br": {:hex, :nerves_system_br, "1.15.0", "2fdda3ee87e03683b5f50a57b2da4d002dd8dd6f9d89c3482fe3b833dc8ecadf", [:mix], [], "hexpm", "00f80de6165fc41eb0fe84b21e50c7ab46a5ad605026f9468c097c235e1d884a"},
   "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.1", "e55846218a4880acdc22bf15ef771710620f284fdc752d3bd62937481c44b78d", [:mix], [{:nerves, "~> 1.4", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.8.1", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "8092f83007860d2ce99c06431389a0f973bac1f318e4976636ff55889e9a7890"},
-  "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.8.2", "66163f4fb90aa40cabae5700e516fdf40708d260334c4674514413d7cb585dbb", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "9734237608269d2d649cc67ebb7bcb605bb122259a7cea17dadcf8204f467638"},
+  "nerves_toolchain_aarch64_nerves_linux_gnu": {:hex, :nerves_toolchain_aarch64_nerves_linux_gnu, "1.4.2", "f890bae0d85d602205e700564867411ae72dbcf902d0cb42456580b877bdd61b", [:mix], [{:nerves, "~> 1.4", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.8.1", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "6e872db4be61235a607bda8192214e51715901d0306ecaadccebe87858b8efd7"},
+  "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.8.3", "b5f3c91f84deced0dadfcce1265660bc2aab9a7b042953146a8fb053201894b7", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "6c50fafed0f7b8681dfbb54ca17c6f7fadd939ef7893159c2e9d32c862fa0e1e"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"},
 }
diff --git a/nerves_defconfig b/nerves_defconfig
@@ -8,16 +8,17 @@ BR2_REPRODUCIBLE=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/v1.4.0/nerves_toolchain_aarch64_nerves_linux_gnu-linux_x86_64-1.4.0-71294F3.tar.xz"
+BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v1.4.2/nerves_toolchain_aarch64_nerves_linux_gnu-linux_x86_64-1.4.2-3D80D46.tar.xz"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="aarch64-nerves-linux-gnu"
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 # BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
 BR2_ROOTFS_SKELETON_CUSTOM=y
 BR2_ROOTFS_SKELETON_CUSTOM_PATH="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/skeleton"
 BR2_INIT_NONE=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_ROOTFS_DEVICE_TABLE="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/device_table.txt"
 BR2_ENABLE_LOCALE_WHITELIST="locale-archive"
 BR2_GENERATE_LOCALE="en_US.UTF-8"
 BR2_ROOTFS_USERS_TABLES="${NERVES_DEFCONFIG_DIR}/users_table.txt"
@@ -61,6 +62,7 @@ BR2_PACKAGE_CRYPTSETUP=y
 BR2_PACKAGE_EUDEV_RULES_GEN=y
 BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_PIGPIO=y
+# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set
 BR2_PACKAGE_RPI_USERLAND=y
 BR2_PACKAGE_USBUTILS=y
 BR2_PACKAGE_PYTHON3=y
@@ -126,6 +128,3 @@ BR2_PACKAGE_OPENOCD_ZEPHYR=y
 BR2_PACKAGE_OPENOCD_CYPRESS=y
 BR2_PACKAGE_PICKLE=y
 BR2_PACKAGE_PYTHON_PYOCD=y
-BR2_PACKAGE_OPENSSH_LY=y
-# BR2_PACKAGE_OPENSSH_LY_CLIENT is not set
-# BR2_PACKAGE_OPENSSH_LY_KEY_UTILS is not set
diff --git a/rootfs_overlay/etc/erlinit.config b/rootfs_overlay/etc/erlinit.config
@@ -1,4 +1,8 @@
 # Additional configuration for erlinit
+#
+# To override the settings in this file, see
+# https://hexdocs.pm/nerves/advanced-configuration.html#overriding-erlinit-config-from-mix-config.
+#
 
 # Turn on the debug prints
 #-v