Bump Buildroot to 2021.02-rc3 (#1260)
* Rebase patches to Buildroot 2021.02-rc3 * Update Buildroot to 2021.02-rc3 * Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10)
This commit is contained in:
@@ -1,26 +0,0 @@
|
||||
Makefile.am: link against libpthread for atftp
|
||||
|
||||
atftp client needs to link against libpthread as static builds do not
|
||||
work otherwise.
|
||||
|
||||
Signed-off-by: Ryan Barnett <ryan.barnett@rockwellcollins.com>
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index e59592f..200829a 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -28,7 +28,7 @@ noinst_HEADERS = argz.h logger.h options.h stats.h tftp.h tftp_def.h tftp_io.h
|
||||
tftpd.h tftpd_pcre.h tftpd_mtftp.h
|
||||
|
||||
bin_PROGRAMS = atftp
|
||||
-atftp_LDADD = $(LIBTERMCAP) $(LIBREADLINE)
|
||||
+atftp_LDADD = $(LIBTERMCAP) $(LIBREADLINE) $(LIBPTHREAD)
|
||||
atftp_SOURCES = tftp.c tftp_io.c logger.c options.c tftp_def.c tftp_file.c \
|
||||
argz.c tftp_mtftp.c
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -1,42 +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)
|
||||
|
||||
Add __THROW, __BEGIN_DECLS, __END_DECLS and __attribute_pure__ defines.
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
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
|
||||
|
||||
@@ -1,40 +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)
|
||||
|
||||
Add sys/types.h include for u_char typedef.
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
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,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 1ad080674e9f974217b3a703e7356c6c8446dc5e7b2014d0d06e1bfaa11b5041 atftp-0.7.2.tar.gz
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE
|
||||
sha256 d3c9cd0d971dfc786d7a5f4055c35d4e66aafc8102ac03473ef225bdf7edb26a atftp-0.7.4.tar.gz
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE
|
||||
|
||||
@@ -4,12 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ATFTP_VERSION = 0.7.2
|
||||
ATFTP_VERSION = 0.7.4
|
||||
ATFTP_SITE = http://sourceforge.net/projects/atftp/files
|
||||
ATFTP_LICENSE = GPL-2.0+
|
||||
ATFTP_LICENSE_FILES = LICENSE
|
||||
# 0001-Makefile.am-link-against-libpthread-for-atftp.patch patches Makefile.am
|
||||
ATFTP_AUTORECONF = YES
|
||||
ATFTP_CPE_ID_VALID = YES
|
||||
ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp
|
||||
# For static we need to explicitly link against libpthread
|
||||
ATFTP_LIBS = -lpthread
|
||||
|
||||
Reference in New Issue
Block a user