socsvn commit: r268960 - in soc2014/pedrosouza/lua_loader/head/sys/boot: amd64/efi arm/uboot common i386/loader ia64/ski lua mips/beri/loader pc98/loader powerpc/ofw powerpc/ps3 powerpc/uboot sparc...
pedrosouza at FreeBSD.org
pedrosouza at FreeBSD.org
Mon Jun 2 16:17:21 UTC 2014
Author: pedrosouza
Date: Mon Jun 2 16:17:17 2014
New Revision: 268960
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268960
Log:
Move sys/bot/lua to sys/lua
Added:
soc2014/pedrosouza/lua_loader/head/sys/boot/lua/Makefile
Replaced:
soc2014/pedrosouza/lua_loader/head/sys/boot/lua/
Modified:
soc2014/pedrosouza/lua_loader/head/sys/boot/amd64/efi/Makefile
soc2014/pedrosouza/lua_loader/head/sys/boot/arm/uboot/Makefile
soc2014/pedrosouza/lua_loader/head/sys/boot/common/interp_lua.c
soc2014/pedrosouza/lua_loader/head/sys/boot/i386/loader/Makefile
soc2014/pedrosouza/lua_loader/head/sys/boot/ia64/ski/Makefile
soc2014/pedrosouza/lua_loader/head/sys/boot/mips/beri/loader/Makefile
soc2014/pedrosouza/lua_loader/head/sys/boot/pc98/loader/Makefile
soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/ofw/Makefile
soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/ps3/Makefile
soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/uboot/Makefile
soc2014/pedrosouza/lua_loader/head/sys/boot/sparc64/loader/Makefile
Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/amd64/efi/Makefile
==============================================================================
--- soc2014/pedrosouza/lua_loader/head/sys/boot/amd64/efi/Makefile Mon Jun 2 15:05:25 2014 (r268959)
+++ soc2014/pedrosouza/lua_loader/head/sys/boot/amd64/efi/Makefile Mon Jun 2 16:17:17 2014 (r268960)
@@ -41,8 +41,9 @@
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
.endif
-CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src
-LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a
+#Lua
+CFLAGS+= -DBOOT_LUA -I${.CURDIR}../../../lua/src
+LIBLUA= ${.OBJDIR}/../../lua/liblua.a
# Include bcache code.
HAVE_BCACHE= yes
@@ -89,8 +90,8 @@
LIBEFI= ${.OBJDIR}/../../efi/libefi/libefi.a
CFLAGS+= -I${.CURDIR}/../../common
-DPADD= ${LIBFICL} ${LIBEFI} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBEFI} ${LIBSTAND}
+DPADD= ${LIBFICL} ${LIBEFI} ${LIBSTAND} ${LIBLUA}
+LDADD= ${LIBFICL} ${LIBEFI} ${LIBSTAND} ${LIBLUA}
.endif # ${COMPILER_TYPE} != "gcc"
Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/arm/uboot/Makefile
==============================================================================
--- soc2014/pedrosouza/lua_loader/head/sys/boot/arm/uboot/Makefile Mon Jun 2 15:05:25 2014 (r268959)
+++ soc2014/pedrosouza/lua_loader/head/sys/boot/arm/uboot/Makefile Mon Jun 2 16:17:17 2014 (r268960)
@@ -82,8 +82,9 @@
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
.endif
-CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src
-LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a
+#Lua
+CFLAGS+= -DBOOT_LUA -I${.CURDIR}../../../lua/src
+LIBLUA= ${.OBJDIR}/../../lua/liblua.a
# Always add MI sources
.PATH: ${.CURDIR}/../../common
@@ -115,8 +116,8 @@
# clang doesn't understand %D as a specifier to printf
NO_WERROR.clang=
-DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand
+DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND} ${LIBLUA}
+LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBLUA} -lstand
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/common/interp_lua.c
==============================================================================
--- soc2014/pedrosouza/lua_loader/head/sys/boot/common/interp_lua.c Mon Jun 2 15:05:25 2014 (r268959)
+++ soc2014/pedrosouza/lua_loader/head/sys/boot/common/interp_lua.c Mon Jun 2 16:17:17 2014 (r268960)
@@ -10,8 +10,8 @@
#define lua_c
-#include "../lua/src/lua.h"
-#include "../lua/src/ldebug.h"
+#include "../../lua/src/lua.h"
+#include "../../lua/src/ldebug.h"
struct interp_lua_softc {
lua_State *luap;
@@ -90,7 +90,7 @@
data_chunk ds;
ds.data = (void*)str;
ds.size = size;
- res = lua_load(L, read_chunk, &ds, "do_string", 0);
+ res = lua_load(L, read_chunk, &ds, "do_string___", 0);
res = lua_pcall(L, 0, LUA_MULTRET, 0);
return res;
}
Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/i386/loader/Makefile
==============================================================================
--- soc2014/pedrosouza/lua_loader/head/sys/boot/i386/loader/Makefile Mon Jun 2 15:05:25 2014 (r268959)
+++ soc2014/pedrosouza/lua_loader/head/sys/boot/i386/loader/Makefile Mon Jun 2 16:17:17 2014 (r268960)
@@ -49,8 +49,8 @@
.endif
#Lua
-CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src
-LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a
+CFLAGS+= -DBOOT_LUA -I${.CURDIR}../../../lua/src
+LIBLUA= ${.OBJDIR}/../../lua/liblua.a
.if defined(LOADER_BZIP2_SUPPORT)
CFLAGS+= -DLOADER_BZIP2_SUPPORT
Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/ia64/ski/Makefile
==============================================================================
--- soc2014/pedrosouza/lua_loader/head/sys/boot/ia64/ski/Makefile Mon Jun 2 15:05:25 2014 (r268959)
+++ soc2014/pedrosouza/lua_loader/head/sys/boot/ia64/ski/Makefile Mon Jun 2 16:17:17 2014 (r268960)
@@ -32,8 +32,12 @@
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
.endif
-DPADD= ${LIBIA64} ${LIBFICL} ${LIBSTAND}
+#Lua
+CFLAGS+= -DBOOT_LUA -I${.CURDIR}../../../lua/src
+LIBLUA= ${.OBJDIR}/../../lua/liblua.a
+
+DPADD= ${LIBIA64} ${LIBFICL} ${LIBSTAND} ${LIBLUA}
LDADD= -Wl,--whole-archive ${LIBIA64} -Wl,--no-whole-archive \
- ${LIBFICL} -lstand
+ ${LIBFICL} -lstand ${LIBLUA}
.include <bsd.prog.mk>
Added: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/Makefile Mon Jun 2 16:17:17 2014 (r268960)
@@ -0,0 +1,15 @@
+.include "../Makefile.inc"
+
+LUA_PATH= ../../lua
+
+.PATH: ${LUA_PATH}/src
+
+SRCS= lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c ltm.c lundump.c lvm.c lzio.c lstd.c
+
+CFLAGS+= -I.
+CFLAGS+= -DBOOT_LUA -ffreestanding -nostdlib -fno-stack-protector
+
+
+LIB= lua
+INTERNALLIB=
+.include <bsd.lib.mk>
Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/mips/beri/loader/Makefile
==============================================================================
--- soc2014/pedrosouza/lua_loader/head/sys/boot/mips/beri/loader/Makefile Mon Jun 2 15:05:25 2014 (r268959)
+++ soc2014/pedrosouza/lua_loader/head/sys/boot/mips/beri/loader/Makefile Mon Jun 2 16:17:17 2014 (r268960)
@@ -75,8 +75,9 @@
LIBFICL= ${.OBJDIR}/../../../ficl/libficl.a
.endif
-CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src
-LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a
+#Lua
+CFLAGS+= -DBOOT_LUA -I${.CURDIR}../../../lua/src
+LIBLUA= ${.OBJDIR}/../../lua/liblua.a
# Common code across BERI boot loader parts
.PATH: ${.CURDIR}/../common
@@ -113,8 +114,8 @@
CFLAGS+= -I${.CURDIR}/../../../../../lib/libstand/
LIBSTAND= ${.OBJDIR}/../../../../../lib/libstand/libstand.a
-DPADD= ${LIBFICL} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBSTAND}
+DPADD= ${LIBFICL} ${LIBSTAND} ${LIBLUA}
+LDADD= ${LIBFICL} ${LIBSTAND} ${LIBLUA}
vers.c: ${.CURDIR}/../../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../../common/newvers.sh ${.CURDIR}/version \
Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/pc98/loader/Makefile
==============================================================================
--- soc2014/pedrosouza/lua_loader/head/sys/boot/pc98/loader/Makefile Mon Jun 2 15:05:25 2014 (r268959)
+++ soc2014/pedrosouza/lua_loader/head/sys/boot/pc98/loader/Makefile Mon Jun 2 16:17:17 2014 (r268960)
@@ -33,8 +33,9 @@
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
.endif
-CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src
-LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a
+#Lua
+CFLAGS+= -DBOOT_LUA -I${.CURDIR}../../../lua/src
+LIBLUA= ${.OBJDIR}/../../lua/liblua.a
.if defined(LOADER_BZIP2_SUPPORT)
CFLAGS+= -DLOADER_BZIP2_SUPPORT
@@ -104,7 +105,7 @@
# XXX crt0.o needs to be first for pxeboot(8) to work
OBJS= ${BTXCRT}
-DPADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND}
+DPADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND} ${LIBLUA}
+LDADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND} ${LIBLUA}
.include <bsd.prog.mk>
Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/ofw/Makefile
==============================================================================
--- soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/ofw/Makefile Mon Jun 2 15:05:25 2014 (r268959)
+++ soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/ofw/Makefile Mon Jun 2 16:17:17 2014 (r268960)
@@ -57,6 +57,10 @@
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
.endif
+#Lua
+CFLAGS+= -DBOOT_LUA -I${.CURDIR}../../../lua/src
+LIBLUA= ${.OBJDIR}/../../lua/liblua.a
+
# Avoid the open-close-dance for every file access as some firmwares perform
# an auto-negotiation on every open of the network interface and thus causes
# netbooting to take horribly long.
@@ -92,8 +96,8 @@
LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
+DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND} ${LIBLUA}
+LDADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND} ${LIBLUA}
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/ps3/Makefile
==============================================================================
--- soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/ps3/Makefile Mon Jun 2 15:05:25 2014 (r268959)
+++ soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/ps3/Makefile Mon Jun 2 16:17:17 2014 (r268960)
@@ -67,6 +67,10 @@
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
.endif
+#Lua
+CFLAGS+= -DBOOT_LUA -I${.CURDIR}../../../lua/src
+LIBLUA= ${.OBJDIR}/../../lua/liblua.a
+
# Avoid the open-close-dance for every file access as some firmwares perform
# an auto-negotiation on every open of the network interface and thus causes
# netbooting to take horribly long.
@@ -98,8 +102,8 @@
LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
+DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND} ${LIBLUA}
+LDADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND} ${LIBLUA}
SC_DFLT_FONT=cp437
Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/uboot/Makefile
==============================================================================
--- soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/uboot/Makefile Mon Jun 2 15:05:25 2014 (r268959)
+++ soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/uboot/Makefile Mon Jun 2 16:17:17 2014 (r268960)
@@ -72,8 +72,9 @@
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
.endif
-CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src
-LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a
+#Lua
+CFLAGS+= -DBOOT_LUA -I${.CURDIR}../../../lua/src
+LIBLUA= ${.OBJDIR}/../../lua/liblua.a
# Always add MI sources
.PATH: ${.CURDIR}/../../common ${.CURDIR}/../../../libkern
@@ -101,8 +102,8 @@
LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
+DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND} ${LIBLUA}
+LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND} ${LIBLUA}
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/sparc64/loader/Makefile
==============================================================================
--- soc2014/pedrosouza/lua_loader/head/sys/boot/sparc64/loader/Makefile Mon Jun 2 15:05:25 2014 (r268959)
+++ soc2014/pedrosouza/lua_loader/head/sys/boot/sparc64/loader/Makefile Mon Jun 2 16:17:17 2014 (r268960)
@@ -63,8 +63,9 @@
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
.endif
-CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src
-LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a
+#Lua
+CFLAGS+= -DBOOT_LUA -I${.CURDIR}../../../lua/src
+LIBLUA= ${.OBJDIR}/../../lua/liblua.a
# Always add MI sources
.PATH: ${.CURDIR}/../../common
@@ -87,8 +88,8 @@
# where to get libstand from
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-DPADD= ${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} -lstand
+DPADD= ${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} ${LIBSTAND} ${LIBLUA}
+LDADD= ${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} -lstand ${LIBLUA}
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/../loader/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/../loader/version \
More information about the svn-soc-all
mailing list