diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-02-09 19:23:08 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-15 20:06:43 -0800 |
commit | b413deab20338b11c2dc9cee47e42b73d5d1d943 (patch) | |
tree | 8879330afd5558e6f0c8586ce02f664f1a40a678 | |
parent | 2c970305529ed884095db53fa699e11399394483 (diff) | |
download | poky-b413deab20338b11c2dc9cee47e42b73d5d1d943.tar.gz |
gnu-efi: 3.0.4 -> 3.0.5
* Remove aarch64-initplat.c-fix-const-qualifier.patch which is already
in the source.
(From OE-Core rev: b8ae433bebaff4c85415ab91e865fbfefeebe345)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi/aarch64-initplat.c-fix-const-qualifier.patch | 35 | ||||
-rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb (renamed from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb) | 5 |
2 files changed, 2 insertions, 38 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/aarch64-initplat.c-fix-const-qualifier.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/aarch64-initplat.c-fix-const-qualifier.patch deleted file mode 100644 index 965f074ebe..0000000000 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/aarch64-initplat.c-fix-const-qualifier.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From dc83b84dc8b4e71efce47143497aac6c126065cf Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Mon, 18 Jul 2016 08:40:29 -0700 | ||
4 | Subject: [PATCH] lib/aarch64/initplat.c: fix const qualifier | ||
5 | |||
6 | Fixed: | ||
7 | initplat.c:44:35: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] | ||
8 | unsigned char *p = dest, *q = src; | ||
9 | ^~~ | ||
10 | cc1: all warnings being treated as errors | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | --- | ||
16 | lib/aarch64/initplat.c | 3 ++- | ||
17 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/lib/aarch64/initplat.c b/lib/aarch64/initplat.c | ||
20 | index 2ac03a7..aae7beb 100644 | ||
21 | --- a/lib/aarch64/initplat.c | ||
22 | +++ b/lib/aarch64/initplat.c | ||
23 | @@ -41,7 +41,8 @@ void *memset(void *s, int c, __SIZE_TYPE__ n) | ||
24 | |||
25 | void *memcpy(void *dest, const void *src, __SIZE_TYPE__ n) | ||
26 | { | ||
27 | - unsigned char *p = dest, *q = src; | ||
28 | + unsigned char *p = dest; | ||
29 | + const unsigned char *q = src; | ||
30 | |||
31 | while (n--) | ||
32 | *p++ = *q++; | ||
33 | -- | ||
34 | 2.9.0 | ||
35 | |||
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb index 9edd539b55..f46381d5f1 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb | |||
@@ -16,11 +16,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ | |||
16 | file://parallel-make-archives.patch \ | 16 | file://parallel-make-archives.patch \ |
17 | file://lib-Makefile-fix-parallel-issue.patch \ | 17 | file://lib-Makefile-fix-parallel-issue.patch \ |
18 | file://gcc46-compatibility.patch \ | 18 | file://gcc46-compatibility.patch \ |
19 | file://aarch64-initplat.c-fix-const-qualifier.patch \ | ||
20 | " | 19 | " |
21 | 20 | ||
22 | SRC_URI[md5sum] = "612e0f327f31c4b8468ef55f4eeb9649" | 21 | SRC_URI[md5sum] = "1f719c9c135778aa6b087b89a1cc2423" |
23 | SRC_URI[sha256sum] = "51a00428c3ccb96db24089ed8394843c4f83cf8f42c6a4dfddb4b7c23f2bf8af" | 22 | SRC_URI[sha256sum] = "bd8fcd5914f18fc0e4ba948ab03b00013e528504f529c60739b748f6ef130b22" |
24 | 23 | ||
25 | COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" | 24 | COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" |
26 | COMPATIBLE_HOST_armv4 = 'null' | 25 | COMPATIBLE_HOST_armv4 = 'null' |