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

Buildroot 2018-11 (#258)

Browse Source 
* Update to buildroot 2018.11

* containerd update

* runc update

* runc docker engine

* runc docker proxy

* update rpi firmware

* update network manager

* update dhcpd

* update wait on network

* update rpi wifi

* revert glibc
This commit is contained in:
Pascal Vizeli
2018-11-26 11:04:01 +01:00
committed by GitHub
parent a9bbc7babe
commit 4411307353
3154 changed files with 41316 additions and 24203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
buildroot/package/luarocks/0001-allow-libluajit-detection.patch Normal file
View File

@@ -0,0 +1,34 @@
From 961269271134e711bcfffebb0f179ffddcbf3d5a Mon Sep 17 00:00:00 2001
From: Francois Perrad <francois.perrad@gadz.org>
Date: Sun, 29 Jul 2018 11:17:34 +0200
Subject: [PATCH] allow libluajit detection
This detection was done only if luarocks is runned by luajit.
But on Buildroot, luarocks is always runned by lua.
See https://github.com/luarocks/luarocks/pull/883
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
src/luarocks/deps.lua | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 8403f12..c1c0220 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -513,10 +513,8 @@ function deps.check_lua(vars)
"lua-" .. cfg.lua_version,
"lua-" .. shortv,
"lua",
+ "luajit-" .. cfg.lua_version,
}
- if cfg.luajit_version then
- table.insert(libnames, 1, "luajit-" .. cfg.lua_version)
- end
for _, libname in ipairs(libnames) do
local ok = check_external_dependency("LUA", { library = libname }, vars, "build")
if ok then
--
2.17.1

3
buildroot/package/luarocks/luarocks.hash
View File

@@ -1,2 +1,3 @@
# Locally calculated
sha256 3938df33de33752ff2c526e604410af3dceb4b7ff06a770bc4a240de80a1f934 luarocks-2.4.4.tar.gz
sha256 1236a307ca5c556c4fed9fdbd35a7e0e80ccf063024becc8c3bf212f37ff0edf luarocks-3.0.4.tar.gz
sha256 542ad0ee9b8ba582437ca7b4d0959c9b9432f25d2067f144d017188a7a84dd2f COPYING

35
buildroot/package/luarocks/luarocks.mk
View File

@@ -4,15 +4,15 @@
#
################################################################################
LUAROCKS_VERSION = 2.4.4
LUAROCKS_VERSION = 3.0.4
LUAROCKS_SITE = http://luarocks.org/releases
LUAROCKS_LICENSE = MIT
LUAROCKS_LICENSE_FILES = COPYING
HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter
LUAROCKS_CONFIG_DIR = $(HOST_DIR)/etc/luarocks
LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua
LUAROCKS_CONFIG_DIR = $(HOST_DIR)/etc
LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/config-$(LUAINTERPRETER_ABIVER).lua
LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC
ifeq ($(BR2_PACKAGE_LUA_5_3),y)
LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2
@@ -29,22 +29,19 @@ endef
define HOST_LUAROCKS_INSTALL_CMDS
rm -f $(LUAROCKS_CONFIG_FILE)
$(MAKE1) -C $(@D) install \
PREFIX=$(HOST_DIR)
echo "-- BR cross-compilation" >> $(LUAROCKS_CONFIG_FILE)
echo "variables = {" >> $(LUAROCKS_CONFIG_FILE)
echo " LUA_INCDIR = [[$(STAGING_DIR)/usr/include]]," >> $(LUAROCKS_CONFIG_FILE)
echo " LUA_LIBDIR = [[$(STAGING_DIR)/usr/lib]]," >> $(LUAROCKS_CONFIG_FILE)
echo " CC = [[$(TARGET_CC)]]," >> $(LUAROCKS_CONFIG_FILE)
echo " LD = [[$(TARGET_CC)]]," >> $(LUAROCKS_CONFIG_FILE)
echo " CFLAGS = [[$(LUAROCKS_CFLAGS)]]," >> $(LUAROCKS_CONFIG_FILE)
echo " LIBFLAG = [[-shared $(TARGET_LDFLAGS)]]," >> $(LUAROCKS_CONFIG_FILE)
echo "}" >> $(LUAROCKS_CONFIG_FILE)
echo "external_deps_dirs = { [[$(STAGING_DIR)/usr]] }" >> $(LUAROCKS_CONFIG_FILE)
echo "gcc_rpath = false" >> $(LUAROCKS_CONFIG_FILE)
echo "rocks_trees = { [[$(TARGET_DIR)/usr]] }" >> $(LUAROCKS_CONFIG_FILE)
echo "wrap_bin_scripts = false" >> $(LUAROCKS_CONFIG_FILE)
echo "deps_mode = [[none]]" >> $(LUAROCKS_CONFIG_FILE)
$(MAKE1) -C $(@D) install
echo "-- BR cross-compilation" >> $(LUAROCKS_CONFIG_FILE)
echo "variables.LUA_INCDIR = [[$(STAGING_DIR)/usr/include]]" >> $(LUAROCKS_CONFIG_FILE)
echo "variables.LUA_LIBDIR = [[$(STAGING_DIR)/usr/lib]]" >> $(LUAROCKS_CONFIG_FILE)
echo "variables.CC = [[$(TARGET_CC)]]" >> $(LUAROCKS_CONFIG_FILE)
echo "variables.LD = [[$(TARGET_CC)]]" >> $(LUAROCKS_CONFIG_FILE)
echo "variables.CFLAGS = [[$(LUAROCKS_CFLAGS)]]" >> $(LUAROCKS_CONFIG_FILE)
echo "variables.LIBFLAG = [[-shared $(TARGET_LDFLAGS)]]" >> $(LUAROCKS_CONFIG_FILE)
echo "external_deps_dirs = { [[$(STAGING_DIR)/usr]] }" >> $(LUAROCKS_CONFIG_FILE)
echo "gcc_rpath = false" >> $(LUAROCKS_CONFIG_FILE)
echo "rocks_trees = { [[$(TARGET_DIR)/usr]] }" >> $(LUAROCKS_CONFIG_FILE)
echo "wrap_bin_scripts = false" >> $(LUAROCKS_CONFIG_FILE)
echo "deps_mode = [[none]]" >> $(LUAROCKS_CONFIG_FILE)
endef
$(eval $(host-generic-package))