iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
package/ser2net/0001-port.h-include-sys-time.h.patch Normal file
View File

@@ -0,0 +1,39 @@
From 021543b02b6fdb78c9217757736eabac90a647eb Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sat, 26 Sep 2020 12:37:38 +0200
Subject: [PATCH] port.h: include <sys/time.h>
Include <sys/time.h> to avoid the following build failure on musl:
port.h:361:29: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration
const char *str, struct timeval *tv,
^~~~~~~
portconfig.c: In function 'myconfig':
portconfig.c:586:9: error: variable 'tv' has initializer but incomplete type
struct timeval tv = { 0, 0 };
^~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/4c0b238186cb2fb2d81807ce006945594f92b2cd
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/cminyard/ser2net/pull/34]
---
port.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/port.h b/port.h
index 048c5bd..86c3b1d 100644
--- a/port.h
+++ b/port.h
@@ -9,6 +9,7 @@
#define PORT
#include <netdb.h>
+#include <sys/time.h>
#include "gbuf.h"
#include "absout.h"
--
2.28.0

2
package/ser2net/Config.in
View File

@@ -1,6 +1,8 @@
config BR2_PACKAGE_SER2NET
bool "ser2net"
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_GENSIO
select BR2_PACKAGE_LIBYAML
help
Ser2net provides a way for a user to connect from a network
connection to a serial port.

2
package/ser2net/S50ser2net
View File

@@ -5,7 +5,7 @@
start() {
printf "Starting ser2net: "
if [ ! -f /etc/ser2net.conf ] ; then
if [ ! -f /etc/ser2net.conf ] && [ ! -f /etc/ser2net/ser2net.yaml ] ; then
echo "no configuration file"
exit 1
fi

8
package/ser2net/ser2net.hash
View File

@@ -1,6 +1,6 @@
# From https://sourceforge.net/projects/ser2net/files/ser2net/
md5 e10e7c8c97e5bade5e85ce6e89bdf1f4 ser2net-3.5.tar.gz
sha1 0ad0affd37ef544c23f42a3f46d09e969d0d9116 ser2net-3.5.tar.gz
md5 7c0a47bd9b405aedac136c4e290ebfeb ser2net-4.2.2.tar.gz
sha1 64e77d3194bbbac6e7e9d5810d06b6ade7bfdcf4 ser2net-4.2.2.tar.gz
# Locally computed:
sha256 ba9e1d60a89fd7ed075553b4a2074352902203f7fbd9b65b15048c05f0e3f3be ser2net-3.5.tar.gz
sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING
sha256 60e2aab04c4a346447a7e58e308a830fb74bac208a021229c113fc8ccc7bdfe6 ser2net-4.2.2.tar.gz
sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING

8
package/ser2net/ser2net.mk
View File

@@ -4,10 +4,11 @@
#
################################################################################
SER2NET_VERSION = 3.5
SER2NET_VERSION = 4.2.2
SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
SER2NET_LICENSE = GPL-2.0+
SER2NET_LICENSE_FILES = COPYING
SER2NET_DEPENDENCIES = gensio libyaml
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
SER2NET_CONF_OPTS += --with-pthreads
@@ -15,6 +16,11 @@ else
SER2NET_CONF_OPTS += --without-pthreads
endif
# fix gensio detection with openssl enabled
ifeq ($(BR2_PACKAGE_OPENSSL),y)
SER2NET_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`"
endif
define SER2NET_INSTALL_INIT_SYSV
$(INSTALL) -D -m 755 package/ser2net/S50ser2net \
$(TARGET_DIR)/etc/init.d/S50ser2net