From c929a3e3fc2c9c26f4799ea74f3a4cf908f717f1 Mon Sep 17 00:00:00 2001 From: Lans Zhang Date: Mon, 24 Jul 2017 12:21:29 +0800 Subject: efivar: clean up Signed-off-by: Lans Zhang --- .../Remove-use-of-deprecated-readdir_r.patch | 44 ---------------------- .../recipes-support/efivar/efivar_0.24.bbappend | 13 ------- 2 files changed, 57 deletions(-) delete mode 100644 meta-efi-secure-boot/recipes-support/efivar/efivar/Remove-use-of-deprecated-readdir_r.patch delete mode 100644 meta-efi-secure-boot/recipes-support/efivar/efivar_0.24.bbappend 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 @@ -From 7078852e4a89f5ba27e7a70bc69641e01a6bff7a Mon Sep 17 00:00:00 2001 -From: Yunguo Wei -Date: Thu, 19 Jan 2017 15:11:25 +0800 -Subject: [PATCH] Remove use of deprecated readdir_r - -Backport 1dc6d576fa4(Remove use of deprecated readdir_r) from -https://github.com/rhinstaller/efivar.git - -Signed-off-by: Yunguo Wei ---- - src/vars.c | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/src/vars.c b/src/vars.c -index 2a276de..ec0d6bf 100644 ---- a/src/vars.c -+++ b/src/vars.c -@@ -126,19 +126,15 @@ is_64bit(void) - if (dfd < 0) - goto err; - -- struct dirent entry; -- struct dirent *result = NULL; - while (1) { -- int rc = readdir_r(dir, &entry, &result); -- if (rc != 0) -- break; -- if (result == NULL) -+ struct dirent *entry = readdir(dir); -+ if (entry == NULL) - break; - -- if (!strcmp(entry.d_name, "..") || !strcmp(entry.d_name, ".")) -+ if (!strcmp(entry->d_name, "..") || !strcmp(entry->d_name, ".")) - continue; - -- ssize_t size = get_file_data_size(dfd, entry.d_name); -+ ssize_t size = get_file_data_size(dfd, entry->d_name); - if (size < 0) { - continue; - } else if (size == 2084) { --- -2.7.4 - 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 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/efivar:" - -SRC_URI += "\ - file://Remove-use-of-deprecated-readdir_r.patch \ -" - -# In dp.h, 'for' loop initial declarations are used -CFLAGS_append = " -std=gnu99" - -# In order to install headers and libraries to sysroot -do_install_append() { - oe_runmake DESTDIR=${D} install -} -- cgit v1.2.3-54-g00ecf