d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump Buildroot to 2021.02-rc3 (#1260)

Browse Source 
* 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:
Stefan Agner
2021-03-04 00:50:33 +01:00
committed by GitHub
parent b77d633382
commit f358f322da
2130 changed files with 23612 additions and 21038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
buildroot/package/luasyslog/0001-compat-Lua-5.3.patch
View File

@@ -1,52 +0,0 @@
From b3347655bd31c4f1fd9e101787a84da0c98f2f8f Mon Sep 17 00:00:00 2001
From: Francois Perrad <francois.perrad@gadz.org>
Date: Wed, 12 Jun 2019 20:47:18 +0200
Subject: [PATCH] compat Lua 5.3
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
lsyslog.c | 8 ++++++--
syslog.lua | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/luasyslog-1.0.0/lsyslog.c b/luasyslog-1.0.0/lsyslog.c
index cd512dc..57121da 100644
--- a/luasyslog-1.0.0/lsyslog.c
+++ b/luasyslog-1.0.0/lsyslog.c
@@ -136,7 +136,7 @@
lua_settable(L, -3);
}
-static const struct luaL_reg lsysloglib[] =
+static const struct luaL_Reg lsysloglib[] =
{
{"open", lsyslog_open},
{"close", lsyslog_close},
@@ -146,7 +146,11 @@
int luaopen_lsyslog(lua_State *L)
{
- luaL_openlib(L, "lsyslog", lsysloglib, 0);
+#if LUA_VERSION_NUM >= 502
+ luaL_newlib(L, lsysloglib);
+#else
+ luaL_register(L, "lsyslog", lsysloglib);
+#endif
set_info(L);
return 1;
diff --git a/luasyslog-1.0.0/syslog.lua b/luasyslog-1.0.0/syslog.lua
index febda00..f4d98ec 100644
--- a/luasyslog-1.0.0/syslog.lua
+++ b/luasyslog-1.0.0/syslog.lua
@@ -1,5 +1,5 @@
-require"logging"
-require"lsyslog"
+local logging = require"logging"
+local lsyslog = require"lsyslog"
local convert =
{
--
2.20.1

27
buildroot/package/luasyslog/0001-remove-AX_LUA_LIBS.patch Normal file
View File

@@ -0,0 +1,27 @@
From 84296c5eae651b45ebfa233199b7ddc009a5dad3 Mon Sep 17 00:00:00 2001
From: Francois Perrad <francois.perrad@gadz.org>
Date: Fri, 21 Jun 2019 14:58:54 +0200
Subject: [PATCH] remove AX_LUA_LIBS
AX_LUA_LIBS fails with LuaJIT
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
configure.ac | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 9ac6c95..d7fc518 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ AC_PATH_PROG([LUAROCKS], [luarocks], [:])
AX_PROG_LUA([5.1],[6.0])
dnl Check for libraries
-AX_LUA_LIBS
dnl Check for functions
AC_HEADER_STDC
--
2.20.1

4
buildroot/package/luasyslog/Config.in
View File

@@ -2,6 +2,6 @@ config BR2_PACKAGE_LUASYSLOG
bool "luasyslog"
select BR2_PACKAGE_LUALOGGING # runtime
help
Syslog logging for Lua.
syslog appender for LuaLogging.
https://luarocks.org/modules/luarocks/luasyslog
https://github.com/ntd/luasyslog

6
buildroot/package/luasyslog/luasyslog.hash
View File

@@ -1,3 +1,3 @@
# computed by luarocks/buildroot
sha256 e807a614b77108ca25aeed061faf73b7ef00708f5bfebb9e4f03d27f3d453e7b luasyslog-1.0.0-2.src.rock
sha256 c1ed5cbf3fc02836d3fc5d2354818a5c151c1cd75fcc0bf240dbf8d2b36a3c1d luasyslog-1.0.0/COPYING
# Locally computed
sha256 7f7dad64117407f2484ff5b53e90804f923a99fcbde5872e54f6aba53f482da0 luasyslog-2.2.0.tar.gz
sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING

11
buildroot/package/luasyslog/luasyslog.mk
View File

@@ -4,8 +4,13 @@
#
################################################################################
LUASYSLOG_VERSION = 1.0.0-2
LUASYSLOG_VERSION = 2.2.0
LUASYSLOG_SITE = $(call github,ntd,luasyslog,$(LUASYSLOG_VERSION))
LUASYSLOG_DEPENDENCIES = host-luarocks luainterpreter
LUASYSLOG_LICENSE = MIT
LUASYSLOG_LICENSE_FILES = $(LUASYSLOG_SUBDIR)/COPYING
LUASYSLOG_LICENSE_FILES = COPYING
# fetching from github
# 0001-remove-AX_LUA_LIBS.patch touches configure.ac
LUASYSLOG_AUTORECONF = YES
$(eval $(luarocks-package))
$(eval $(autotools-package))