From 58765144553c5f27bea1e4d580101568a6f07f6e Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sat, 14 Dec 2019 13:23:18 -0500 Subject: [PATCH 1/9] Use custom Nerves device table This removes a few directories like ifup.d ones that don't make sense to have on Nerves. --- nerves_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/nerves_defconfig b/nerves_defconfig index f55f3b0..6686b47 100644 --- a/nerves_defconfig +++ b/nerves_defconfig @@ -17,6 +17,7 @@ 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_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_OVERLAY="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/rootfs_overlay ${NERVES_DEFCONFIG_DIR}/rootfs_overlay" From b9b02bbd1366ce0ae6fe33ef171b2dc41273093f Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sat, 14 Dec 2019 13:22:57 -0500 Subject: [PATCH 2/9] Add reminder for modifying erlinit.conf --- rootfs_overlay/etc/erlinit.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rootfs_overlay/etc/erlinit.config b/rootfs_overlay/etc/erlinit.config index ee3874d..dcca6f5 100644 --- 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 From 0505a589acf7b18e4f497fe14156660a1c842e69 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Mar 2021 08:57:58 -0500 Subject: [PATCH 3/9] nerves_system_br: bump to v1.14.5 --- .circleci/config.yml | 2 +- mix.exs | 2 +- mix.lock | 4 ++-- test/mix.lock | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fd3efcf..60d7f5b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ exec: &exec name: build-tools/nerves-system-br - version: 1.14.4 + version: 1.14.5 elixir: 1.11.3-otp-23 version: 2.1 diff --git a/mix.exs b/mix.exs index 8903e60..d67e233 100644 --- a/mix.exs +++ b/mix.exs @@ -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.14.4", runtime: false}, + {:nerves_system_br, "1.14.5", runtime: false}, {:nerves_toolchain_aarch64_nerves_linux_gnu, "~> 1.4.0", 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 index 8e057db..fe796ce 100644 --- a/mix.lock +++ b/mix.lock @@ -4,8 +4,8 @@ "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"}, "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.3", "9e52c9aa43ccea844a7cc4c99165f4ff4bf4ddfb69da72fa9a481d8839c31499", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "e6216f711e834741c8066456377d6bcd1de6ae564638f38d3a21b7c0d39295eb"}, - "nerves_system_br": {:hex, :nerves_system_br, "1.14.4", "cfab33432035f4ad92202a53d9067a02034d02144f7b33419e2636ef8feb4c3a", [:mix], [], "hexpm", "c04df862d040b9233a4c45e9f58633c70b70a43baf9c68eb983e41819eb95911"}, + "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"}, "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"}, diff --git a/test/mix.lock b/test/mix.lock index 0c9ad75..89747e3 100644 --- a/test/mix.lock +++ b/test/mix.lock @@ -13,14 +13,14 @@ "mime": {:hex, :mime, "1.5.0", "203ef35ef3389aae6d361918bf3f952fa17a09e8e43b5aa592b93eba05d0fb8d", [:mix], [], "hexpm", "55a94c0f552249fc1a3dd9cd2d3ab9de9d3c89b559c2bd01121f824834f24746"}, "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"}, "muontrap": {:hex, :muontrap, "0.6.0", "0f73fcd7c1c7a98a93744b18ca66b718d75450d2d92cd3e535579ae72c76e7f2", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "b5548a8dfb787b4eb7612e0650e9b460aa5d137fd101a0b67da68014631b198c"}, - "nerves": {:hex, :nerves, "1.7.3", "9e52c9aa43ccea844a7cc4c99165f4ff4bf4ddfb69da72fa9a481d8839c31499", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "e6216f711e834741c8066456377d6bcd1de6ae564638f38d3a21b7c0d39295eb"}, + "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_hub": {:hex, :nerves_hub, "0.7.4", "0e104cad468c3d601ed423e116ea3422fbd31b7eedb263bcb2a5c489dca8b53b", [:mix], [{:fwup, "~> 0.3.0", [hex: :fwup, repo: "hexpm", optional: false]}, {:hackney, "~> 1.10", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:nerves_hub_cli, "~> 0.9", [hex: :nerves_hub_cli, repo: "hexpm", optional: false]}, {:nerves_runtime, "~> 0.8", [hex: :nerves_runtime, repo: "hexpm", optional: false]}, {:phoenix_client, "~> 0.7", [hex: :phoenix_client, repo: "hexpm", optional: false]}, {:websocket_client, "~> 1.3", [hex: :websocket_client, repo: "hexpm", optional: false]}, {:x509, "~> 0.5", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "af1daf7e879f1175c9db1957340b1773f11a00e1c63eb591427d1bf7f3d40b47"}, "nerves_hub_cli": {:hex, :nerves_hub_cli, "0.10.5", "341ab43d62d87fd426866ab8972022fadaeb4291881f7112dc9603318135a622", [:mix], [{:nerves_hub_user_api, "~> 0.7.1", [hex: :nerves_hub_user_api, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 0.7 or ~> 1.1", [hex: :nimble_csv, repo: "hexpm", optional: false]}, {:pbcs, "~> 0.1", [hex: :pbcs, repo: "hexpm", optional: false]}, {:table_rex, "~> 2.0.0 or ~> 3.0.0", [hex: :table_rex, repo: "hexpm", optional: false]}, {:x509, "~> 0.3", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "cab6a3cc89811719d90bf10ea5f1512ad29089a598db6c2319652fde82d943a3"}, "nerves_hub_user_api": {:hex, :nerves_hub_user_api, "0.7.1", "60e2cfb633b4a7dc03b2e94f34d1056d87cf0033b5db8b9cb4aaf7c05ba8bb19", [:mix], [{:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:tesla, "~> 1.2.1 or ~> 1.3", [hex: :tesla, repo: "hexpm", optional: false]}, {:x509, "~> 0.3", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "4d378358a8383a4c6d347cb0eedd1228eb29268e6e560860bf8bc7e1a45840cf"}, "nerves_key": {:hex, :nerves_key, "0.5.4", "5c8d47af9665fb0d62837a315262895021281d1b55ac1e4434bce9e38fde8590", [:mix], [{:atecc508a, "~> 0.2.1", [hex: :atecc508a, repo: "hexpm", optional: false]}, {:nerves_key_pkcs11, "~> 0.2", [hex: :nerves_key_pkcs11, repo: "hexpm", optional: false]}], "hexpm", "68ae1aa1c518bd265dd08d2ea363fc20b3d150d7631391390bd67978efc3269e"}, "nerves_key_pkcs11": {:hex, :nerves_key_pkcs11, "0.2.3", "64768cc1c17784daf7d25829bae1448f1ce98a6f55bc1132e913d1472809be99", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "c682a48c36b1bc010339a9f21b14798d38076cbe25c55daffaf9729428b13fa0"}, "nerves_runtime": {:hex, :nerves_runtime, "0.11.3", "1b5b122e4db52a747c68b35d00cefd386b3299b69b8d9071aae5f8ddf1121be1", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:system_registry, "~> 0.8.0", [hex: :system_registry, repo: "hexpm", optional: false]}, {:uboot_env, "~> 0.1.1 or ~> 0.2.0 or ~> 0.3.0", [hex: :uboot_env, repo: "hexpm", optional: false]}], "hexpm", "ed255ead503029666d0fd9f736cbf3b62c0be380592e95de6ccbfdbf37fb7aee"}, - "nerves_system_br": {:hex, :nerves_system_br, "1.14.4", "cfab33432035f4ad92202a53d9067a02034d02144f7b33419e2636ef8feb4c3a", [:mix], [], "hexpm", "c04df862d040b9233a4c45e9f58633c70b70a43baf9c68eb983e41819eb95911"}, + "nerves_system_br": {:hex, :nerves_system_br, "1.14.5", "f98ccc1e24f98d510ec2fd60952b30ae687076e93e138c30eb1411e58ddff286", [:mix], [], "hexpm", "705fe767c37c05d855ed6efb19e8f3192ee5c6d44f6531307bd515c755ac265c"}, "nerves_test_client": {:git, "https://github.com/mobileoverlord/nerves_test_client.git", "2ce416b60db08313da9ec7b7d03e0becc2f7e5ec", []}, "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"}, From 7d166e40d96ccc3ec0b9342fe2b29be48b5d1168 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 23 Mar 2021 23:04:27 -0400 Subject: [PATCH 4/9] nerves_system_br: bump to v1.15.0 --- .circleci/config.yml | 4 ++-- mix.exs | 2 +- mix.lock | 5 +++-- test/mix.lock | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 60d7f5b..012c05d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ exec: &exec name: build-tools/nerves-system-br - version: 1.14.5 - elixir: 1.11.3-otp-23 + version: 1.15.0 + elixir: 1.11.4-otp-23 version: 2.1 diff --git a/mix.exs b/mix.exs index d67e233..f8c5f35 100644 --- a/mix.exs +++ b/mix.exs @@ -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.14.5", runtime: false}, + {:nerves_system_br, "1.15.0", runtime: false}, {:nerves_toolchain_aarch64_nerves_linux_gnu, "~> 1.4.0", 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 index fe796ce..939bcd0 100644 --- a/mix.lock +++ b/mix.lock @@ -1,11 +1,12 @@ %{ "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"}, + "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.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"}, + "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"}, diff --git a/test/mix.lock b/test/mix.lock index 89747e3..a56a266 100644 --- a/test/mix.lock +++ b/test/mix.lock @@ -1,12 +1,12 @@ %{ "atecc508a": {:hex, :atecc508a, "0.2.3", "528061fbf6eef95857ed1e11d6daa7c4608194778540cc0bd80dd5991df0a895", [:mix], [{:circuits_i2c, "~> 0.2", [hex: :circuits_i2c, repo: "hexpm", optional: false]}, {:x509, "~> 0.5.1 or ~> 0.6", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "8cf9984d0349c46114ece1b206792ba82e80ee223a82c1a60b9e8e49c1a22d78"}, - "certifi": {:hex, :certifi, "2.5.3", "70bdd7e7188c804f3a30ee0e7c99655bc35d8ac41c23e12325f36ab449b70651", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm", "ed516acb3929b101208a9d700062d520f3953da3b6b918d866106ffa980e1c10"}, + "certifi": {:hex, :certifi, "2.6.1", "dbab8e5e155a0763eea978c913ca280a6b544bfa115633fa20249c3d396d9493", [:rebar3], [], "hexpm", "524c97b4991b3849dd5c17a631223896272c6b0af446778ba4675a1dff53bb7e"}, "circuits_i2c": {:hex, :circuits_i2c, "0.3.8", "fb969ddecdfe621202725ac631a32c1315c86dd9c90e429761a64c2326b113c3", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "396f21f8932ac957eb10b0e84ee5b090a02bcf3b5616d8599a02ce2e72722c63"}, "elixir_make": {:hex, :elixir_make, "0.6.2", "7dffacd77dec4c37b39af867cedaabb0b59f6a871f89722c25b28fcd4bd70530", [:mix], [], "hexpm", "03e49eadda22526a7e5279d53321d1cced6552f344ba4e03e619063de75348d9"}, "ex_unit_release": {:hex, :ex_unit_release, "0.1.0", "c7d180f82965dc1fd6a5f72359c813407bf4902af251914884781f5847cfdedb", [:mix], [], "hexpm", "212a88aff126196b61bef7d6b32b1c9495a00ddab727c72b7d7f5025034b4454"}, "fwup": {:hex, :fwup, "0.3.0", "2c360815565fcbc945ebbb34b58f156efacb7f8d64766f1cb3426919bb3f41ea", [:mix], [], "hexpm", "d12990ebda7d485d0eb7502df7aa9a56e66f67b5eda158c352db1de48e3f0518"}, "gen_state_machine": {:hex, :gen_state_machine, "3.0.0", "1e57f86a494e5c6b14137ebef26a7eb342b3b0070c7135f2d6768ed3f6b6cdff", [:mix], [], "hexpm", "0a59652574bebceb7309f6b749d2a41b45fdeda8dbb4da0791e355dd19f0ed15"}, - "hackney": {:hex, :hackney, "1.17.0", "717ea195fd2f898d9fe9f1ce0afcc2621a41ecfe137fae57e7fe6e9484b9aa99", [:rebar3], [{:certifi, "~>2.5", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "64c22225f1ea8855f584720c0e5b3cd14095703af1c9fbc845ba042811dc671c"}, + "hackney": {:hex, :hackney, "1.17.4", "99da4674592504d3fb0cfef0db84c3ba02b4508bae2dff8c0108baa0d6e0977c", [:rebar3], [{:certifi, "~>2.6.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "de16ff4996556c8548d512f4dbe22dd58a587bf3332e7fd362430a7ef3986b16"}, "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"}, "jason": {:hex, :jason, "1.2.2", "ba43e3f2709fd1aa1dce90aaabfd039d000469c05c56f0b8e31978e03fa39052", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "18a228f5f0058ee183f29f9eae0805c6e59d61c3b006760668d8d18ff0d12179"}, "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"}, @@ -20,7 +20,7 @@ "nerves_key": {:hex, :nerves_key, "0.5.4", "5c8d47af9665fb0d62837a315262895021281d1b55ac1e4434bce9e38fde8590", [:mix], [{:atecc508a, "~> 0.2.1", [hex: :atecc508a, repo: "hexpm", optional: false]}, {:nerves_key_pkcs11, "~> 0.2", [hex: :nerves_key_pkcs11, repo: "hexpm", optional: false]}], "hexpm", "68ae1aa1c518bd265dd08d2ea363fc20b3d150d7631391390bd67978efc3269e"}, "nerves_key_pkcs11": {:hex, :nerves_key_pkcs11, "0.2.3", "64768cc1c17784daf7d25829bae1448f1ce98a6f55bc1132e913d1472809be99", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "c682a48c36b1bc010339a9f21b14798d38076cbe25c55daffaf9729428b13fa0"}, "nerves_runtime": {:hex, :nerves_runtime, "0.11.3", "1b5b122e4db52a747c68b35d00cefd386b3299b69b8d9071aae5f8ddf1121be1", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:system_registry, "~> 0.8.0", [hex: :system_registry, repo: "hexpm", optional: false]}, {:uboot_env, "~> 0.1.1 or ~> 0.2.0 or ~> 0.3.0", [hex: :uboot_env, repo: "hexpm", optional: false]}], "hexpm", "ed255ead503029666d0fd9f736cbf3b62c0be380592e95de6ccbfdbf37fb7aee"}, - "nerves_system_br": {:hex, :nerves_system_br, "1.14.5", "f98ccc1e24f98d510ec2fd60952b30ae687076e93e138c30eb1411e58ddff286", [:mix], [], "hexpm", "705fe767c37c05d855ed6efb19e8f3192ee5c6d44f6531307bd515c755ac265c"}, + "nerves_system_br": {:hex, :nerves_system_br, "1.15.0", "2fdda3ee87e03683b5f50a57b2da4d002dd8dd6f9d89c3482fe3b833dc8ecadf", [:mix], [], "hexpm", "00f80de6165fc41eb0fe84b21e50c7ab46a5ad605026f9468c097c235e1d884a"}, "nerves_test_client": {:git, "https://github.com/mobileoverlord/nerves_test_client.git", "2ce416b60db08313da9ec7b7d03e0becc2f7e5ec", []}, "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"}, From e4ef334d65137d9126f580b8e16248cfdc9c25c6 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Wed, 24 Mar 2021 08:57:42 -0400 Subject: [PATCH 5/9] Keep jitter entropy off Buildroot 2021.02 defaults jitter entroy to on now and previous nerves_system_br releases had it default to off. This preserves the old behavior of having it off. --- nerves_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/nerves_defconfig b/nerves_defconfig index 6686b47..d60ff51 100644 --- a/nerves_defconfig +++ b/nerves_defconfig @@ -50,6 +50,7 @@ BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="1.20200902" BR2_PACKAGE_RPI_FIRMWARE_X=y BR2_PACKAGE_PIGPIO=y +# BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set BR2_PACKAGE_RPI_USERLAND=y # BR2_PACKAGE_ALSA_LIB_RAWMIDI is not set # BR2_PACKAGE_ALSA_LIB_HWDEP is not set From 1e314889c1929d1ecb3b14f96a66ec92ef7e2a65 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Wed, 24 Mar 2021 22:43:52 -0400 Subject: [PATCH 6/9] Remove test deployment for now --- .circleci/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 012c05d..e3fc63a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,12 +25,6 @@ workflows: context: org-global requires: - build-tools/build-system - - build-tools/deploy-test: - exec: - <<: *exec - context: org-global - requires: - - build-tools/build-test - build-tools/deploy-system: exec: <<: *exec From f5cc20d277a9cf8ed17ac45ee9d3080fb11d9009 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 30 Mar 2021 09:03:12 -0400 Subject: [PATCH 7/9] Bump toolchain to 1.4.2 --- mix.exs | 2 +- mix.lock | 6 +++--- nerves_defconfig | 4 ++-- test/mix.lock | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mix.exs b/mix.exs index f8c5f35..9da4e7e 100644 --- a/mix.exs +++ b/mix.exs @@ -66,7 +66,7 @@ defmodule NervesSystemRpi4.MixProject do [ {:nerves, "~> 1.5.4 or ~> 1.6.0 or ~> 1.7.3", runtime: false}, {:nerves_system_br, "1.15.0", runtime: false}, - {:nerves_toolchain_aarch64_nerves_linux_gnu, "~> 1.4.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 index 939bcd0..fcc865f 100644 --- a/mix.lock +++ b/mix.lock @@ -5,10 +5,10 @@ "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"}, "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.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": {: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 index d60ff51..0029bf9 100644 --- a/nerves_defconfig +++ b/nerves_defconfig @@ -8,9 +8,9 @@ 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 diff --git a/test/mix.lock b/test/mix.lock index a56a266..7e6141d 100644 --- a/test/mix.lock +++ b/test/mix.lock @@ -13,7 +13,7 @@ "mime": {:hex, :mime, "1.5.0", "203ef35ef3389aae6d361918bf3f952fa17a09e8e43b5aa592b93eba05d0fb8d", [:mix], [], "hexpm", "55a94c0f552249fc1a3dd9cd2d3ab9de9d3c89b559c2bd01121f824834f24746"}, "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"}, "muontrap": {:hex, :muontrap, "0.6.0", "0f73fcd7c1c7a98a93744b18ca66b718d75450d2d92cd3e535579ae72c76e7f2", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "b5548a8dfb787b4eb7612e0650e9b460aa5d137fd101a0b67da68014631b198c"}, - "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": {: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_hub": {:hex, :nerves_hub, "0.7.4", "0e104cad468c3d601ed423e116ea3422fbd31b7eedb263bcb2a5c489dca8b53b", [:mix], [{:fwup, "~> 0.3.0", [hex: :fwup, repo: "hexpm", optional: false]}, {:hackney, "~> 1.10", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:nerves_hub_cli, "~> 0.9", [hex: :nerves_hub_cli, repo: "hexpm", optional: false]}, {:nerves_runtime, "~> 0.8", [hex: :nerves_runtime, repo: "hexpm", optional: false]}, {:phoenix_client, "~> 0.7", [hex: :phoenix_client, repo: "hexpm", optional: false]}, {:websocket_client, "~> 1.3", [hex: :websocket_client, repo: "hexpm", optional: false]}, {:x509, "~> 0.5", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "af1daf7e879f1175c9db1957340b1773f11a00e1c63eb591427d1bf7f3d40b47"}, "nerves_hub_cli": {:hex, :nerves_hub_cli, "0.10.5", "341ab43d62d87fd426866ab8972022fadaeb4291881f7112dc9603318135a622", [:mix], [{:nerves_hub_user_api, "~> 0.7.1", [hex: :nerves_hub_user_api, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 0.7 or ~> 1.1", [hex: :nimble_csv, repo: "hexpm", optional: false]}, {:pbcs, "~> 0.1", [hex: :pbcs, repo: "hexpm", optional: false]}, {:table_rex, "~> 2.0.0 or ~> 3.0.0", [hex: :table_rex, repo: "hexpm", optional: false]}, {:x509, "~> 0.3", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "cab6a3cc89811719d90bf10ea5f1512ad29089a598db6c2319652fde82d943a3"}, "nerves_hub_user_api": {:hex, :nerves_hub_user_api, "0.7.1", "60e2cfb633b4a7dc03b2e94f34d1056d87cf0033b5db8b9cb4aaf7c05ba8bb19", [:mix], [{:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:tesla, "~> 1.2.1 or ~> 1.3", [hex: :tesla, repo: "hexpm", optional: false]}, {:x509, "~> 0.3", [hex: :x509, repo: "hexpm", optional: false]}], "hexpm", "4d378358a8383a4c6d347cb0eedd1228eb29268e6e560860bf8bc7e1a45840cf"}, @@ -22,8 +22,8 @@ "nerves_runtime": {:hex, :nerves_runtime, "0.11.3", "1b5b122e4db52a747c68b35d00cefd386b3299b69b8d9071aae5f8ddf1121be1", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:system_registry, "~> 0.8.0", [hex: :system_registry, repo: "hexpm", optional: false]}, {:uboot_env, "~> 0.1.1 or ~> 0.2.0 or ~> 0.3.0", [hex: :uboot_env, repo: "hexpm", optional: false]}], "hexpm", "ed255ead503029666d0fd9f736cbf3b62c0be380592e95de6ccbfdbf37fb7aee"}, "nerves_system_br": {:hex, :nerves_system_br, "1.15.0", "2fdda3ee87e03683b5f50a57b2da4d002dd8dd6f9d89c3482fe3b833dc8ecadf", [:mix], [], "hexpm", "00f80de6165fc41eb0fe84b21e50c7ab46a5ad605026f9468c097c235e1d884a"}, "nerves_test_client": {:git, "https://github.com/mobileoverlord/nerves_test_client.git", "2ce416b60db08313da9ec7b7d03e0becc2f7e5ec", []}, - "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_csv": {:hex, :nimble_csv, "1.1.0", "b1dba4a86be9e03065c9de829050468e591f569100332db949e7ce71be0afc25", [:mix], [], "hexpm", "e986755bc302832cac429be6deda0fc9d82d3c82b47abefb68b3c17c9d949a3f"}, "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"}, "pbcs": {:hex, :pbcs, "0.1.2", "ee0b53d926394fcce8d030c6554288b4459dbacc7139ac25666c31bb34f33859", [:mix], [], "hexpm", "3aaa7b7c2cfa8eb3129cc407e9722076f0bfa5a8da3f5ffe2d69cb5f85a44855"}, From a79d0c6d5a055ec5527ed2476d6a22d20ef5c379 Mon Sep 17 00:00:00 2001 From: Connor Rigby Date: Tue, 30 Mar 2021 11:17:13 -0700 Subject: [PATCH 8/9] v1.15.0 release --- CHANGELOG.md | 15 +++++++++++++++ VERSION | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd81e4c..577127c 100644 --- 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/VERSION b/VERSION index 850e742..141f2e8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.14.0 +1.15.0 From b54bd0b76acdc42fabe17266fc2ba5420e36733e Mon Sep 17 00:00:00 2001 From: Eric Rauer Date: Fri, 2 Apr 2021 16:41:25 -0700 Subject: [PATCH 9/9] remove openssh --- Config.in | 1 - nerves_defconfig | 3 --- 2 files changed, 4 deletions(-) diff --git a/Config.in b/Config.in index cf35e98..9009a61 100644 --- 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/nerves_defconfig b/nerves_defconfig index 67155d0..eef14b2 100644 --- a/nerves_defconfig +++ b/nerves_defconfig @@ -128,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