mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
atftp: update to 0.7.4
Removed upstreamed patches. Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
committed by
Khem Raj
parent
c0ccc8b901
commit
f4e0b86fa4
-45
@@ -1,45 +0,0 @@
|
|||||||
From 543e67919f5cacf309ac88ab091331e41af4224b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Seiderer <ps.report@gmx.net>
|
|
||||||
Date: Thu, 16 Apr 2015 22:41:57 +0200
|
|
||||||
Subject: [PATCH] argz.h: fix musl compile (add missing defines)
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Add __THROW, __BEGIN_DECLS, __END_DECLS and __attribute_pure__ defines.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
||||||
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
|
|
||||||
---
|
|
||||||
argz.h | 16 ++++++++++++++++
|
|
||||||
1 file changed, 16 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/argz.h b/argz.h
|
|
||||||
index 582be55..bdf9f62 100644
|
|
||||||
--- a/argz.h
|
|
||||||
+++ b/argz.h
|
|
||||||
@@ -48,6 +48,22 @@
|
|
||||||
# define __const const
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifndef __THROW
|
|
||||||
+# define __THROW
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+#ifndef __BEGIN_DECLS
|
|
||||||
+# define __BEGIN_DECLS
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+#ifndef __END_DECLS
|
|
||||||
+# define __END_DECLS
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+#ifndef __attribute_pure__
|
|
||||||
+# define __attribute_pure__
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#ifndef __error_t_defined
|
|
||||||
typedef int error_t;
|
|
||||||
#endif
|
|
||||||
--
|
|
||||||
2.1.4
|
|
||||||
|
|
||||||
-43
@@ -1,43 +0,0 @@
|
|||||||
From 77e399899d9d7297d23c321811b628febdf0fd92 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Seiderer <ps.report@gmx.net>
|
|
||||||
Date: Thu, 16 Apr 2015 22:43:49 +0200
|
|
||||||
Subject: [PATCH] tftp.h/tftpd.h: fix musl compile (missing include)
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Add sys/types.h include for u_char typedef.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
||||||
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
|
|
||||||
---
|
|
||||||
tftp.h | 1 +
|
|
||||||
tftpd.h | 1 +
|
|
||||||
2 files changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/tftp.h b/tftp.h
|
|
||||||
index 12bd6aa..32a3f63 100644
|
|
||||||
--- a/tftp.h
|
|
||||||
+++ b/tftp.h
|
|
||||||
@@ -19,6 +19,7 @@
|
|
||||||
|
|
||||||
#include <sys/time.h>
|
|
||||||
#include <sys/times.h>
|
|
||||||
+#include <sys/types.h>
|
|
||||||
#include "tftp_def.h"
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
diff --git a/tftpd.h b/tftpd.h
|
|
||||||
index 945065e..60d3a49 100644
|
|
||||||
--- a/tftpd.h
|
|
||||||
+++ b/tftpd.h
|
|
||||||
@@ -20,6 +20,7 @@
|
|
||||||
#include <pthread.h>
|
|
||||||
#include <arpa/tftp.h>
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
+#include <sys/types.h>
|
|
||||||
#include "tftp_io.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
--
|
|
||||||
2.1.4
|
|
||||||
|
|
||||||
+1
-4
@@ -4,15 +4,12 @@ HOMEPAGE = "http://packages.debian.org/atftp"
|
|||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
|
||||||
|
|
||||||
SRCREV = "52b71f0831dcbde508bd3a961d84abb80a62480f"
|
SRCREV = "e56e8845f1070e89a4a6e509396b681688d03793"
|
||||||
|
|
||||||
SRC_URI = "git://git.code.sf.net/p/atftp/code \
|
SRC_URI = "git://git.code.sf.net/p/atftp/code \
|
||||||
file://atftpd.init \
|
file://atftpd.init \
|
||||||
file://atftpd.service \
|
file://atftpd.service \
|
||||||
"
|
"
|
||||||
SRC_URI_append_libc-musl = " file://0001-argz.h-fix-musl-compile-add-missing-defines.patch \
|
|
||||||
file://0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
Reference in New Issue
Block a user