Skip to content

Commit 12835da

Browse files
gabrielburnworthgabrielburnworth
committed
merge upstream
2 parents ad68dab + 73a1a19 commit 12835da

17 files changed

+100
-328
lines changed

‎.circleci/config.yml

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
exec: &exec
22
name: build-tools/nerves-system-br
3-
version: 1.21.2
4-
elixir: 1.14.1-otp-25
3+
version: 1.23.2
4+
elixir: 1.15.2-otp-26
55

66
version: 2.1
77

88
orbs:
9-
build-tools: nerves-project/[email protected].2
9+
build-tools: nerves-project/[email protected].3
1010

1111
workflows:
1212
version: 2
@@ -29,12 +29,6 @@ workflows:
2929
filters:
3030
tags:
3131
only: /.*/
32-
- build-tools/build-test:
33-
exec:
34-
<<: *exec
35-
context: org-global
36-
requires:
37-
- build-tools/build-system
3832
- build-tools/deploy-system:
3933
exec:
4034
<<: *exec

‎CHANGELOG.md

+73
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,79 @@ follows:
1212
releases, and Linux kernel updates. They're also made to fix bugs and add
1313
features to the build infrastructure.
1414

15+
## v1.23.1
16+
17+
This is a bug and security fix update. It should be a low risk upgrade.
18+
19+
* Fixes
20+
* Fix CTRL+R over ssh
21+
22+
* Updated dependencies
23+
* [nerves_system_br v1.23.2](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.23.2)
24+
* [Buildroot 2023.02.2](https://lore.kernel.org/buildroot/[email protected]/T/)
25+
26+
## v1.23.0
27+
28+
This is a major update that brings in Erlang/OTP 26, Buildroot 2023.02.2, Linux
29+
5.15.84, and Raspberry Pi firmware updates.
30+
31+
* New features
32+
* CA certificates are included for OTP 26.
33+
34+
* Updated dependencies
35+
* [nerves_system_br v1.23.1](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.23.1)
36+
* [Buildroot 2023.02.2](https://lore.kernel.org/buildroot/[email protected]/T/)
37+
* [Erlang/OTP 26.0.2](https://erlang.org/download/OTP-26.0.2.README)
38+
* Linux 5.15.84 (Raspberry Pi Linux tag 1.20230106)
39+
40+
## v1.22.2
41+
42+
This is a bug and security fix update. It should be a low risk upgrade from
43+
v1.22.1.
44+
45+
* Changes
46+
* Change FPU mode to fp-armv8. This mode enables additional instructions that
47+
are needed for Tensorflow Lite.
48+
49+
* Updated dependencies
50+
* [nerves_system_br v1.22.5](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.22.5)
51+
* [Buildroot 2022.11.3](https://lore.kernel.org/buildroot/[email protected]/T/)
52+
53+
## v1.22.1
54+
55+
This is a bug fix and Erlang version bump from 25.2 to 25.2.3. It should be a
56+
low risk upgrade from v1.22.0.
57+
58+
* Updated dependencies
59+
* [nerves_system_br v1.22.3](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.22.3)
60+
* [Buildroot 2022.11.1](https://lore.kernel.org/buildroot/[email protected]/T/#u)
61+
62+
## v1.22.0
63+
64+
This is a Buildroot version update that appears to mostly contain bug and
65+
security fixes. It should be a low risk upgrade to v1.21.2.
66+
67+
* Updated dependencies
68+
* [nerves_system_br v1.22.1](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.22.1)
69+
* [Buildroot 2022.11](http://lists.busybox.net/pipermail/buildroot/2022-December/656980.html)
70+
* GCC 12.2
71+
72+
## v1.21.2
73+
74+
* Changes
75+
* Two Buildroot patch updates and an Erlang minor version update
76+
* Nerves Heart v2.0 is now included. Nerves Heart connects the Erlang runtime
77+
to a hardware watchdog. v2.0 has numerous updates to improve information
78+
that you can get and also has more safeguards to avoid conditions that could
79+
cause a device to hang forever.
80+
81+
* Updated dependencies
82+
* linux 5.15.78 (RPi 1.20221104)
83+
* [nerves_system_br v1.21.6](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.21.6)
84+
* [Erlang/OTP 25.2](https://erlang.org/download/OTP-25.2.README)
85+
* [Buildroot 2022.08.3](https://lore.kernel.org/buildroot/[email protected]/T/#u)
86+
* [nerves_heart v2.0.2](https://github.com/nerves-project/nerves_heart/releases/tag/v2.0.2)
87+
1588
## v1.21.1
1689

1790
* Changes

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.21.1-farmbot.1
1+
1.23.1-farmbot.1

‎mix.exs

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ defmodule FarmbotSystemRpi3.Mixfile do
5757
{"TARGET_OS", "linux"},
5858
{"TARGET_ABI", "gnueabihf"},
5959
{"TARGET_GCC_FLAGS",
60-
"-mabi=aapcs-linux -mfpu=neon-vfpv4 -marm -fstack-protector-strong -mfloat-abi=hard -mcpu=cortex-a53 -fPIE -pie -Wl,-z,now -Wl,-z,relro"}
60+
"-mabi=aapcs-linux -mfpu=fp-armv8 -marm -fstack-protector-strong -mfloat-abi=hard -mcpu=cortex-a53 -fPIE -pie -Wl,-z,now -Wl,-z,relro"}
6161
],
6262
checksum: package_files()
6363
]
@@ -66,8 +66,8 @@ defmodule FarmbotSystemRpi3.Mixfile do
6666
defp deps do
6767
[
6868
{:nerves, "~> 1.5.4 or ~> 1.6.0 or ~> 1.7.15 or ~> 1.8", runtime: false},
69-
{:nerves_system_br, "1.21.2", runtime: false},
70-
{:nerves_toolchain_armv7_nerves_linux_gnueabihf, "~> 1.6.0", runtime: false},
69+
{:nerves_system_br, "1.23.2", runtime: false},
70+
{:nerves_toolchain_armv7_nerves_linux_gnueabihf, "~> 1.8.0", runtime: false},
7171
{:nerves_system_linter, "~> 0.4", only: [:dev, :test], runtime: false},
7272
{:ex_doc, "~> 0.22", only: :docs, runtime: false}
7373
]

‎mix.lock

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
%{
2-
"castore": {:hex, :castore, "0.1.20", "62a0126cbb7cb3e259257827b9190f88316eb7aa3fdac01fd6f2dfd64e7f46e9", [:mix], [], "hexpm", "a020b7650529c986c454a4035b6b13a328e288466986307bea3aadb4c95ac98a"},
3-
"earmark_parser": {:hex, :earmark_parser, "1.4.29", "149d50dcb3a93d9f3d6f3ecf18c918fb5a2d3c001b5d3305c926cddfbd33355b", [:mix], [], "hexpm", "4902af1b3eb139016aed210888748db8070b8125c2342ce3dcae4f38dcc63503"},
4-
"elixir_make": {:hex, :elixir_make, "0.7.2", "e83548b0500e654d1a595f1134af4862a2e92ec3282ec4c2a17641e9aa45ee73", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "05fb44abf9582381c2eb1b73d485a55288c581071de0ee3ee1084ee69d6a8e5f"},
5-
"ex_doc": {:hex, :ex_doc, "0.29.1", "b1c652fa5f92ee9cf15c75271168027f92039b3877094290a75abcaac82a9f77", [:mix], [{:earmark_parser, "~> 1.4.19", [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", "b7745fa6374a36daf484e2a2012274950e084815b936b1319aeebcf7809574f6"},
2+
"castore": {:hex, :castore, "1.0.3", "7130ba6d24c8424014194676d608cb989f62ef8039efd50ff4b3f33286d06db8", [:mix], [], "hexpm", "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"},
3+
"earmark_parser": {:hex, :earmark_parser, "1.4.33", "3c3fd9673bb5dcc9edc28dd90f50c87ce506d1f71b70e3de69aa8154bc695d44", [:mix], [], "hexpm", "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"},
4+
"elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"},
5+
"ex_doc": {:hex, :ex_doc, "0.30.3", "bfca4d340e3b95f2eb26e72e4890da83e2b3a5c5b0e52607333bf5017284b063", [:mix], [{:earmark_parser, "~> 1.4.31", [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", "fbc8702046c1d25edf79de376297e608ac78cdc3a29f075484773ad1718918b6"},
6+
"jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
67
"makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
7-
"makeup_elixir": {:hex, :makeup_elixir, "0.16.0", "f8c570a0d33f8039513fbccaf7108c5d750f47d8defd44088371191b76492b0b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "28b2cbdc13960a46ae9a8858c4bebdec3c9a6d7b4b9e7f4ed1502f8159f338e7"},
8-
"makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
9-
"nerves": {:hex, :nerves, "1.9.1", "09cfd3589af81c4b1ac35179aee5f6d94bde36548a905c2d4d4efa9ff311222e", [:make, :mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "011409116923e1dbab250a6dc241ab529790163233c44e374ff352af72d09a56"},
10-
"nerves_system_br": {:hex, :nerves_system_br, "1.21.2", "b4d7df6525a695c85b30deb4ed69c94686e0c7ab7b9d6736f73e97cb7ed91d13", [:mix], [], "hexpm", "df94bf9941aec3bcb5aea858eb5c6f6ea70906fb495ae4fa557b02aa08c81c05"},
8+
"makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [: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", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},
9+
"makeup_erlang": {:hex, :makeup_erlang, "0.1.2", "ad87296a092a46e03b7e9b0be7631ddcf64c790fa68a9ef5323b6cbb36affc72", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"},
10+
"nerves": {:hex, :nerves, "1.10.3", "31e29aaee9d9a4e7aa396a926d646c251cacf7c9e5f96b312dc23486dcd2231e", [: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", "84ff7f82bd9fb313af90bf5c6230825fa90f2e159d0355584a9d0ff1d29f4e56"},
11+
"nerves_system_br": {:hex, :nerves_system_br, "1.23.2", "1e9ef3b384e3b325ab5cc4a0767c6cbfdc8dcac1040b7a8c9b762e73db0cbfde", [:mix], [], "hexpm", "da32bde1c0746055ce12618798967dc2449c3af2e1f10d04d288b511a0ce12dd"},
1112
"nerves_system_linter": {:hex, :nerves_system_linter, "0.4.0", "81e9a6f5018fe5fb67d7b43a04dca36156f62b55b5554eb2fa3964d3889d09cd", [:mix], [], "hexpm", "b5bd8480ce7a6317f4601ff41fd2f594bdf76aff0bdf6dcfac571c3fa1ec5f82"},
12-
"nerves_toolchain_armv7_nerves_linux_gnueabihf": {:hex, :nerves_toolchain_armv7_nerves_linux_gnueabihf, "1.6.1", "4014bc32142ef980e39af90e1377747095f3f3f8517e41815a23638ef1711702", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.9.0", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "20a529ce1ab54677f121ac97333cc6b7c32f75ebb4b83cee7e0934867d61bbb5"},
13-
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.9.2", "5c0556175d03ea1d70dce66f26c4cebb5f63ecbbf4bd8f265202af818505e8ea", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "3a058db641b0d3c0a93867459a2655fdf8f005eded6f5fb0575b279b1887b0ed"},
14-
"nimble_parsec": {:hex, :nimble_parsec, "1.2.3", "244836e6e3f1200c7f30cb56733fd808744eca61fd182f731eac4af635cc6d0b", [:mix], [], "hexpm", "c8d789e39b9131acf7b99291e93dae60ab48ef14a7ee9d58c6964f59efb570b0"},
13+
"nerves_toolchain_armv7_nerves_linux_gnueabihf": {:hex, :nerves_toolchain_armv7_nerves_linux_gnueabihf, "1.8.0", "2286e6272c340c3f49a29632321ad1ff6d8d09ddf130669d42530430bf13b3a7", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.9.3", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "099e109947165275d6050f561757827f2d10dd63fa6fd7cbbae5ed57b9f748ee"},
14+
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.9.3", "60e87fde05988c4264babc8d68a9221c7b8fe5dc195b7d1526f29b8e626c735c", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "2b6edb0687b7f78d3fa49958d759f647e351b23c1f59f637c617a6dc179994ae"},
15+
"nimble_parsec": {:hex, :nimble_parsec, "1.3.1", "2c54013ecf170e249e9291ed0a62e5832f70a476c61da16f6aac6dca0189f2af", [:mix], [], "hexpm", "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167"},
1516
}

‎nerves_defconfig

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ BR2_REPRODUCIBLE=y
1010
BR2_TOOLCHAIN_EXTERNAL=y
1111
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
1212
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
13-
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v1.6.0/nerves_toolchain_armv7_nerves_linux_gnueabihf-linux_${shell uname -m}-1.6.0-DAFF8EF.tar.xz"
13+
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v1.8.0/nerves_toolchain_armv7_nerves_linux_gnueabihf-linux_${shell uname -m}-1.8.0-0C250B7.tar.xz"
1414
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="armv7-nerves-linux-gnueabihf"
15-
BR2_TOOLCHAIN_EXTERNAL_GCC_11=y
1615
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
1716
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
1817
# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
@@ -30,7 +29,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-build.sh ${BR2_EXTERN
3029
BR2_ROOTFS_POST_IMAGE_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-createfs.sh"
3130
BR2_LINUX_KERNEL=y
3231
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
33-
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/refs/tags/1.20220331.tar.gz"
32+
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/refs/tags/1.20230106.tar.gz"
3433
BR2_LINUX_KERNEL_PATCH="${NERVES_DEFCONFIG_DIR}/linux"
3534
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3635
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/linux-5.15.defconfig"
@@ -60,7 +59,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
6059
BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
6160
BR2_PACKAGE_RPI_FIRMWARE=y
6261
BR2_PACKAGE_AVRDUDE=y
63-
BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="1.20220331"
62+
BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="1.20230106"
6463
BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
6564
BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X=y
6665
BR2_PACKAGE_PIGPIO=y
@@ -75,6 +74,7 @@ BR2_PACKAGE_PYTHON_SERIAL=y
7574
# BR2_PACKAGE_ALSA_LIB_SEQ is not set
7675
# BR2_PACKAGE_ALSA_LIB_ALISP is not set
7776
# BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS is not set
77+
BR2_PACKAGE_CA_CERTIFICATES=y
7878
BR2_PACKAGE_LIBP11=y
7979
BR2_PACKAGE_UNIXODBC=y
8080
BR2_PACKAGE_OPENCV3=y

‎rootfs_overlay/etc/erlinit.config

+4-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@
4848
#--run-on-exit /bin/sh
4949

5050
# Enable UTF-8 filename handling in Erlang and custom inet configuration
51-
-e LANG=en_US.UTF-8;LANGUAGE=en;ERL_INETRC=/etc/erl_inetrc;ERL_CRASH_DUMP=/root/crash.dump;PA_ALSA_PLUGHW=1
51+
-e LANG=en_US.UTF-8;LANGUAGE=en;ERL_INETRC=/etc/erl_inetrc
52+
53+
# Enable crash dumps (set ERL_CRASH_DUMP_SECONDS=0 to disable)
54+
-e ERL_CRASH_DUMP=/root/erl_crash.dump;ERL_CRASH_DUMP_SECONDS=5
5255

5356
# Mount the application partition (run "man fstab" for field names)
5457
# NOTE: This must match the location in the fwup.conf. If it doesn't the system

‎test/.gitignore

-17
This file was deleted.

‎test/README.md

-65
This file was deleted.

‎test/config/config.exs

-53
This file was deleted.

‎test/lib/test.ex

-2
This file was deleted.

‎test/lib/test/application.ex

-19
This file was deleted.

0 commit comments

Comments
 (0)