godotengine/buildroot
1
0
Fork 0
mirror of https://github.com/godotengine/buildroot.git synced 2026-01-04 06:10:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
A few conflicts had to be resolved:

 - Version number and hash for mesa3d-headers/mesa3d
 - Patches added in qemu, and the qemu version number
 - The gnuconfig README.buildroot

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Thomas Petazzoni
2020-06-02 21:59:52 +02:00
parent d1c67785ef 4675c7d441
commit a6569f2b3d
181 changed files with 1037 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boot/at91bootstrap3/Config.in
View File

@@ -19,7 +19,7 @@ choice
prompt "AT91 Bootstrap 3 version"
config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
bool "3.9.0"
bool "3.9.2"
config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
bool "Custom Git repository"
@@ -51,7 +51,7 @@ endif
config BR2_TARGET_AT91BOOTSTRAP3_VERSION
string
default "v3.9.0" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
default "v3.9.2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \
if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
default "custom" if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL

2
boot/at91bootstrap3/at91bootstrap3.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated
sha256 e23e6df23b79ca81e412cb73a1f48bd95df8d46c7d52a1d073c2ed9d4f3a1a71 at91bootstrap3-v3.9.0.tar.gz
sha256 6cf37df482024f3770fe1880f768a675beda16323a90e702860d9e5478105b3f at91bootstrap3-v3.9.2.tar.gz
sha256 732b2a55b5905031d8ae420136ffb5f8889214865784386bf754cffab8d2bc6e main.c

4
boot/barebox/Config.in
View File

@@ -12,7 +12,7 @@ choice
Select the specific Barebox version you want to use
config BR2_TARGET_BAREBOX_LATEST_VERSION
bool "2020.03.0"
bool "2020.05.0"
config BR2_TARGET_BAREBOX_CUSTOM_VERSION
bool "Custom version"
@@ -40,7 +40,7 @@ endif
config BR2_TARGET_BAREBOX_VERSION
string
default "2020.03.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
default "2020.05.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT

6
boot/barebox/barebox.hash
View File

@@ -1,8 +1,8 @@
# From https://www.barebox.org/download/barebox-2020.03.0.tar.bz2.md5
md5 9e93df6dadb898d91d9f3811456a94bd barebox-2020.03.0.tar.bz2
# From https://www.barebox.org/download/barebox-2020.05.0.tar.bz2.md5
md5 31dee7b5715967fab882cabe4e406896 barebox-2020.05.0.tar.bz2
# Locally calculated
sha256 625b031d1fe99bdd3bf95f79c8ecfcf67101bc2500ec4816e034bf989f16d1c2 barebox-2020.03.0.tar.bz2
sha256 03e29c2864c3220c676a0cf768ffe2b8f1064eddb60463281c9944625e649b65 barebox-2020.05.0.tar.bz2
# License files, locally computed
sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING