mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
relayd: Update to latest tip of trunk
Drop the patch fixing an issue already addressed upstream
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 616991508e)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
parent
dbfe83d4c5
commit
56d748e139
|
|
@ -1,34 +0,0 @@
|
|||
From 2fa326b26dc479942367dc4283e2f87372403988 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 17 Jun 2017 09:32:04 -0700
|
||||
Subject: [PATCH] rtnl_flush: Error on failed write()
|
||||
|
||||
Fixes
|
||||
route.c:45:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result]
|
||||
| write(fd, "-1", 2);
|
||||
| ^~~~~~~~~~~~~~~~~~
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Upstream-Status: Submitted
|
||||
|
||||
route.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/route.c b/route.c
|
||||
index c552d1f..fc5c31e 100644
|
||||
--- a/route.c
|
||||
+++ b/route.c
|
||||
@@ -42,7 +42,8 @@ static void rtnl_flush(void)
|
||||
if (fd < 0)
|
||||
return;
|
||||
|
||||
- write(fd, "-1", 2);
|
||||
+ if (write(fd, "-1", 2) < 0 )
|
||||
+ perror("write");
|
||||
close(fd);
|
||||
}
|
||||
|
||||
--
|
||||
2.13.1
|
||||
|
||||
|
|
@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab
|
|||
|
||||
DEPENDS = "libubox"
|
||||
|
||||
SRC_URI = "git://git.openwrt.org/project/relayd.git;branch=master \
|
||||
file://0001-rtnl_flush-Error-on-failed-write.patch \
|
||||
"
|
||||
SRC_URI = "git://git.openwrt.org/project/relayd.git;branch=master"
|
||||
|
||||
SRCREV = "f4d759be54ceb37714e9a6ca320d5b50c95e9ce9"
|
||||
SRCREV = "f646ba40489371e69f624f2dee2fc4e19ceec00e"
|
||||
PV = "0.0.1+git${SRCPV}"
|
||||
|
||||
UPSTREAM_CHECK_COMMITS = "1"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user