Bump buildroot to 2020.11-rc1 (#985)
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
This commit is contained in:
Stefan Agner
17
buildroot/package/lua/5.4.1/0001-root-path.patch
Normal file
17
buildroot/package/lua/5.4.1/0001-root-path.patch
Normal file
@@ -0,0 +1,17 @@
|
||||
Adjust installation location to /usr.
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
|
||||
Index: b/src/luaconf.h
|
||||
===================================================================
|
||||
--- a/src/luaconf.h
|
||||
+++ b/src/luaconf.h
|
||||
@@ -227,7 +227,7 @@
|
||||
|
||||
#else /* }{ */
|
||||
|
||||
-#define LUA_ROOT "/usr/local/"
|
||||
+#define LUA_ROOT "/usr/"
|
||||
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
|
||||
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
|
||||
|
||||
78
buildroot/package/lua/5.4.1/0002-shared-libs-for-lua.patch
Normal file
78
buildroot/package/lua/5.4.1/0002-shared-libs-for-lua.patch
Normal file
@@ -0,0 +1,78 @@
|
||||
Add the compilation of a shared library.
|
||||
Compile the lua binary with the shared library.
|
||||
And install the shared library.
|
||||
The variable BUILDMODE allows to switch between static and dynamic mode.
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
|
||||
Index: b/Makefile
|
||||
===================================================================
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -42,6 +42,7 @@
|
||||
TO_BIN= lua luac
|
||||
TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
|
||||
TO_LIB= liblua.a
|
||||
+TO_SOLIB = liblua.so.$(R)
|
||||
TO_MAN= lua.1 luac.1
|
||||
|
||||
# Lua version and release.
|
||||
@@ -57,6 +58,8 @@
|
||||
install: dummy
|
||||
cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
|
||||
cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
|
||||
+ test -f src/$(TO_SOLIB) && cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB) || :
|
||||
+ test -f src/$(TO_SOLIB) && ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so || :
|
||||
cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
|
||||
cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
|
||||
cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
|
||||
Index: b/src/Makefile
|
||||
===================================================================
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -33,6 +33,7 @@
|
||||
PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
|
||||
|
||||
LUA_A= liblua.a
|
||||
+LUA_SO= liblua.so
|
||||
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
|
||||
LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
|
||||
BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
|
||||
@@ -44,8 +45,13 @@
|
||||
LUAC_O= luac.o
|
||||
|
||||
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
|
||||
+ifneq (dynamic,$(BUILDMODE))
|
||||
ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
|
||||
+else
|
||||
+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
|
||||
+endif
|
||||
ALL_A= $(LUA_A)
|
||||
+ALL_SO= $(LUA_SO)
|
||||
|
||||
# Targets start here.
|
||||
default: $(PLAT)
|
||||
@@ -56,12 +62,23 @@
|
||||
|
||||
a: $(ALL_A)
|
||||
|
||||
+so: $(ALL_SO)
|
||||
+
|
||||
$(LUA_A): $(BASE_O)
|
||||
$(AR) $@ $(BASE_O)
|
||||
$(RANLIB) $@
|
||||
|
||||
+$(LUA_SO): $(CORE_O) $(LIB_O)
|
||||
+ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $?
|
||||
+ ln -fs $@.$(PKG_VERSION) $@
|
||||
+
|
||||
+ifneq (dynamic,$(BUILDMODE))
|
||||
$(LUA_T): $(LUA_O) $(LUA_A)
|
||||
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
||||
+else
|
||||
+$(LUA_T): $(LUA_O) $(LUA_SO)
|
||||
+ $(CC) -o $@ -L. $(LDFLAGS) $(LUA_O) -llua $(LIBS)
|
||||
+endif
|
||||
|
||||
$(LUAC_T): $(LUAC_O) $(LUA_A)
|
||||
$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
|
||||
25
buildroot/package/lua/5.4.1/0011-linenoise.patch
Normal file
25
buildroot/package/lua/5.4.1/0011-linenoise.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
Add support of linenoise (replace readline)
|
||||
|
||||
see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
|
||||
Index: b/src/lua.c
|
||||
===================================================================
|
||||
--- a/src/lua.c
|
||||
+++ b/src/lua.c
|
||||
@@ -401,6 +401,14 @@
|
||||
#define lua_saveline(L,line) ((void)L, add_history(line))
|
||||
#define lua_freeline(L,b) ((void)L, free(b))
|
||||
|
||||
+#elif defined(LUA_USE_LINENOISE)
|
||||
+
|
||||
+#include <linenoise.h>
|
||||
+#define lua_initreadline(L) ((void)L)
|
||||
+#define lua_readline(L,b,p) ((void)L, ((b)=linenoise(p)) != NULL)
|
||||
+#define lua_saveline(L,line) ((void)L, linenoiseHistoryAdd(line))
|
||||
+#define lua_freeline(L,b) ((void)L, free(b))
|
||||
+
|
||||
#else /* }{ */
|
||||
|
||||
#define lua_initreadline(L) ((void)L)
|
||||
6
buildroot/package/lua/5.4.1/lua.hash
Normal file
6
buildroot/package/lua/5.4.1/lua.hash
Normal file
@@ -0,0 +1,6 @@
|
||||
# Hashes from: http://www.lua.org/ftp/
|
||||
md5 1d575faef1c907292edd79e7a2784d30 lua-5.4.1.tar.gz
|
||||
sha1 88961e7d4fda58ca2c6163938fd48db8880e803d lua-5.4.1.tar.gz
|
||||
|
||||
# Locally computed
|
||||
sha256 c202c5ff3b0c7a0ff2b215fff534c4b4018554843d23ac6eca3d97533b3ad97f doc/readme.html
|
||||
@@ -20,17 +20,19 @@ choice
|
||||
|
||||
config BR2_PACKAGE_LUA_5_1
|
||||
bool "Lua 5.1.x"
|
||||
select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
|
||||
|
||||
config BR2_PACKAGE_LUA_5_3
|
||||
bool "Lua 5.3.x"
|
||||
select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_3
|
||||
|
||||
config BR2_PACKAGE_LUA_5_4
|
||||
bool "Lua 5.4.x"
|
||||
select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_4
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
|
||||
default "5.1" if BR2_PACKAGE_LUA_5_1
|
||||
default "5.3" if BR2_PACKAGE_LUA_5_3
|
||||
|
||||
if BR2_PACKAGE_LUA_5_3
|
||||
if BR2_PACKAGE_LUA_5_3 || BR2_PACKAGE_LUA_5_4
|
||||
config BR2_PACKAGE_LUA_32BITS
|
||||
bool "Use 32 bit numbers"
|
||||
default y if !BR2_ARCH_IS_64
|
||||
|
||||
@@ -4,7 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_3),y)
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_4),y)
|
||||
LUA_VERSION = 5.4.1
|
||||
else ifeq ($(BR2_PACKAGE_LUA_5_3),y)
|
||||
LUA_VERSION = 5.3.6
|
||||
else
|
||||
LUA_VERSION = 5.1.5
|
||||
@@ -12,7 +14,7 @@ endif
|
||||
LUA_SITE = http://www.lua.org/ftp
|
||||
LUA_INSTALL_STAGING = YES
|
||||
LUA_LICENSE = MIT
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_3),y)
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y)
|
||||
LUA_LICENSE_FILES = doc/readme.html
|
||||
else
|
||||
LUA_LICENSE_FILES = COPYRIGHT
|
||||
@@ -22,7 +24,9 @@ LUA_PROVIDES = luainterpreter
|
||||
|
||||
LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_3),y)
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_4),y)
|
||||
LUA_CFLAGS += -DLUA_COMPAT_5_3
|
||||
else ifeq ($(BR2_PACKAGE_LUA_5_3),y)
|
||||
LUA_CFLAGS += -DLUA_COMPAT_5_2
|
||||
endif
|
||||
|
||||
@@ -54,7 +58,15 @@ endef
|
||||
LUA_POST_PATCH_HOOKS += LUA_32BITS_LUACONF
|
||||
endif
|
||||
|
||||
define HOST_LUA_LUACONF
|
||||
$(SED) 's|#define LUA_ROOT.*|#define LUA_ROOT "$(HOST_DIR)/usr/"|' $(@D)/src/luaconf.h
|
||||
endef
|
||||
HOST_LUA_POST_PATCH_HOOKS += HOST_LUA_LUACONF
|
||||
|
||||
HOST_LUA_CFLAGS = -Wall -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_3),y)
|
||||
HOST_LUA_CFLAGS += -DLUA_COMPAT_5_2
|
||||
endif
|
||||
HOST_LUA_MYLIBS = -ldl
|
||||
|
||||
define LUA_BUILD_CMDS
|
||||
@@ -74,7 +86,7 @@ define HOST_LUA_BUILD_CMDS
|
||||
CFLAGS="$(HOST_LUA_CFLAGS)" \
|
||||
MYLDFLAGS="$(HOST_LDFLAGS)" \
|
||||
MYLIBS="$(HOST_LUA_MYLIBS)" \
|
||||
BUILDMODE=static \
|
||||
BUILDMODE=dynamic \
|
||||
PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
|
||||
sed -e "s/@VERSION@/$(LUA_VERSION)/;s/@ABI@/$(LUAINTERPRETER_ABIVER)/;s/@MYLIBS@/$(HOST_LUA_MYLIBS)/" \
|
||||
package/lua/lua.pc.in > $(@D)/lua.pc
|
||||
|
||||
Reference in New Issue
Block a user