diff --git a/.circleci/config.yml b/.circleci/config.yml index f8cc389..db707ba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ exec: &exec name: build-tools/nerves-system-br - version: 1.9.2 - elixir: 1.9.1-otp-22 + version: 1.10.2 + elixir: 1.9.4-otp-22 version: 2.1 diff --git a/example/mix.lock b/example/mix.lock index 89b6808..26fbf30 100644 --- a/example/mix.lock +++ b/example/mix.lock @@ -9,7 +9,7 @@ "nerves_network": {:hex, :nerves_network, "0.5.5", "4690c362707f76c4072810bd9639b2ae8eb7dd9c21119656308b462a087230aa", [:make, :mix], [{:elixir_make, "~> 0.5", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:nerves_network_interface, "~> 0.4.4", [hex: :nerves_network_interface, repo: "hexpm", optional: false]}, {:nerves_wpa_supplicant, "~> 0.5", [hex: :nerves_wpa_supplicant, repo: "hexpm", optional: false]}, {:one_dhcpd, "~> 0.2.0", [hex: :one_dhcpd, repo: "hexpm", optional: false]}, {:system_registry, "~> 0.7", [hex: :system_registry, repo: "hexpm", optional: false]}], "hexpm"}, "nerves_network_interface": {:hex, :nerves_network_interface, "0.4.6", "d50e57daca8154f0f780fd98eb5ae94a005579e0d72d69840e80e228375d88ad", [:make, :mix], [{:elixir_make, "~> 0.5", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"}, "nerves_runtime": {:hex, :nerves_runtime, "0.10.3", "8671c805262a6b8819a92b16afb100060af55a807a30f62395136c133e72b4ab", [: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", [hex: :uboot_env, repo: "hexpm", optional: false]}], "hexpm"}, - "nerves_system_br": {:hex, :nerves_system_br, "1.9.2", "67ef341005641486c25e9ab9f742a57be42ef77d3fdccc562ffaf0263c01e7be", [:mix], [], "hexpm"}, + "nerves_system_br": {:hex, :nerves_system_br, "1.10.2", "2cbf767e9da2c526c3a00720a3f7212b861735fed41f3abcbc2af4a960731d7c", [:mix], [], "hexpm"}, "nerves_system_linter": {:hex, :nerves_system_linter, "0.3.0", "84e0f63c8ac196b16b77608bbe7df66dcf352845c4e4fb394bffd2b572025413", [:mix], [], "hexpm"}, "nerves_time": {:hex, :nerves_time, "0.3.0", "b5c01dbfd4f2912c3b1c965e4d3f843efd4f714ce560fec0940501a1d2d743ad", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:muontrap, "~> 0.5", [hex: :muontrap, repo: "hexpm", optional: false]}], "hexpm"}, "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.6.0", "452f8589c1a58ac787477caab20a8cfc6671e345837ccc19beefe49ae35ba983", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"}, diff --git a/mix.exs b/mix.exs index ffc96df..0ad4578 100644 --- a/mix.exs +++ b/mix.exs @@ -49,7 +49,7 @@ defmodule KioskSystemx8664.Mixfile do defp deps do [ {:nerves, "~> 1.5.0", runtime: false}, - {:nerves_system_br, "1.9.2", runtime: false}, + {:nerves_system_br, "1.10.2", runtime: false}, {:nerves_toolchain_x86_64_unknown_linux_gnu , "1.2.0", runtime: false}, {:nerves_system_linter, "~> 0.3.0", runtime: false}, {:ex_doc, "~> 0.18", only: :dev} diff --git a/mix.lock b/mix.lock index 3597286..3253d84 100644 --- a/mix.lock +++ b/mix.lock @@ -6,7 +6,7 @@ "makeup": {:hex, :makeup, "0.8.0", "9cf32aea71c7fe0a4b2e9246c2c4978f9070257e5c9ce6d4a28ec450a839b55f", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"}, "makeup_elixir": {:hex, :makeup_elixir, "0.13.0", "be7a477997dcac2e48a9d695ec730b2d22418292675c75aa2d34ba0909dcdeda", [:mix], [{:makeup, "~> 0.8", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"}, "nerves": {:hex, :nerves, "1.5.1", "07079342db3a03d19694118a93f220359fbd94b6e174b98d1ea2709db9e81da9", [:mix], [{:distillery, "~> 2.1", [hex: :distillery, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, - "nerves_system_br": {:hex, :nerves_system_br, "1.9.2", "67ef341005641486c25e9ab9f742a57be42ef77d3fdccc562ffaf0263c01e7be", [:mix], [], "hexpm"}, + "nerves_system_br": {:hex, :nerves_system_br, "1.10.2", "2cbf767e9da2c526c3a00720a3f7212b861735fed41f3abcbc2af4a960731d7c", [:mix], [], "hexpm"}, "nerves_system_linter": {:hex, :nerves_system_linter, "0.3.0", "84e0f63c8ac196b16b77608bbe7df66dcf352845c4e4fb394bffd2b572025413", [:mix], [], "hexpm"}, "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.6.0", "452f8589c1a58ac787477caab20a8cfc6671e345837ccc19beefe49ae35ba983", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"}, "nerves_toolchain_x86_64_unknown_linux_gnu": {:hex, :nerves_toolchain_x86_64_unknown_linux_gnu, "1.2.0", "c3e4f386e920fb90137c82c7b17f4d1c0046b2dd5c3eb43b7d14c4fc2d8eb59d", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.6.0", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"}, diff --git a/nerves_defconfig b/nerves_defconfig index a7a28a7..b18423a 100644 --- a/nerves_defconfig +++ b/nerves_defconfig @@ -43,7 +43,7 @@ BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y BR2_PACKAGE_MESA3D_DRI_DRIVER_I915=y BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y -BR2_PACKAGE_MESA3D_OSMESA=y +BR2_PACKAGE_MESA3D_OSMESA_CLASSIC=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM=y