Page MenuHomeFreeBSD
Files F153766807

D21894.id64296.diff
No OneTemporary
Actions

D21894.id64296.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -1499,6 +1499,11 @@
${_+_}cd ${.CURDIR}/tools/build/options; sh makeman > \
${.CURDIR}/share/man/man5/src.conf.5
+.if make(sysent)
+.include <src.lua.mk>
+.endif
+
+_sysent_PATH= ${WORLDTMP}/legacy/usr/libexec:/usr/libexec:${PATH}
_sysent_dirs= sys/kern
_sysent_dirs+= sys/compat/freebsd32
_sysent_dirs+= sys/compat/cloudabi32 \
@@ -1509,7 +1514,9 @@
sys/i386/linux
sysent: .PHONY
.for _dir in ${_sysent_dirs}
- ${_+_}${MAKE} -C ${.CURDIR}/${_dir} sysent
+ @echo "${MAKE} -C ${.CURDIR}/${_dir} sysent"
+ ${_+_}@env PATH=${_sysent_PATH} LUA=${LUA_CMD} \
+ ${MAKE} -C ${.CURDIR}/${_dir} sysent
.endfor
#
@@ -2168,6 +2175,13 @@
${_bt}-lib/libdwarf: ${_bt_m4_depend}
.endif
+# flua is required to regenerate syscall files. It first appeared during the
+# 13.0-CURRENT cycle, thus needs to be built on -older releases and stable
+# branches.
+.if ${BOOTSTRAPPING} < 1300048
+_flua= libexec/flua
+.endif
+
# r245440 mtree -N support added
# r313404 requires sha384.h for libnetbsd, added to libmd in r292782
.if ${BOOTSTRAPPING} < 1100093
@@ -2390,6 +2404,7 @@
usr.bin/xinstall \
${_gensnmptree} \
usr.sbin/config \
+ ${_flua} \
${_crunchide} \
${_crunchgen} \
${_nmtree} \
Index: sys/amd64/linux/Makefile
===================================================================
--- sys/amd64/linux/Makefile
+++ sys/amd64/linux/Makefile
@@ -5,11 +5,13 @@
# Don't use an OBJDIR
.OBJDIR: ${.CURDIR}
+.include <src.lua.mk>
+
all:
@echo "make sysent only"
sysent: linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c
linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c: \
- ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
- sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
+ ../../tools/makesyscalls.lua syscalls.master ${.CURDIR}/syscalls.conf
+ ${LUA} ../../tools/makesyscalls.lua syscalls.master ${.CURDIR}/syscalls.conf
Index: sys/amd64/linux32/Makefile
===================================================================
--- sys/amd64/linux32/Makefile
+++ sys/amd64/linux32/Makefile
@@ -5,11 +5,13 @@
# Don't use an OBJDIR
.OBJDIR: ${.CURDIR}
+.include <src.lua.mk>
+
all:
@echo "make sysent only"
sysent: linux32_sysent.c linux32_syscall.h linux32_proto.h linux32_syscalls.c linux32_systrace_args.c
-linux32_sysent.c linux32_syscall.h linux32_proto.h linux32_syscalls.c linux32_systrace_args.c: ../../kern/makesyscalls.sh \
+linux32_sysent.c linux32_syscall.h linux32_proto.h linux32_syscalls.c linux32_systrace_args.c: ../../tools/makesyscalls.lua \
syscalls.master ${.CURDIR}/syscalls.conf
- sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
+ ${LUA} ../../tools/makesyscalls.lua syscalls.master ${.CURDIR}/syscalls.conf
Index: sys/arm64/linux/Makefile
===================================================================
--- sys/arm64/linux/Makefile
+++ sys/arm64/linux/Makefile
@@ -5,11 +5,13 @@
# Don't use an OBJDIR
.OBJDIR: ${.CURDIR}
+.include <src.lua.mk>
+
all:
@echo "make sysent only"
sysent: linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c
linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c: \
- ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
- sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
+ ../../tools/makesyscalls.lua syscalls.master ${.CURDIR}/syscalls.conf
+ ${LUA} ../../tools/makesyscalls.lua syscalls.master ${.CURDIR}/syscalls.conf
Index: sys/compat/cloudabi32/Makefile
===================================================================
--- sys/compat/cloudabi32/Makefile
+++ sys/compat/cloudabi32/Makefile
@@ -3,6 +3,8 @@
# Don't use an OBJDIR
.OBJDIR: ${.CURDIR}
+.include <src.lua.mk>
+
all:
@echo "make sysent only"
@@ -11,7 +13,7 @@
cloudabi32_sysent.c cloudabi32_syscall.h cloudabi32_proto.h \
cloudabi32_syscalls.c cloudabi32_systrace_args.c: \
- ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls32.master \
+ ../../tools/makesyscalls.lua ../../contrib/cloudabi/syscalls32.master \
${.CURDIR}/syscalls.conf
- sh ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls32.master \
- ${.CURDIR}/syscalls.conf
+ ${LUA} ../../tools/makesyscalls.lua \
+ ../../contrib/cloudabi/syscalls32.master ${.CURDIR}/syscalls.conf
Index: sys/compat/cloudabi64/Makefile
===================================================================
--- sys/compat/cloudabi64/Makefile
+++ sys/compat/cloudabi64/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <src.lua.mk>
+
# Don't use an OBJDIR
.OBJDIR: ${.CURDIR}
@@ -11,7 +13,7 @@
cloudabi64_sysent.c cloudabi64_syscall.h cloudabi64_proto.h \
cloudabi64_syscalls.c cloudabi64_systrace_args.c: \
- ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls64.master \
+ ../../tools/makesyscalls.lua ../../contrib/cloudabi/syscalls64.master \
${.CURDIR}/syscalls.conf
- sh ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls64.master \
- ${.CURDIR}/syscalls.conf
+ ${LUA} ../../tools/makesyscalls.lua \
+ ../../contrib/cloudabi/syscalls64.master ${.CURDIR}/syscalls.conf
Index: sys/compat/freebsd32/Makefile
===================================================================
--- sys/compat/freebsd32/Makefile
+++ sys/compat/freebsd32/Makefile
@@ -5,14 +5,16 @@
# Don't use an OBJDIR
.OBJDIR: ${.CURDIR}
+.include <src.lua.mk>
+
all:
@echo "make sysent only"
sysent: freebsd32_sysent.c freebsd32_syscall.h freebsd32_proto.h freebsd32_systrace_args.c
freebsd32_sysent.c freebsd32_syscalls.c freebsd32_syscall.h freebsd32_proto.h freebsd32_systrace_args.c : \
- ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf ../../kern/capabilities.conf
- sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
+ ../../tools/makesyscalls.lua syscalls.master ${.CURDIR}/syscalls.conf ../../kern/capabilities.conf
+ ${LUA} ../../tools/makesyscalls.lua syscalls.master ${.CURDIR}/syscalls.conf
clean:
rm -f freebsd32_sysent.c freebsd32_syscalls.c freebsd32_syscall.h freebsd32_proto.h
Index: sys/i386/linux/Makefile
===================================================================
--- sys/i386/linux/Makefile
+++ sys/i386/linux/Makefile
@@ -5,11 +5,13 @@
# Don't use an OBJDIR
.OBJDIR: ${.CURDIR}
+.include <src.lua.mk>
+
all:
@echo "make sysent only"
sysent: linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c
linux_sysent.c linux_syscall.h linux_proto.h linux_syscalls.c linux_systrace_args.c: \
- ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
- sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
+ ../../tools/makesyscalls.lua syscalls.master ${.CURDIR}/syscalls.conf
+ ${LUA} ../../tools/makesyscalls.lua syscalls.master ${.CURDIR}/syscalls.conf
Index: sys/kern/Makefile
===================================================================
--- sys/kern/Makefile
+++ sys/kern/Makefile
@@ -6,6 +6,8 @@
# Don't use an OBJDIR
.OBJDIR: ${.CURDIR}
+.include <src.lua.mk>
+
all:
@echo "make sysent only"
@@ -13,6 +15,6 @@
../sys/sysproto.h
init_sysent.c syscalls.c systrace_args.c ../sys/syscall.h \
-../sys/syscall.mk ../sys/sysproto.h: makesyscalls.sh syscalls.master \
+../sys/syscall.mk ../sys/sysproto.h: ../tools/makesyscalls.lua syscalls.master \
capabilities.conf
- sh makesyscalls.sh syscalls.master
+ ${LUA} ../tools/makesyscalls.lua syscalls.master
Index: tools/build/Makefile
===================================================================
--- tools/build/Makefile
+++ tools/build/Makefile
@@ -127,6 +127,7 @@
usr/include/casper \
usr/include/private/zstd \
usr/lib \
+ usr/libexec
installdirs:
mkdir -p ${INSTALLDIR_LIST:S,^,${DESTDIR}/,}

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 24, 1:44 PM (15 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32078778
Default Alt Text
D21894.id64296.diff (7 KB)

Event Timeline