2019.04 RC4

This commit is contained in:
Peter Robinson 2019-03-19 10:53:38 +00:00
parent 7456ce2f7a
commit 982620b114
3 changed files with 20 additions and 26 deletions

View File

@ -1 +1 @@
SHA512 (u-boot-2019.04-rc3.tar.bz2) = d3b4a41ffcb593919dedb9f6fd25f3e77220cddada845b6f34193741324e3ceaa0e2645635d8ce155c32ae5e9772d2aa1366869abc8a290d4cc5121e995d34b9 SHA512 (u-boot-2019.04-rc4.tar.bz2) = 33a57e4acb51dbe04123055b159a5b3a933ea8340aa81a4148572ee5fc12288413a6c6c0b80b6fe099ac79ea6359be2d9034ead1edfcc0403895f3f8eb56746e

View File

@ -1,8 +1,8 @@
%global candidate rc3 %global candidate rc4
Name: uboot-tools Name: uboot-tools
Version: 2019.04 Version: 2019.04
Release: 0.4%{?candidate:.%{candidate}}%{?dist} Release: 0.5%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities Summary: U-Boot utilities
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
URL: http://www.denx.de/wiki/U-Boot URL: http://www.denx.de/wiki/U-Boot
@ -40,7 +40,6 @@ BuildRequires: devtoolset-7-gcc
BuildRequires: gcc BuildRequires: gcc
%endif %endif
BuildRequires: flex bison BuildRequires: flex bison
BuildRequires: git-core
BuildRequires: openssl-devel BuildRequires: openssl-devel
%if 0%{?fedora} %if 0%{?fedora}
BuildRequires: python-unversioned-command BuildRequires: python-unversioned-command
@ -101,18 +100,7 @@ u-boot bootloader ELF binaries for use with qemu and other platforms
%endif %endif
%prep %prep
%setup -q -n u-boot-%{version}%{?candidate:-%{candidate}} %autosetup -p1 -n u-boot-%{version}%{?candidate:-%{candidate}}
git init
git config --global gc.auto 0
git config user.email "noone@example.com"
git config user.name "no one"
git add .
git commit -a -q -m "%{version} baseline"
git am %{patches} </dev/null
git config --unset user.email
git config --unset user.name
rm -rf .git
cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 . cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 .
@ -313,6 +301,9 @@ cp -p board/warp7/README builds/docs/README.warp7
%endif %endif
%changelog %changelog
* Tue Mar 19 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.04-0.5-rc4
- 2019.04 RC4
* Tue Mar 5 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.04-0.4-rc3 * Tue Mar 5 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.04-0.4-rc3
- 2019.04 RC3 - 2019.04 RC3

View File

@ -1,27 +1,30 @@
From 2b411f6edf298899098e2077a5ca2dfdaf3d882f Mon Sep 17 00:00:00 2001 From c8e3063259c19e8f03c9f3e053ec6384d2d3f861 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com> From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 7 Feb 2018 12:37:58 +0000 Date: Tue, 19 Mar 2019 10:48:48 +0000
Subject: [PATCH] use Fedora specific EFI path/name Subject: [PATCH] use Fedora specific EFI path/name
Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
--- ---
include/config_distro_bootcmd.h | 8 ++++---- include/config_distro_bootcmd.h | 10 +++++-----
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index f567cebd38..7746366ec8 100644 index 4993303f4d..1aba509962 100644
--- a/include/config_distro_bootcmd.h --- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h
@@ -93,7 +93,7 @@ @@ -92,9 +92,9 @@
#ifdef CONFIG_EFI_LOADER #ifdef CONFIG_EFI_LOADER
#if defined(CONFIG_ARM64) #if defined(CONFIG_ARM64)
-#define BOOTEFI_NAME "bootaa64.efi" -#define BOOTEFI_NAME "bootaa64.efi"
+#define BOOTEFI_NAME "grubaa64.efi" +#define BOOTEFI_NAME "grubaa64.efi"
#elif defined(CONFIG_ARM) #elif defined(CONFIG_ARM)
#define BOOTEFI_NAME "bootarm.efi" -#define BOOTEFI_NAME "bootarm.efi"
+#define BOOTEFI_NAME "grubarm.efi"
#elif defined(CONFIG_X86_RUN_32BIT) #elif defined(CONFIG_X86_RUN_32BIT)
@@ -127,7 +127,7 @@ #define BOOTEFI_NAME "bootia32.efi"
#elif defined(CONFIG_X86_RUN_64BIT)
@@ -130,7 +130,7 @@
"bootefi bootmgr ${fdtcontroladdr};" \ "bootefi bootmgr ${fdtcontroladdr};" \
"fi;" \ "fi;" \
"load ${devtype} ${devnum}:${distro_bootpart} " \ "load ${devtype} ${devnum}:${distro_bootpart} " \
@ -30,7 +33,7 @@ index f567cebd38..7746366ec8 100644
"if fdt addr ${fdt_addr_r}; then " \ "if fdt addr ${fdt_addr_r}; then " \
"bootefi ${kernel_addr_r} ${fdt_addr_r};" \ "bootefi ${kernel_addr_r} ${fdt_addr_r};" \
"else " \ "else " \
@@ -150,9 +150,9 @@ @@ -153,9 +153,9 @@
"fi;" \ "fi;" \
"done;" \ "done;" \
"if test -e ${devtype} ${devnum}:${distro_bootpart} " \ "if test -e ${devtype} ${devnum}:${distro_bootpart} " \
@ -43,5 +46,5 @@ index f567cebd38..7746366ec8 100644
"echo EFI LOAD FAILED: continuing...; " \ "echo EFI LOAD FAILED: continuing...; " \
"fi; " \ "fi; " \
-- --
2.14.3 2.20.1