Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: CI
on: [push]

env:
OTP_VERSION: 27.3.4.2
ELIXIR_VERSION: 1.18.4-otp-27
NERVES_BOOTSTRAP_VERSION: 1.13.1
OTP_VERSION: 28.1.1
ELIXIR_VERSION: 1.18.4-otp-28
NERVES_BOOTSTRAP_VERSION: 1.14.0

permissions:
id-token: write
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ defmodule NervesSystemBbb.MixProject do
defp deps do
[
{:nerves, "~> 1.11.1 or ~> 1.12", runtime: false},
{:nerves_system_br, "1.31.7", runtime: false},
{:nerves_system_br, "1.32.3", runtime: false},
{:nerves_toolchain_armv7_nerves_linux_gnueabihf, "~> 13.2.0", runtime: false},
{:nerves_system_linter, "~> 0.4", only: [:dev, :test], runtime: false},
{:ex_doc, "~> 0.22", only: :docs, runtime: false}
Expand Down
4 changes: 2 additions & 2 deletions mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"makeup_elixir": {:hex, :makeup_elixir, "1.0.1", "e928a4f984e795e41e3abd27bfc09f51db16ab8ba1aebdba2b3a575437efafc2", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "7284900d412a3e5cfd97fdaed4f5ed389b8f2b4cb49efc0eb3bd10e2febf9507"},
"makeup_erlang": {:hex, :makeup_erlang, "1.0.2", "03e1804074b3aa64d5fad7aa64601ed0fb395337b982d9bcf04029d68d51b6a7", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "af33ff7ef368d5893e4a267933e7744e46ce3cf1f61e2dccf53a111ed3aa3727"},
"nerves": {:hex, :nerves, "1.11.3", "437aa0a961ff8583e7f377342662495cdb90af42a473ae4d76449917bd12c386", [:make, :mix], [{:castore, "~> 0.1 or ~> 1.0", [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: false]}], "hexpm", "ef2076e0c0cb2c95421d12fd9069942c0ad73f3c77c0d6bb2cfb18972dacf675"},
"nerves_system_br": {:hex, :nerves_system_br, "1.31.7", "79c02e00b66dd347fc143b09162fa923216d8a3bcfc427ad96c8989c9d08b22b", [:mix], [], "hexpm", "b6940799dfd1ec214b162826c8d940577c25d5f0af0e3ad867a71edff7d64732"},
"nerves_system_linter": {:hex, :nerves_system_linter, "0.4.0", "81e9a6f5018fe5fb67d7b43a04dca36156f62b55b5554eb2fa3964d3889d09cd", [:mix], [], "hexpm", "b5bd8480ce7a6317f4601ff41fd2f594bdf76aff0bdf6dcfac571c3fa1ec5f82"},
"nerves_system_br": {:hex, :nerves_system_br, "1.32.3", "923ba1c80b563fc8c21d24205fee0d65dde4e7d9c49af26f17cd77385af00283", [:mix], [], "hexpm", "ede92a881e1bb9bdba5d17a0fda4ce41fa8aacaf77866c547706c720fbbcfcfa"},
"nerves_system_linter": {:hex, :nerves_system_linter, "0.4.1", "9a06eaf2402f1becdc130c6ce0ce877dc5201315fa7994f3779ed940d5a0c475", [:mix], [], "hexpm", "11bb0edb5849bf0979b7921726728d2d68f2bc0d2173d30547e9308a6ad484a0"},
"nerves_toolchain_armv7_nerves_linux_gnueabihf": {:hex, :nerves_toolchain_armv7_nerves_linux_gnueabihf, "13.2.0", "48305b5ba2ec41d2f9bfd0997d6bb6e8a9f5358146baa58fc64887bfe2d38ccd", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.10.0", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "7a43b14eb4ec90f36acf36a42ce42c1d69c280b90eea7ab9965e00db3ee6cbf7"},
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.10.0", "c6b35377a0b7a93633a8673a788f1580fe1fa06083374b0e4df36da65828d2ef", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "e4ae1a2b84de3502ecac195765819be0ce2834eb276553163a7c03133f1760f1"},
"nimble_parsec": {:hex, :nimble_parsec, "1.4.2", "8efba0122db06df95bfaa78f791344a89352ba04baedd3849593bfce4d0dc1c6", [:mix], [], "hexpm", "4b21398942dda052b403bbe1da991ccd03a053668d147d53fb8c4e0efe09c973"},
Expand Down
2 changes: 1 addition & 1 deletion nerves_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y
# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set
BR2_PACKAGE_CA_CERTIFICATES=y
BR2_PACKAGE_LIBP11=y
BR2_PACKAGE_UNIXODBC=y
Expand Down Expand Up @@ -78,4 +77,5 @@ BR2_NERVES_SYSTEM_NAME="nerves_system_bbb"
BR2_PACKAGE_BBORG_OVERLAYS=y
BR2_PACKAGE_NBTTY=y
BR2_PACKAGE_NERVES_CONFIG=y
BR2_PACKAGE_NERVES_CONFIG_ACCEPT_RNG_NOTICE=y
BR2_PACKAGE_EXTRA_DTS=y
7 changes: 0 additions & 7 deletions rootfs_overlay/etc/erlinit.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,6 @@
# Use nbtty to improve terminal handling on serial ports. It's a noop on HDMI.
-s "/usr/bin/nbtty"

# There's a call to getrandom(2) when loading the crypto NIF that's before
# nerves_runtime can start rngd. This syscall can block the BEAM indefinitely
# if there's not enough entropy in the kernel. We have not observed blocking on
# this platform. However, we don't know that getrandom(2) will always have
# enough entropy, so start rngd here to be safe.
--pre-run-exec /usr/sbin/rngd

# Specify the user and group IDs for the Erlang VM
#--uid 100
#--gid 200
Expand Down