summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLans Zhang <jia.zhang@windriver.com>2017-07-24 12:21:29 +0800
committerLans Zhang <jia.zhang@windriver.com>2017-07-24 12:21:29 +0800
commitc929a3e3fc2c9c26f4799ea74f3a4cf908f717f1 (patch)
treee3390eafb0084868b4991be23b4e33e23f34e0f6
parent2531d04180f0ca29e321ab68af837bd974c746e6 (diff)
downloadmeta-secure-core-c929a3e3fc2c9c26f4799ea74f3a4cf908f717f1.tar.gz
efivar: clean up
Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
-rw-r--r--meta-efi-secure-boot/recipes-support/efivar/efivar/Remove-use-of-deprecated-readdir_r.patch44
-rw-r--r--meta-efi-secure-boot/recipes-support/efivar/efivar_0.24.bbappend13
2 files changed, 0 insertions, 57 deletions
diff --git a/meta-efi-secure-boot/recipes-support/efivar/efivar/Remove-use-of-deprecated-readdir_r.patch b/meta-efi-secure-boot/recipes-support/efivar/efivar/Remove-use-of-deprecated-readdir_r.patch
deleted file mode 100644
index af58c22..0000000
--- a/meta-efi-secure-boot/recipes-support/efivar/efivar/Remove-use-of-deprecated-readdir_r.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 7078852e4a89f5ba27e7a70bc69641e01a6bff7a Mon Sep 17 00:00:00 2001
2From: Yunguo Wei <yunguo.wei@windriver.com>
3Date: Thu, 19 Jan 2017 15:11:25 +0800
4Subject: [PATCH] Remove use of deprecated readdir_r
5
6Backport 1dc6d576fa4(Remove use of deprecated readdir_r) from
7https://github.com/rhinstaller/efivar.git
8
9Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
10---
11 src/vars.c | 12 ++++--------
12 1 file changed, 4 insertions(+), 8 deletions(-)
13
14diff --git a/src/vars.c b/src/vars.c
15index 2a276de..ec0d6bf 100644
16--- a/src/vars.c
17+++ b/src/vars.c
18@@ -126,19 +126,15 @@ is_64bit(void)
19 if (dfd < 0)
20 goto err;
21
22- struct dirent entry;
23- struct dirent *result = NULL;
24 while (1) {
25- int rc = readdir_r(dir, &entry, &result);
26- if (rc != 0)
27- break;
28- if (result == NULL)
29+ struct dirent *entry = readdir(dir);
30+ if (entry == NULL)
31 break;
32
33- if (!strcmp(entry.d_name, "..") || !strcmp(entry.d_name, "."))
34+ if (!strcmp(entry->d_name, "..") || !strcmp(entry->d_name, "."))
35 continue;
36
37- ssize_t size = get_file_data_size(dfd, entry.d_name);
38+ ssize_t size = get_file_data_size(dfd, entry->d_name);
39 if (size < 0) {
40 continue;
41 } else if (size == 2084) {
42--
432.7.4
44
diff --git a/meta-efi-secure-boot/recipes-support/efivar/efivar_0.24.bbappend b/meta-efi-secure-boot/recipes-support/efivar/efivar_0.24.bbappend
deleted file mode 100644
index 6d415bb..0000000
--- a/meta-efi-secure-boot/recipes-support/efivar/efivar_0.24.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/efivar:"
2
3SRC_URI += "\
4 file://Remove-use-of-deprecated-readdir_r.patch \
5"
6
7# In dp.h, 'for' loop initial declarations are used
8CFLAGS_append = " -std=gnu99"
9
10# In order to install headers and libraries to sysroot
11do_install_append() {
12 oe_runmake DESTDIR=${D} install
13}