Skip to content

Commit 9cb95a3

Browse files
committed
Revert "Bump toolchain to GCC 14.2"
This reverts commit 85bd580. This is for consistency with other Nerves systems until https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117675 is resolved.
1 parent d45747f commit 9cb95a3

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

mix.exs

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ defmodule NervesSystemBbb.MixProject do
6969
[
7070
{:nerves, "~> 1.11.1 or ~> 1.12", runtime: false},
7171
{:nerves_system_br, "1.29.1", runtime: false},
72-
{:nerves_toolchain_armv7_nerves_linux_gnueabihf, "~> 14.2.0", runtime: false},
72+
{:nerves_toolchain_armv7_nerves_linux_gnueabihf, "~> 13.2.0", runtime: false},
7373
{:nerves_system_linter, "~> 0.4", only: [:dev, :test], runtime: false},
7474
{:ex_doc, "~> 0.22", only: :docs, runtime: false}
7575
]

mix.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"nerves": {:hex, :nerves, "1.11.2", "a6733509c433f244aaf8a3aef28fcc3cc653fd5c5e3dc3f475b233730dbb1b2a", [: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", "0b554421e7d1b82b03955fda3d966c83ab2414c5ed52f57ad7f4bcdc98279c57"},
1111
"nerves_system_br": {:hex, :nerves_system_br, "1.29.1", "afa5337d66e9770d48dc8bf3a4da41f63dcbd1f0b4639d67fa08d449ad752668", [:mix], [], "hexpm", "33f5afe50fa603a8cdb22e281c18fb98de9f3012598af1ab77849d1dbe59747e"},
1212
"nerves_system_linter": {:hex, :nerves_system_linter, "0.4.0", "81e9a6f5018fe5fb67d7b43a04dca36156f62b55b5554eb2fa3964d3889d09cd", [:mix], [], "hexpm", "b5bd8480ce7a6317f4601ff41fd2f594bdf76aff0bdf6dcfac571c3fa1ec5f82"},
13-
"nerves_toolchain_armv7_nerves_linux_gnueabihf": {:hex, :nerves_toolchain_armv7_nerves_linux_gnueabihf, "14.2.0", "02129f8d89fdcb0aa2471a1336f49a00dd9ae6ca13437b92a153897c4877f289", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.11.0", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "44f601eba47424db5d9fb2c9e2cba54a2b186b27cb46cc8c5c737b9f454969ba"},
14-
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.11.0", "829b312eb94ea2bc4733299aeccbe1bbe67430cebf2d23cc28df7cc2ea7dc572", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "c98ab17dd2210a50e948fb5ae4ef418e651e10cbb868f00c39a1f3541cec5467"},
13+
"nerves_toolchain_armv7_nerves_linux_gnueabihf": {:hex, :nerves_toolchain_armv7_nerves_linux_gnueabihf, "13.2.0", "48305b5ba2ec41d2f9bfd0997d6bb6e8a9f5358146baa58fc64887bfe2d38ccd", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.10.0", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "7a43b14eb4ec90f36acf36a42ce42c1d69c280b90eea7ab9965e00db3ee6cbf7"},
14+
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.10.0", "c6b35377a0b7a93633a8673a788f1580fe1fa06083374b0e4df36da65828d2ef", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "e4ae1a2b84de3502ecac195765819be0ce2834eb276553163a7c03133f1760f1"},
1515
"nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
1616
}

nerves_defconfig

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ BR2_ARM_FPU_VFPV3=y
44
BR2_TOOLCHAIN_EXTERNAL=y
55
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
66
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
7-
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v14.2.0/nerves_toolchain_armv7_nerves_linux_gnueabihf-linux_${shell uname -m}-14.2.0-6442318.tar.xz"
7+
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v13.2.0/nerves_toolchain_armv7_nerves_linux_gnueabihf-linux_${shell uname -m}-13.2.0-BE3EA83.tar.xz"
88
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="armv7-nerves-linux-gnueabihf"
9+
BR2_TOOLCHAIN_EXTERNAL_GCC_13=y
910
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
1011
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
1112
# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set

0 commit comments

Comments
 (0)