From 3dd58ea8c38f6ee1e639f51ca7edef82e93a56bc Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sat, 15 Aug 2020 15:01:55 -0400 Subject: [PATCH 01/10] Fix Busybox config path --- nerves_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nerves_defconfig b/nerves_defconfig index 1434701..d96711b 100644 --- a/nerves_defconfig +++ b/nerves_defconfig @@ -29,7 +29,7 @@ BR2_LINUX_KERNEL_XZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w bcm2708-rpi-zero" BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="${NERVES_DEFCONFIG_DIR}/ramoops.dts" -BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/busybox-1.22.config" +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 BR2_PACKAGE_ALSA_UTILS_AMIXER=y From ab1f0d7359c34d44e5eabf28d40d7166bedbd803 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sat, 29 Aug 2020 13:17:22 -0400 Subject: [PATCH 02/10] nerves_system_br: bump to v1.12.4 --- .circleci/config.yml | 2 +- mix.exs | 2 +- mix.lock | 2 +- test/mix.lock | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2af9fa2..d2a1d93 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ exec: &exec name: build-tools/nerves-system-br - version: 1.12.3 + version: 1.12.4 elixir: 1.10.4-otp-23 version: 2.1 diff --git a/mix.exs b/mix.exs index 7be24f9..16452cc 100644 --- a/mix.exs +++ b/mix.exs @@ -56,7 +56,7 @@ defmodule NervesSystemRpi0.MixProject do defp deps do [ {:nerves, "~> 1.5.4 or ~> 1.6.0", runtime: false}, - {:nerves_system_br, "1.12.3", runtime: false}, + {:nerves_system_br, "1.12.4", runtime: false}, {:nerves_toolchain_armv6_rpi_linux_gnueabi, "~> 1.3.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 4041fdd..8a6cd72 100644 --- a/mix.lock +++ b/mix.lock @@ -5,7 +5,7 @@ "makeup": {:hex, :makeup, "1.0.3", "e339e2f766d12e7260e6672dd4047405963c5ec99661abdc432e6ec67d29ef95", [:mix], [{:nimble_parsec, "~> 0.5", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "2e9b4996d11832947731f7608fed7ad2f9443011b3b479ae288011265cdd3dad"}, "makeup_elixir": {:hex, :makeup_elixir, "0.14.1", "4f0e96847c63c17841d42c08107405a005a2680eb9c7ccadfd757bd31dabccfb", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f2438b1a80eaec9ede832b5c41cd4f373b38fd7aa33e3b22d9db79e640cbde11"}, "nerves": {:hex, :nerves, "1.6.3", "ac0155508a6eb0e3c8e92a6c7c0524dbe38dcc289e89cf0ef129df673a89f2ea", [:mix], [{:distillery, "~> 2.1", [hex: :distillery, repo: "hexpm", optional: true]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "ce150c9aaf2ccffb2cf2fbfe1da462f363ceb322ee515c0a23394235346f71fc"}, - "nerves_system_br": {:hex, :nerves_system_br, "1.12.3", "ca6e51608620eeaa57aea195d4364a0d269d43c9776f9839e06f1659dfc2baee", [:mix], [], "hexpm", "df9b2926a4a6b87aef9c2a3043f33b3656e6a4a574d16672797f34cbf9cefa6f"}, + "nerves_system_br": {:hex, :nerves_system_br, "1.12.4", "06a34503d72e177e73d7da9be60d1c94cda291aed00cffb76fc0e600ac404c26", [:mix], [], "hexpm", "b4a5bf487d8cd9747cafc627acff56f2d3632b875a3245bb4546c81baaa0947e"}, "nerves_system_linter": {:hex, :nerves_system_linter, "0.4.0", "81e9a6f5018fe5fb67d7b43a04dca36156f62b55b5554eb2fa3964d3889d09cd", [:mix], [], "hexpm", "b5bd8480ce7a6317f4601ff41fd2f594bdf76aff0bdf6dcfac571c3fa1ec5f82"}, "nerves_toolchain_armv6_rpi_linux_gnueabi": {:hex, :nerves_toolchain_armv6_rpi_linux_gnueabi, "1.3.2", "beb0f97d6f432406af6c4fdcee02d2ab750298845834f869a0b98239362783ae", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.7.2", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "ef93b7d678241be2d4520dceecf6a2116bb87640576211dad3b618ce79b85e39"}, "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.7.2", "0683dff3b81483879a57e14d8e020314a4d1ecc6ee91952c1d7d9f1f528924a4", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "5d44f279705119defac7f28a70edb0273f92b38bc8ae668db4f271cd91f6eaee"}, diff --git a/test/mix.lock b/test/mix.lock index cf6b773..2a37f1c 100644 --- a/test/mix.lock +++ b/test/mix.lock @@ -11,17 +11,17 @@ "idna": {:hex, :idna, "6.0.1", "1d038fb2e7668ce41fbf681d2c45902e52b3cb9e9c77b55334353b222c2ee50c", [:rebar3], [{:unicode_util_compat, "0.5.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a02c8a1c4fd601215bb0b0324c8a6986749f807ce35f25449ec9e69758708122"}, "jason": {:hex, :jason, "1.2.1", "12b22825e22f468c02eb3e4b9985f3d0cb8dc40b9bd704730efa11abd2708c44", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "b659b8571deedf60f79c5a608e15414085fa141344e2716fbd6988a084b5f993"}, "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"}, - "mime": {:hex, :mime, "1.3.1", "30ce04ab3175b6ad0bdce0035cba77bba68b813d523d1aac73d9781b4d193cf8", [:mix], [], "hexpm", "6cbe761d6a0ca5a31a0931bf4c63204bceb64538e664a8ecf784a9a6f3b875f1"}, + "mime": {:hex, :mime, "1.4.0", "5066f14944b470286146047d2f73518cf5cca82f8e4815cf35d196b58cf07c47", [:mix], [], "hexpm", "75fa42c4228ea9a23f70f123c74ba7cece6a03b1fd474fe13f6a7a85c6ea4ff6"}, "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.6.3", "ac0155508a6eb0e3c8e92a6c7c0524dbe38dcc289e89cf0ef129df673a89f2ea", [:mix], [{:distillery, "~> 2.1", [hex: :distillery, repo: "hexpm", optional: true]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "ce150c9aaf2ccffb2cf2fbfe1da462f363ceb322ee515c0a23394235346f71fc"}, "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.1", "0bc37172c600b5fcc264df4b8ccdb019365c087672d6aba5408c957c61f805b1", [:mix], [{:nerves_hub_user_api, "~> 0.6", [hex: :nerves_hub_user_api, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 0.7", [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", "906e908b959b3fa4fd47a3ed7ceac9012435f68a97e06da6cfe252ef2ca9bf54"}, - "nerves_hub_user_api": {:hex, :nerves_hub_user_api, "0.6.0", "14f7bd249275c647981e6601ebef909fd4036391aef010ff74d01d4799b90bdf", [: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", "de682a5f5302d1f602a92f82fe2380abd658640ca25f620a8e9854e883020ea0"}, + "nerves_hub_cli": {:hex, :nerves_hub_cli, "0.10.2", "4eef8ae0937c12bb43c74307fab6250247eba3f352ff68360346f9f26a3ccec7", [:mix], [{:nerves_hub_user_api, "~> 0.6", [hex: :nerves_hub_user_api, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 0.7", [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", "da82743dc703ff275896b0b5261db26ec2e8f9bf0e3f96a33d62e92572a29e64"}, + "nerves_hub_user_api": {:hex, :nerves_hub_user_api, "0.7.0", "0dec0a93ffd65cd3967805e0b8359eeaf0a3a33f4a687cca1c5543de2318817c", [: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", "678621bc119b2d961e8d968081abb562019fda648b7e45a79510e71c174e2e23"}, "nerves_key": {:hex, :nerves_key, "0.5.2", "295b5feea26b67cee5a3784120d630298ce786ec6fb057b6ad91a25cff0e71a0", [:mix], [{:atecc508a, "~> 0.2.1", [hex: :atecc508a, repo: "hexpm", optional: false]}, {:nerves_key_pkcs11, "~> 0.1", [hex: :nerves_key_pkcs11, repo: "hexpm", optional: false]}], "hexpm", "9abd8312b7fd922737454e00b7642b4829b2863d2875e37ddf5594e3f1c23015"}, "nerves_key_pkcs11": {:hex, :nerves_key_pkcs11, "0.2.1", "bccd4faca41081cd1eaa51afc4530ad323fa6fc2085e5ba423306a244aa177e8", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "e023c067a9bac3b3a37bdb156ade12a9919308dbe88d47b7d2eeea7c32cec665"}, - "nerves_runtime": {:hex, :nerves_runtime, "0.11.2", "7606c559d6eb33736af813394d8b4e67e3ede155808c6dc4b2ac0aea2c1b66fb", [: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", [hex: :uboot_env, repo: "hexpm", optional: false]}], "hexpm", "094446be5a1d51d3ec0c26e9f5905ab42731397e8715404a5e5e095b4f3125b6"}, - "nerves_system_br": {:hex, :nerves_system_br, "1.12.3", "ca6e51608620eeaa57aea195d4364a0d269d43c9776f9839e06f1659dfc2baee", [:mix], [], "hexpm", "df9b2926a4a6b87aef9c2a3043f33b3656e6a4a574d16672797f34cbf9cefa6f"}, + "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.12.4", "06a34503d72e177e73d7da9be60d1c94cda291aed00cffb76fc0e600ac404c26", [:mix], [], "hexpm", "b4a5bf487d8cd9747cafc627acff56f2d3632b875a3245bb4546c81baaa0947e"}, "nerves_test_client": {:git, "https://github.com/mobileoverlord/nerves_test_client.git", "c7aac2788c627d64d6b849a86c11b30142d651bb", []}, "nerves_toolchain_armv6_rpi_linux_gnueabi": {:hex, :nerves_toolchain_armv6_rpi_linux_gnueabi, "1.3.2", "beb0f97d6f432406af6c4fdcee02d2ab750298845834f869a0b98239362783ae", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.7.2", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "ef93b7d678241be2d4520dceecf6a2116bb87640576211dad3b618ce79b85e39"}, "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.7.2", "0683dff3b81483879a57e14d8e020314a4d1ecc6ee91952c1d7d9f1f528924a4", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "5d44f279705119defac7f28a70edb0273f92b38bc8ae668db4f271cd91f6eaee"}, @@ -34,9 +34,9 @@ "system_registry": {:hex, :system_registry, "0.8.2", "df791dc276652fcfb53be4dab823e05f8269b96ac57c26f86a67838dbc0eefe7", [:mix], [], "hexpm", "f7acdede22c73ab0b3735eead7f2095efb2a7a6198366564205274db2ca2a8f8"}, "table_rex": {:hex, :table_rex, "3.0.0", "5189b71b3b92ed461358f40f7b7b630dc37716bf6c8ab3e934b2bc63a99028bd", [:mix], [], "hexpm", "582776d24cbe6a4d30a39a7f02035b1bc979b6cd64923d7234dd2f0ad21a18c7"}, "tesla": {:hex, :tesla, "1.3.3", "26ae98627af5c406584aa6755ab5fc96315d70d69a24dd7f8369cfcb75094a45", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, "~> 1.3", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "~> 4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "2648f1c276102f9250299e0b7b57f3071c67827349d9173f34c281756a1b124c"}, - "uboot_env": {:hex, :uboot_env, "0.2.0", "003a8e7688b59a072fc0a849963622f45bb9efedce9af6ae3a52ba7c6a06149a", [:mix], [], "hexpm", "891d30fbd4795c242418f2430460f52e2c050bbf3e31c64f22ab87b6f10287ee"}, + "uboot_env": {:hex, :uboot_env, "0.3.0", "8afbcc8e5b65e5d0d5660ded2f5835a959d2326fa8683183f380cd6464e75174", [:mix], [], "hexpm", "d8fe5d2b4d52a14398ace02bd604ff7a0fa8960550bb7254f75dcbd438ddc6a1"}, "unicode_util_compat": {:hex, :unicode_util_compat, "0.5.0", "8516502659002cec19e244ebd90d312183064be95025a319a6c7e89f4bccd65b", [:rebar3], [], "hexpm", "d48d002e15f5cc105a696cf2f1bbb3fc72b4b770a184d8420c8db20da2674b38"}, - "vintage_net": {:hex, :vintage_net, "0.9.0", "b0c85f65f716437f69d58c60b3b684e40c0678a88515a8c5358b66913c01e264", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:gen_state_machine, "~> 2.0.0 or ~> 2.1.0", [hex: :gen_state_machine, repo: "hexpm", optional: false]}, {:muontrap, "~> 0.5.1 or ~> 0.6.0", [hex: :muontrap, repo: "hexpm", optional: false]}], "hexpm", "5019bf84fce874387890b16eaab14a51f5e25b8c0b086217a273bbfd015d6434"}, + "vintage_net": {:hex, :vintage_net, "0.9.1", "95a185eaf420d8bc16b438494a17fffbd22008a7806309131a88ce1c58e0f368", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:gen_state_machine, "~> 2.0.0 or ~> 2.1.0", [hex: :gen_state_machine, repo: "hexpm", optional: false]}, {:muontrap, "~> 0.5.1 or ~> 0.6.0", [hex: :muontrap, repo: "hexpm", optional: false]}], "hexpm", "7d0547ec649dd37e147b5eaaf7444af2be8ef4fe0b8547cc263d124556dc7fb3"}, "websocket_client": {:hex, :websocket_client, "1.4.2", "f1036e3f9427eecdb66808eee56dbcaeb5a1a352306e6a0d0d23a9487205f4d7", [:rebar3], [], "hexpm", "c005e5f8f2f6a8533c497a509dc52f3e6fb42fa2e0d67bff8ebc8802868d84ed"}, "x509": {:hex, :x509, "0.8.1", "901a72cb715aeb2f21739425cc0cff97ce975b6267811acb1fcee4ff10e7799c", [:mix], [], "hexpm", "30c6d9376c90c74490c80befea53cc0d07f05d48bb4ce9e472573a06b0aae008"}, } From a99462ae68bcd0eaad8c1bd5b96943489a5769ab Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Thu, 3 Sep 2020 09:25:11 -0400 Subject: [PATCH 03/10] Prep for Buildroot 2020.08 by locking GCC to v9 Buildroot 2020.08 changes the GCC default to 10, so locking it to 9 in the `nerves_defconfig` makes the system build under both the current version of Buildroot, 2020.05.1, and the upcoming version. --- nerves_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/nerves_defconfig b/nerves_defconfig index d96711b..d89dcad 100644 --- a/nerves_defconfig +++ b/nerves_defconfig @@ -9,6 +9,7 @@ BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v1.3.2/nerves_toolchain_armv6_rpi_linux_gnueabi-linux_x86_64-1.3.2-CDA7B05.tar.xz" BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="armv6-rpi-linux-gnueabi" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y From 1d65a4d446b44b7a25d25a5753a5a8a0cb4e917d Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Wed, 9 Sep 2020 22:38:48 -0400 Subject: [PATCH 04/10] v1.12.2 release --- CHANGELOG.md | 22 ++++++++++++++++++++++ VERSION | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4242109..d66270a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## v1.12.2 + +This release updates to [Buildroot +2020.05.1](http://lists.busybox.net/pipermail/buildroot/2020-July/287824.html) +and OTP 23.0.3 which are both bug fix releases. + +* Updated dependencies + * [nerves_system_br: bump to v1.12.4](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.12.4) + * [Erlang/OTP 23.0.3](https://erlang.org/download/OTP-23.0.3.README) + * [nerves_heart v0.3.0](https://github.com/nerves-project/nerves_heart/releases/tag/v0.3.0) + +* New features + * The `/data` directory now exists for storing application-specific data. It + is currently a symlink to `/root`. Using `/data` will eventually be + encouraged over `/root` even though currently there is no advantage. This + change makes it possible to start migrating paths in applications and + libraries. + +* Fixes + * Fixed old references to the `-Os` compiler flag. All C/C++ code will default + to using `-O2` now. + ## v1.12.1 * Fixes diff --git a/VERSION b/VERSION index f8f4f03..6b89d58 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.12.1 +1.12.2 From 8c343ba1a48c5ec4f86a987f15d3a8504d1fecff Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sat, 3 Oct 2020 15:27:25 -0400 Subject: [PATCH 05/10] Enable delta update support This adds the information needed to the fwup.conf to support delta updates. This is only one piece of delta update support. NervesHub can automatically generate and distribute delta updates so long as it has a copy of a device's firmware (a source firmware image) and the device is running a version of fwup (1.6.0 or later; this is in nerves_system_br 1.11.2/May 2020 and later) that supports delta updates. --- fwup.conf | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/fwup.conf b/fwup.conf index a145384..8aeb20a 100644 --- a/fwup.conf +++ b/fwup.conf @@ -295,7 +295,11 @@ task upgrade.a { on-resource dwc2.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/dwc2.dtbo") } on-resource pi3-miniuart-bt.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/pi3-miniuart-bt.dtbo") } on-resource ramoops.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/ramoops.dtbo") } - on-resource rootfs.img { raw_write(${ROOTFS_A_PART_OFFSET}) } + on-resource rootfs.img { + delta-source-raw-offset=${ROOTFS_B_PART_OFFSET} + delta-source-raw-count=${ROOTFS_B_PART_COUNT} + raw_write(${ROOTFS_A_PART_OFFSET}) + } on-finish { # Update firmware metadata @@ -362,7 +366,11 @@ task upgrade.b { on-resource dwc2.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/dwc2.dtbo") } on-resource pi3-miniuart-bt.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/pi3-miniuart-bt.dtbo") } on-resource ramoops.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/ramoops.dtbo") } - on-resource rootfs.img { raw_write(${ROOTFS_B_PART_OFFSET}) } + on-resource rootfs.img { + delta-source-raw-offset=${ROOTFS_A_PART_OFFSET} + delta-source-raw-count=${ROOTFS_A_PART_COUNT} + raw_write(${ROOTFS_B_PART_OFFSET}) + } on-finish { # Update firmware metadata From 90f338d4bfa22f03fbdd2b049f640fc6eafc2b28 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 6 Oct 2020 11:14:13 -0400 Subject: [PATCH 06/10] Support nerves 1.7.0 when it's released --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mix.exs b/mix.exs index 16452cc..95ad755 100644 --- a/mix.exs +++ b/mix.exs @@ -55,7 +55,7 @@ defmodule NervesSystemRpi0.MixProject do defp deps do [ - {:nerves, "~> 1.5.4 or ~> 1.6.0", runtime: false}, + {:nerves, "~> 1.5.4 or ~> 1.6.0 or ~> 1.7.0", runtime: false}, {:nerves_system_br, "1.12.4", runtime: false}, {:nerves_toolchain_armv6_rpi_linux_gnueabi, "~> 1.3.0", runtime: false}, {:nerves_system_linter, "~> 0.4", only: [:dev, :test], runtime: false}, From 6d4a23bb982187d5560c00d61093efd9aa571ae5 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 7 Jul 2020 16:32:13 -0400 Subject: [PATCH 07/10] Enable /proc/config.gz This makes it possible to inspect the configuration used to compile the Linux kernel. This makes it possible for libraries that rely on Linux kernel options being enabled to be able to verify that they are enabled. One use case is for `VintageNet`. `VintageNet` relies on many options being enabled. Some of these options are subtle. For example, 1. Systems without `CONFIG_MULTICAST=y` sometimes can advertise their mDNS name and sometimes can't. 2. Route table configuration requires `CONFIG_IP_MULTIPLE_TABLES=y` 3. `vintage_net_mobile` requires `CONFIG_PPP=m` 4. VintageNet's Quectel modem support requires `CONFIG_USB_NET_QMI_WWAN=m` While this knowledge is documented, mostly, I think that it's pretty hard to find since the errors don't lead you to it. I don't even know how to do that without a lot of work. The easier route seems to be to have a function that reviews the `config.gz` and prints out warnings and errors. This change enables that function. This adds about 20 KB to the kernel. This is about 1% of the size of the Raspberry Pi Zero's Linux kernel. --- linux-4.19.defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux-4.19.defconfig b/linux-4.19.defconfig index f808b6e..259f0de 100644 --- a/linux-4.19.defconfig +++ b/linux-4.19.defconfig @@ -5,6 +5,8 @@ CONFIG_POSIX_MQUEUE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y CONFIG_MEMCG=y CONFIG_BLK_CGROUP=y CONFIG_RT_GROUP_SCHED=y From 25bef4864b39a380ae30ff147b22170f2e9fa2fb Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 6 Oct 2020 12:26:21 -0400 Subject: [PATCH 08/10] nerves_system_br: bump to v1.13.2 --- .circleci/config.yml | 2 +- mix.exs | 2 +- mix.lock | 13 +++++++------ test/mix.lock | 8 ++++---- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d2a1d93..c1c5c06 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ exec: &exec name: build-tools/nerves-system-br - version: 1.12.4 + version: 1.13.2 elixir: 1.10.4-otp-23 version: 2.1 diff --git a/mix.exs b/mix.exs index 95ad755..6d63001 100644 --- a/mix.exs +++ b/mix.exs @@ -56,7 +56,7 @@ defmodule NervesSystemRpi0.MixProject do defp deps do [ {:nerves, "~> 1.5.4 or ~> 1.6.0 or ~> 1.7.0", runtime: false}, - {:nerves_system_br, "1.12.4", runtime: false}, + {:nerves_system_br, "1.13.2", runtime: false}, {:nerves_toolchain_armv6_rpi_linux_gnueabi, "~> 1.3.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 8a6cd72..6e7c74c 100644 --- a/mix.lock +++ b/mix.lock @@ -1,13 +1,14 @@ %{ "earmark": {:hex, :earmark, "1.4.9", "837e4c1c5302b3135e9955f2bbf52c6c52e950c383983942b68b03909356c0d9", [:mix], [{:earmark_parser, ">= 1.4.9", [hex: :earmark_parser, repo: "hexpm", optional: false]}], "hexpm", "0d72df7d13a3dc8422882bed5263fdec5a773f56f7baeb02379361cb9e5b0d8e"}, "earmark_parser": {:hex, :earmark_parser, "1.4.10", "6603d7a603b9c18d3d20db69921527f82ef09990885ed7525003c7fe7dc86c56", [:mix], [], "hexpm", "8e2d5370b732385db2c9b22215c3f59c84ac7dda7ed7e544d7c459496ae519c0"}, - "ex_doc": {:hex, :ex_doc, "0.22.2", "03a2a58bdd2ba0d83d004507c4ee113b9c521956938298eba16e55cc4aba4a6c", [: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", "cf60e1b3e2efe317095b6bb79651f83a2c1b3edcb4d319c421d7fcda8b3aff26"}, - "makeup": {:hex, :makeup, "1.0.3", "e339e2f766d12e7260e6672dd4047405963c5ec99661abdc432e6ec67d29ef95", [:mix], [{:nimble_parsec, "~> 0.5", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "2e9b4996d11832947731f7608fed7ad2f9443011b3b479ae288011265cdd3dad"}, - "makeup_elixir": {:hex, :makeup_elixir, "0.14.1", "4f0e96847c63c17841d42c08107405a005a2680eb9c7ccadfd757bd31dabccfb", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f2438b1a80eaec9ede832b5c41cd4f373b38fd7aa33e3b22d9db79e640cbde11"}, - "nerves": {:hex, :nerves, "1.6.3", "ac0155508a6eb0e3c8e92a6c7c0524dbe38dcc289e89cf0ef129df673a89f2ea", [:mix], [{:distillery, "~> 2.1", [hex: :distillery, repo: "hexpm", optional: true]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "ce150c9aaf2ccffb2cf2fbfe1da462f363ceb322ee515c0a23394235346f71fc"}, - "nerves_system_br": {:hex, :nerves_system_br, "1.12.4", "06a34503d72e177e73d7da9be60d1c94cda291aed00cffb76fc0e600ac404c26", [:mix], [], "hexpm", "b4a5bf487d8cd9747cafc627acff56f2d3632b875a3245bb4546c81baaa0947e"}, + "elixir_make": {:hex, :elixir_make, "0.6.1", "8faa29a5597faba999aeeb72bbb9c91694ef8068f0131192fb199f98d32994ef", [:mix], [], "hexpm", "35d33270680f8d839a4003c3e9f43afb595310a592405a00afc12de4c7f55a18"}, + "ex_doc": {:hex, :ex_doc, "0.22.6", "0fb1e09a3e8b69af0ae94c8b4e4df36995d8c88d5ec7dbd35617929144b62c00", [: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", "1e0aceda15faf71f1b0983165e6e7313be628a460e22a031e32913b98edbd638"}, + "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.0", "98312c9f0d3730fde4049985a1105da5155bfe5c11e47bdc7406d88e01e4219b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "75ffa34ab1056b7e24844c90bfc62aaf6f3a37a15faa76b07bc5eba27e4a8b4a"}, + "nerves": {:hex, :nerves, "1.6.5", "9bcdf358ba1451da3e0fee9454f075ae800b44688cc52ec4f08f64c43683b880", [:make, :mix], [{:distillery, "~> 2.1", [hex: :distillery, repo: "hexpm", optional: true]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "80805fbc634b510ff77df1033d9268e6056c13ee813b2203691adb621a2adc09"}, + "nerves_system_br": {:hex, :nerves_system_br, "1.13.2", "8cc4a53de3a54e605a4d5d88512eb851be05010fc31deea1bb940cfad3e1f0b2", [:mix], [], "hexpm", "37f41000289eaa6b3b80a81d5612aa28b433bf27cd695db0200e83ddedadd671"}, "nerves_system_linter": {:hex, :nerves_system_linter, "0.4.0", "81e9a6f5018fe5fb67d7b43a04dca36156f62b55b5554eb2fa3964d3889d09cd", [:mix], [], "hexpm", "b5bd8480ce7a6317f4601ff41fd2f594bdf76aff0bdf6dcfac571c3fa1ec5f82"}, "nerves_toolchain_armv6_rpi_linux_gnueabi": {:hex, :nerves_toolchain_armv6_rpi_linux_gnueabi, "1.3.2", "beb0f97d6f432406af6c4fdcee02d2ab750298845834f869a0b98239362783ae", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.7.2", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "ef93b7d678241be2d4520dceecf6a2116bb87640576211dad3b618ce79b85e39"}, "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.7.2", "0683dff3b81483879a57e14d8e020314a4d1ecc6ee91952c1d7d9f1f528924a4", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "5d44f279705119defac7f28a70edb0273f92b38bc8ae668db4f271cd91f6eaee"}, - "nimble_parsec": {:hex, :nimble_parsec, "0.6.0", "32111b3bf39137144abd7ba1cce0914533b2d16ef35e8abc5ec8be6122944263", [:mix], [], "hexpm", "27eac315a94909d4dc68bc07a4a83e06c8379237c5ea528a9acff4ca1c873c52"}, + "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"}, } diff --git a/test/mix.lock b/test/mix.lock index 2a37f1c..136be77 100644 --- a/test/mix.lock +++ b/test/mix.lock @@ -3,25 +3,25 @@ "busybox": {:hex, :busybox, "0.1.5", "a86e8007469d9422c8c7808c2d978688f60e42c77b14f2a849bc4a1223729a8b", [:make, :mix], [{:elixir_make, "~> 0.5", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "4da1fd2e47ea25a744506520241b201302fef841833a7cb0ed4dace94be23d9f"}, "certifi": {:hex, :certifi, "2.5.2", "b7cfeae9d2ed395695dd8201c57a2d019c0c43ecaf8b8bcb9320b40d6662f340", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm", "3b3b5f36493004ac3455966991eaf6e768ce9884693d9968055aeeeb1e575040"}, "circuits_i2c": {:hex, :circuits_i2c, "0.3.6", "348b8de3cf1ade6c4b92ad7c9de7068df1af0d441df341d7d126d53671924f64", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "da5b2814e429021f22252867a3fa48d77d7fcabeb3ff8a6c40d549227749b6a7"}, - "elixir_make": {:hex, :elixir_make, "0.6.0", "38349f3e29aff4864352084fc736fa7fa0f2995a819a737554f7ebd28b85aaab", [:mix], [], "hexpm", "d522695b93b7f0b4c0fcb2dfe73a6b905b1c301226a5a55cb42e5b14d509e050"}, + "elixir_make": {:hex, :elixir_make, "0.6.1", "8faa29a5597faba999aeeb72bbb9c91694ef8068f0131192fb199f98d32994ef", [:mix], [], "hexpm", "35d33270680f8d839a4003c3e9f43afb595310a592405a00afc12de4c7f55a18"}, "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, "2.1.0", "a38b0e53fad812d29ec149f0d354da5d1bc0d7222c3711f3a0bd5aa608b42992", [:mix], [], "hexpm", "ae367038808db25cee2f2c4b8d0531522ea587c4995eb6f96ee73410a60fa06b"}, "hackney": {:hex, :hackney, "1.16.0", "5096ac8e823e3a441477b2d187e30dd3fff1a82991a806b2003845ce72ce2d84", [:rebar3], [{:certifi, "2.5.2", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.1", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.0", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.6", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm", "3bf0bebbd5d3092a3543b783bf065165fa5d3ad4b899b836810e513064134e18"}, "idna": {:hex, :idna, "6.0.1", "1d038fb2e7668ce41fbf681d2c45902e52b3cb9e9c77b55334353b222c2ee50c", [:rebar3], [{:unicode_util_compat, "0.5.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a02c8a1c4fd601215bb0b0324c8a6986749f807ce35f25449ec9e69758708122"}, - "jason": {:hex, :jason, "1.2.1", "12b22825e22f468c02eb3e4b9985f3d0cb8dc40b9bd704730efa11abd2708c44", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "b659b8571deedf60f79c5a608e15414085fa141344e2716fbd6988a084b5f993"}, + "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"}, "mime": {:hex, :mime, "1.4.0", "5066f14944b470286146047d2f73518cf5cca82f8e4815cf35d196b58cf07c47", [:mix], [], "hexpm", "75fa42c4228ea9a23f70f123c74ba7cece6a03b1fd474fe13f6a7a85c6ea4ff6"}, "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.6.3", "ac0155508a6eb0e3c8e92a6c7c0524dbe38dcc289e89cf0ef129df673a89f2ea", [:mix], [{:distillery, "~> 2.1", [hex: :distillery, repo: "hexpm", optional: true]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "ce150c9aaf2ccffb2cf2fbfe1da462f363ceb322ee515c0a23394235346f71fc"}, + "nerves": {:hex, :nerves, "1.6.5", "9bcdf358ba1451da3e0fee9454f075ae800b44688cc52ec4f08f64c43683b880", [:make, :mix], [{:distillery, "~> 2.1", [hex: :distillery, repo: "hexpm", optional: true]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "80805fbc634b510ff77df1033d9268e6056c13ee813b2203691adb621a2adc09"}, "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.2", "4eef8ae0937c12bb43c74307fab6250247eba3f352ff68360346f9f26a3ccec7", [:mix], [{:nerves_hub_user_api, "~> 0.6", [hex: :nerves_hub_user_api, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 0.7", [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", "da82743dc703ff275896b0b5261db26ec2e8f9bf0e3f96a33d62e92572a29e64"}, "nerves_hub_user_api": {:hex, :nerves_hub_user_api, "0.7.0", "0dec0a93ffd65cd3967805e0b8359eeaf0a3a33f4a687cca1c5543de2318817c", [: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", "678621bc119b2d961e8d968081abb562019fda648b7e45a79510e71c174e2e23"}, "nerves_key": {:hex, :nerves_key, "0.5.2", "295b5feea26b67cee5a3784120d630298ce786ec6fb057b6ad91a25cff0e71a0", [:mix], [{:atecc508a, "~> 0.2.1", [hex: :atecc508a, repo: "hexpm", optional: false]}, {:nerves_key_pkcs11, "~> 0.1", [hex: :nerves_key_pkcs11, repo: "hexpm", optional: false]}], "hexpm", "9abd8312b7fd922737454e00b7642b4829b2863d2875e37ddf5594e3f1c23015"}, "nerves_key_pkcs11": {:hex, :nerves_key_pkcs11, "0.2.1", "bccd4faca41081cd1eaa51afc4530ad323fa6fc2085e5ba423306a244aa177e8", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "e023c067a9bac3b3a37bdb156ade12a9919308dbe88d47b7d2eeea7c32cec665"}, "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.12.4", "06a34503d72e177e73d7da9be60d1c94cda291aed00cffb76fc0e600ac404c26", [:mix], [], "hexpm", "b4a5bf487d8cd9747cafc627acff56f2d3632b875a3245bb4546c81baaa0947e"}, + "nerves_system_br": {:hex, :nerves_system_br, "1.13.2", "8cc4a53de3a54e605a4d5d88512eb851be05010fc31deea1bb940cfad3e1f0b2", [:mix], [], "hexpm", "37f41000289eaa6b3b80a81d5612aa28b433bf27cd695db0200e83ddedadd671"}, "nerves_test_client": {:git, "https://github.com/mobileoverlord/nerves_test_client.git", "c7aac2788c627d64d6b849a86c11b30142d651bb", []}, "nerves_toolchain_armv6_rpi_linux_gnueabi": {:hex, :nerves_toolchain_armv6_rpi_linux_gnueabi, "1.3.2", "beb0f97d6f432406af6c4fdcee02d2ab750298845834f869a0b98239362783ae", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.7.2", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "ef93b7d678241be2d4520dceecf6a2116bb87640576211dad3b618ce79b85e39"}, "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.7.2", "0683dff3b81483879a57e14d8e020314a4d1ecc6ee91952c1d7d9f1f528924a4", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "5d44f279705119defac7f28a70edb0273f92b38bc8ae668db4f271cd91f6eaee"}, From 432cb0bb7637a15c71984b44f1dafadea216215b Mon Sep 17 00:00:00 2001 From: Justin Schneck Date: Fri, 9 Oct 2020 10:35:13 -0400 Subject: [PATCH 09/10] v1.13.0 release --- CHANGELOG.md | 15 +++++++++++++++ VERSION | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d66270a..fe2c2aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## v1.13.0 + +This release updates to [Buildroot +2020.08](http://lists.busybox.net/pipermail/buildroot/2020-September/290797.html) and OTP 23.1.1. + +* Updated dependencies + * [nerves_system_br: bump to v1.13.2](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.13.2) + * [Erlang/OTP 23.1.1](https://erlang.org/download/OTP-23.1.1.README) + * [erlinit 1.8.0](https://github.com/nerves-project/erlinit/releases/tag/v1.8.0) + * [nerves 1.7.0](https://github.com/nerves-project/nerves/releases/tag/v1.7.0) + +* New features + * Added support for updating the root filesystem using firmware patches. + See the [firmware patch docs](https://hexdocs.pm/nerves/experimental-features.html#content) for more information. + ## v1.12.2 This release updates to [Buildroot diff --git a/VERSION b/VERSION index 6b89d58..feaae22 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.12.2 +1.13.0 From 55e134e5bf8e504d7a294886b77cb172a673226e Mon Sep 17 00:00:00 2001 From: Jon Carstens Date: Tue, 13 Oct 2020 11:02:30 -0600 Subject: [PATCH 10/10] v2.0.0-rc.1 release --- CHANGELOG.md | 4 ++++ VERSION | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4141ace..5816102 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## v2.0.0-rc.1 + +Sync with changes up to v1.13.0 + ## v2.0.0-rc.0 * New Features diff --git a/VERSION b/VERSION index 3fb13d4..97041a7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0-rc.0 +2.0.0-rc.1