Skip to content

Commit a45a953

Browse files
committed
Lessen the diff between Farmbot and Upstream
1 parent 33b136f commit a45a953

File tree

5 files changed

+202
-124
lines changed

5 files changed

+202
-124
lines changed

.tool-versions

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
elixir 1.12.2-otp-24
2-
erlang 24.0.5
1+
elixir 1.12.3-otp-24
2+
erlang 24.1.7

CHANGELOG.md

+198-115
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,208 @@ notes.
113113

114114
## v1.15.1
115115

116-
* Merge upstream systems.
116+
This is a security/bug fix release that updates to Buildroot 2021.02.1 and OTP
117+
23.3.1. It should be safe for everyone to apply.
117118

118-
## v1.13.0-farmbot.1
119+
* Improvements
120+
* espeak has been removed from the default install to trim 13 MB off the root
121+
filesystem
122+
123+
* Updated dependencies
124+
* [nerves_system_br v1.15.1](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.15.1)
125+
* [Buildroot 2021.02](http://lists.busybox.net/pipermail/buildroot/2021-April/307970.html)
126+
* [Erlang/OTP 23.3.1](https://erlang.org/download/OTP-23.3.1.README)
127+
128+
## v1.15.0
129+
130+
This release updates to Buildroot 2021.02 and OTP 23.2.7. If you have made a
131+
custom system off this one, please review the `nerves_system_br v1.15.0` release
132+
notes.
133+
134+
The Nerves toolchain has also been updated to v1.4.2. This brings in Linux 4.14
135+
headers to enable use of cdev and eBPF. This won't affect most users.
136+
137+
* Updated dependencies
138+
* [nerves_system_br v1.15.0](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.15.0)
139+
* [Buildroot 2021.02](http://lists.busybox.net/pipermail/buildroot/2021-March/305168.html)
140+
* [Erlang/OTP 23.2.7](https://erlang.org/download/OTP-23.2.7.README)
141+
* [nerves toolchains v1.4.2](https://github.com/nerves-project/toolchains/releases/tag/v1.4.2)
142+
143+
## v1.14.0
144+
145+
This release updates to Buildroot 2020.11.2, GCC 10.2 and OTP 23.2.4.
146+
147+
When migrating custom systems based on this one, please be aware of the
148+
following important changes:
149+
150+
* There's a new `getrandom` syscall that is made early in BEAM startup. This has
151+
the potential to block the BEAM before Nerves can start `rngd` to provide
152+
entropy. We have not seen this issue here, but have updated `erlinit.config`
153+
for the time being as a precaution.
154+
* The GCC 10.2.0 toolchain has a different name that calls out "nerves" as the
155+
vendor and the naming is now more consistent with other toolchain providers.
156+
* Experimental support for tooling that requires more information about the
157+
target has been added. The initial support focuses on zigler.
158+
159+
If you're upgrading from a release before v1.13.3, please see the release notes
160+
for the versions below as well.
161+
162+
* Updated dependencies
163+
* [nerves_system_br: bump to v1.14.4](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.14.4)
164+
* [Buildroot 2020.11.2](http://lists.busybox.net/pipermail/buildroot/2021-January/302574.html)
165+
* [Erlang/OTP 23.2.4](https://erlang.org/download/OTP-23.2.4.README)
166+
* [Nerves toolchains 1.4.1](https://github.com/nerves-project/toolchains/releases/tag/v1.4.1)
167+
168+
## v1.13.3
169+
170+
This is a bug fix release and contains no major changes.
171+
172+
* Updated dependencies
173+
* [nerves_system_br: bump to v1.13.7](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.13.7)
174+
* [Erlang/OTP 23.1.5](https://erlang.org/download/OTP-23.1.5.README)
175+
176+
## v1.13.2
177+
178+
This release includes a patch release update to
179+
[Buildroot 2020.08.2](http://lists.busybox.net/pipermail/buildroot/2020-November/296830.html).
180+
181+
* Updated dependencies
182+
* [nerves_system_br: bump to v1.13.5](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.13.5)
183+
* [erlinit 1.9.0](https://github.com/nerves-project/erlinit/releases/tag/v1.9.0)
184+
185+
* Improvements
186+
* Switched source for built-in WiFi module firmware. This pulls in newer
187+
firmware versions that were found to fix issues on the Raspberry Pi 4. It
188+
may improve built-in WiFi on other Raspberry Pis.
189+
190+
## v1.13.1
191+
192+
The main change in this release is to bump the Linux kernel to 5.4. This follows
193+
the kernel update in the Raspberry Pi OS.
194+
195+
If you have based a custom system off of this one, please inspect the
196+
`nerves_defconfig` for WiFi firmware changes. WiFi firmware is no longer being
197+
pulled from the `rpi-wifi-firmware` since that package is out of date.
198+
199+
Additionally, the upstream Raspberry Pi kernel changed the
200+
`pi3-miniuart-bt.dtbo` overlay's name to `miniuart-bt.dtbo`. The easy fix is to
201+
do a global search for `pi3-miniuart-bt` and replace it with `miniuart-bt`.
202+
203+
* Updated dependencies
204+
* [nerves_system_br: bump to v1.13.4](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.13.4)
205+
* [Erlang/OTP 23.1.4](https://erlang.org/download/OTP-23.1.4.README)
206+
* [boardid 1.10.0](https://github.com/nerves-project/boardid/releases/tag/v1.10.0)
207+
208+
* Improvements
209+
* Enabled reproducible builds in Buildroot to remove some timestamp and build
210+
path differences in firmware images. This helps delta firmware updates.
211+
* The memory cgroup controller is no longer enabled by default. This was an
212+
upstream change. As a result, the memory cgroup directory is no longer
213+
mounted.
214+
215+
## v1.13.0
216+
217+
This release updates to [Buildroot
218+
2020.08](http://lists.busybox.net/pipermail/buildroot/2020-September/290797.html) and OTP 23.1.1.
219+
220+
* Updated dependencies
221+
* [nerves_system_br: bump to v1.13.2](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.13.2)
222+
* [Erlang/OTP 23.1.1](https://erlang.org/download/OTP-23.1.1.README)
223+
* [erlinit 1.8.0](https://github.com/nerves-project/erlinit/releases/tag/v1.8.0)
224+
* [nerves 1.7.0](https://github.com/nerves-project/nerves/releases/tag/v1.7.0)
225+
226+
* New features
227+
* Added support for updating the root filesystem using firmware patches.
228+
See the [firmware patch docs](https://hexdocs.pm/nerves/experimental-features.html#content) for more information.
229+
230+
## v1.12.2
231+
232+
This release updates to [Buildroot
233+
2020.05.1](http://lists.busybox.net/pipermail/buildroot/2020-July/287824.html)
234+
and OTP 23.0.3 which are both bug fix releases.
235+
236+
* Updated dependencies
237+
* [nerves_system_br: bump to v1.12.4](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.12.4)
238+
* [Erlang/OTP 23.0.3](https://erlang.org/download/OTP-23.0.3.README)
239+
* [nerves_heart v0.3.0](https://github.com/nerves-project/nerves_heart/releases/tag/v0.3.0)
240+
241+
* New features
242+
* The `/data` directory now exists for storing application-specific data. It
243+
is currently a symlink to `/root`. Using `/data` will eventually be
244+
encouraged over `/root` even though currently there is no advantage. This
245+
change makes it possible to start migrating paths in applications and
246+
libraries.
247+
248+
* Fixes
249+
* Fixed old references to the `-Os` compiler flag. All C/C++ code will default
250+
to using `-O2` now.
251+
252+
## v1.12.1
253+
254+
* Fixes
255+
* Remove `nerves_system_linter` from hex package. This fixes mix dependency
256+
errors in projects that reference systems with different
257+
`nerves_system_linter` dependency specs.
258+
259+
## v1.12.0
260+
261+
This release updates the system to use Buildroot 2020.05 and Erlang/OTP 23.
262+
Please see the respective release notes for updates and deprecations in both
263+
projects for changes that may affect your application.
264+
265+
* New features
266+
* Support the Raspberry Pi Sense HAT's joystick
267+
* Enable WiFi mesh support in the 802.11 stack
268+
269+
* Updated dependencies
270+
* [nerves_system_br v1.12.0](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.12.0)
271+
* [Erlang/OTP 23.0.2](https://erlang.org/download/OTP-23.0.2.README)
272+
* [Linux 4.19.118 (Raspberry Pi 1.2020601 tag)](https://github.com/raspberrypi/linux/tree/raspberrypi-kernel_1.20200601-1)
273+
* [Raspberry Pi firmware 1.2020601](https://github.com/raspberrypi/firmware/tree/1.20200601)
274+
275+
## v1.11.2
119276

120-
* Merge upstream systems.
277+
* Updated dependencies
278+
* [nerves_system_br v1.11.4](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.11.4)
279+
* Erlang 22.3.4.1
280+
* fwup 1.7.0
281+
282+
## v1.11.1
283+
284+
* Updated dependencies
285+
* [nerves_system_br v1.11.2](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.11.2)
286+
* Erlang 22.3.1
287+
* erlinit 1.7.0 - tty initialization support
288+
* fwup 1.6.0 - xdelta3/VCDIFF patch support
289+
* Enable unixodbc so that Erlang's odbc application can be used in projects
290+
291+
## v1.11.0
292+
293+
This release updates Buildroot to 2020.02 and upgrades gcc from 8.3 to 9.2.
294+
While this is a minor version bump due to the Buildroot release update, barring
295+
advanced usage of Nerves, this is a straightforward update from v1.10.2.
296+
297+
* Updated dependencies
298+
* [nerves_system_br v1.11.0](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.11.0)
299+
* linux 4.19.97 (raspberrypi-kernel_1.20200212-1 tag)
300+
* Erlang 22.2.8
301+
302+
## v1.10.2
303+
304+
* Updated dependencies
305+
* [nerves_system_br v1.10.2](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.10.2)
306+
* Erlang 22.2.4
121307

122-
## v1.10.0-farmbot.1
308+
## v1.10.1
123309

124-
* Merge upstream systems.
310+
* Enhancements
311+
* Set `expand=true` on the application data partition. This will only take
312+
effect for users running the complete task, fwup will not expand application
313+
data partitions that exist during upgrade tasks.
314+
315+
* Updated dependencies
316+
* [nerves_system_br v1.10.1](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.10.1)
317+
* Erlang 22.2.3
125318

126319
## v1.10.0
127320

@@ -143,24 +336,6 @@ Erlang/OTP is now at 22.1.7.
143336
* Updated dependencies
144337
* [nerves_system_br v1.9.5](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.9.5)
145338

146-
## 1.9.1-farmbot.4
147-
148-
* republish of 1.9.1-farmbot.3
149-
150-
## 1.9.1-farmbot.3
151-
152-
* Fix espeak
153-
154-
## 1.9.1-farmbot.2
155-
156-
* move repository to `farmbot` org
157-
158-
## v1.9.1-farmbot.1
159-
160-
* Merge upstream system
161-
* Fix python opencv bug
162-
* [details](http://lists.busybox.net/pipermail/buildroot/2019-September/259271.html)
163-
164339
## v1.9.1
165340

166341
This release pulls in security and bug fix updates from `nerves_system_br`.
@@ -170,10 +345,6 @@ Erlang/OTP is now at 22.1.1.
170345
* [nerves_system_br v1.9.4](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.9.4)
171346
* linux - update to the raspberrypi-kernel_1.20190925-1 tag
172347

173-
## 1.9.0-farmbot.1
174-
175-
* Merge Upstream system
176-
177348
## v1.9.0
178349

179350
This release updates Buildroot to 2019.08 with security and bug fix updates
@@ -185,21 +356,6 @@ across Linux packages. See the `nerves_system_br` notes for details.
185356
* Enhancements
186357
* Support a variety of USB->UART adapters so more devices work out-of-the-box
187358

188-
## 1.8.2-farmbot.2
189-
190-
* Added kernel modules
191-
* most RTL chips
192-
193-
## 1.8.2-farmbot.1
194-
195-
* Updated dependencies
196-
* [nerves_system_br v1.9.1](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.9.1)
197-
198-
## 1.8.2-farmbot.0
199-
200-
* Added kernel modules
201-
* RTL8188
202-
203359
## v1.8.2
204360

205361
This release fixes an issue that broke display output on small LCD screens.
@@ -216,18 +372,6 @@ https://github.com/fhunleth/rpi_fb_capture/issues/2 for details.
216372
* [nerves_system_br v1.8.4](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.8.4)
217373
* Linux 4.19.58 with patches from the Raspberry Pi Foundation
218374

219-
## v1.8.0-farmbot.2
220-
221-
* Fix booting on rpi3b+ and rpi3a
222-
223-
## v1.8.0-farmbot.1
224-
225-
* Change TTY that erlinit uses for UART console
226-
227-
## v1.8.0-farmbot.0
228-
229-
* Merge Upstream system
230-
231375
## v1.8.0
232376

233377
This release
@@ -243,30 +387,6 @@ See the nerves_system_br and toolchain release notes for more information.
243387
* [nerves_system_br v1.8.2](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.8.2)
244388
* [nerves_toolchain_arm_unknown_linux_gnueabihf v1.2.0](https://github.com/nerves-project/toolchains/releases/tag/v1.2.0)
245389

246-
## v1.7.2-farmbot.2
247-
* Buildroot
248-
* enable `dnsmasq`
249-
250-
## v1.7.2-farmbot.1
251-
* Linux
252-
* Enable advanced IP routing
253-
254-
## v1.7.2-farmbot.0
255-
256-
* Merge Upstream system
257-
* Busybox
258-
* enable `mktmp`
259-
* enable `runparts`
260-
* enable `dnsdomains` (dnsd)
261-
* enable `ifconfig`
262-
* enable `ifplugd`
263-
* enable `ifupdown`
264-
* enable `udhcpd`
265-
* Buildroot
266-
* enable `wpa_cli`
267-
* enable autoscan option in `wpa_supplicant`
268-
* disable `dnsmasq`
269-
270390
## v1.7.2
271391

272392
* Bux fixes
@@ -275,10 +395,6 @@ See the nerves_system_br and toolchain release notes for more information.
275395
* Updated dependencies
276396
* [nerves_system_br v1.7.2](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.7.2)
277397

278-
## v1.7.1-farmbot.0
279-
280-
* Merge Upstream system
281-
282398
## v1.7.1
283399

284400
* Bug fixes
@@ -306,10 +422,6 @@ the problem.
306422
* [nerves_system_br v1.7.0](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.7.0)
307423
* Linux 4.19.25 with patches from the Raspberry Pi Foundation
308424

309-
## v1.6.3-farmbot.0
310-
311-
* Merge Upstream system
312-
313425
## v1.6.3
314426

315427
* Updated dependencies
@@ -323,17 +435,6 @@ the problem.
323435
* Erlang 21.2.4
324436
* boardid 1.5.3
325437

326-
## v1.6.1-farmbot.1
327-
328-
* Enhancements
329-
* Add unprivileged user for Farmware
330-
331-
## v1.6.1-farmbot.0
332-
333-
* Updated dependencies
334-
* Python 3
335-
* OpenCv 3
336-
337438
## v1.6.1
338439

339440
* Updated dependencies
@@ -365,24 +466,6 @@ such as ed25519 that have been added in recent Erlang releases.
365466
* wpa_passphrase
366467
* libp11 0.4.9
367468

368-
## 1.5.1-farmbot.2
369-
370-
* Updated dependencies
371-
* enable `wpa_passphrase`
372-
373-
## 1.5.1-farmbot.1
374-
375-
## 1.5.1-farmbot.0
376-
377-
Apply Farmbot Patches
378-
379-
* Updated dependencies
380-
* Enable `dnsmasq`
381-
* Enable more serial drivers in kernel.
382-
* Enable v4l drivers in kernel
383-
* Enable python2
384-
* Enable opencv2.4
385-
386469
## v1.5.1
387470

388471
* Enhancements

0 commit comments

Comments
 (0)