svn commit: r348446 - in head/sys: amd64/linux amd64/linux32 arm64/linux compat/cloudabi32 compat/cloudabi64 compat/freebsd32 i386/linux kern

[Brooks Davis]

Author: brooks
Date: Thu May 30 20:56:23 2019
New Revision: 348446
URL: https://svnweb.freebsd.org/changeset/base/348446

Log:
  makesyscalls.sh: always use absolute path for syscalls.conf
  
  syscalls.conf is included using "." which per the Open Group:
  
   If file does not contain a <slash>, the shell shall use the search
   path specified by PATH to find the directory containing file.
  
  POSIX shells don't fall back to the current working directory.
  
  Submitted by:	Nathaniel Wesley Filardo <nwf20 at cl.cam.ac.uk>
  Reviewed by:	bdrewery
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D20476

Modified:
  head/sys/amd64/linux/Makefile
  head/sys/amd64/linux32/Makefile
  head/sys/arm64/linux/Makefile
  head/sys/compat/cloudabi32/Makefile
  head/sys/compat/cloudabi64/Makefile
  head/sys/compat/freebsd32/Makefile
  head/sys/i386/linux/Makefile
  head/sys/kern/makesyscalls.sh

Modified: head/sys/amd64/linux/Makefile
==============================================================================
--- head/sys/amd64/linux/Makefile	Thu May 30 20:42:36 2019	(r348445)
+++ head/sys/amd64/linux/Makefile	Thu May 30 20:56:23 2019	(r348446)
@@ -11,5 +11,5 @@ all:
 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 syscalls.conf
-	sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
+		../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
+	sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf

Modified: head/sys/amd64/linux32/Makefile
==============================================================================
--- head/sys/amd64/linux32/Makefile	Thu May 30 20:42:36 2019	(r348445)
+++ head/sys/amd64/linux32/Makefile	Thu May 30 20:56:23 2019	(r348446)
@@ -11,5 +11,5 @@ all:
 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 \
-		syscalls.master syscalls.conf
-	sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
+		syscalls.master ${.CURDIR}/syscalls.conf
+	sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf

Modified: head/sys/arm64/linux/Makefile
==============================================================================
--- head/sys/arm64/linux/Makefile	Thu May 30 20:42:36 2019	(r348445)
+++ head/sys/arm64/linux/Makefile	Thu May 30 20:56:23 2019	(r348446)
@@ -11,5 +11,5 @@ all:
 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 syscalls.conf
-	sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
+		../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
+	sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf

Modified: head/sys/compat/cloudabi32/Makefile
==============================================================================
--- head/sys/compat/cloudabi32/Makefile	Thu May 30 20:42:36 2019	(r348445)
+++ head/sys/compat/cloudabi32/Makefile	Thu May 30 20:56:23 2019	(r348446)
@@ -12,6 +12,6 @@ sysent: cloudabi32_sysent.c cloudabi32_syscall.h cloud
 cloudabi32_sysent.c cloudabi32_syscall.h cloudabi32_proto.h \
     cloudabi32_syscalls.c cloudabi32_systrace_args.c: \
     ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls32.master \
-    syscalls.conf
+    ${.CURDIR}/syscalls.conf
 	sh ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls32.master \
-	    syscalls.conf
+	    ${.CURDIR}/syscalls.conf

Modified: head/sys/compat/cloudabi64/Makefile
==============================================================================
--- head/sys/compat/cloudabi64/Makefile	Thu May 30 20:42:36 2019	(r348445)
+++ head/sys/compat/cloudabi64/Makefile	Thu May 30 20:56:23 2019	(r348446)
@@ -12,6 +12,6 @@ sysent: cloudabi64_sysent.c cloudabi64_syscall.h cloud
 cloudabi64_sysent.c cloudabi64_syscall.h cloudabi64_proto.h \
     cloudabi64_syscalls.c cloudabi64_systrace_args.c: \
     ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls64.master \
-    syscalls.conf
+    ${.CURDIR}/syscalls.conf
 	sh ../../kern/makesyscalls.sh ../../contrib/cloudabi/syscalls64.master \
-	    syscalls.conf
+	    ${.CURDIR}/syscalls.conf

Modified: head/sys/compat/freebsd32/Makefile
==============================================================================
--- head/sys/compat/freebsd32/Makefile	Thu May 30 20:42:36 2019	(r348445)
+++ head/sys/compat/freebsd32/Makefile	Thu May 30 20:56:23 2019	(r348446)
@@ -11,8 +11,8 @@ all:
 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 syscalls.conf ../../kern/capabilities.conf
-	sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
+	    ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf ../../kern/capabilities.conf
+	sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
 
 clean:
 	rm -f freebsd32_sysent.c freebsd32_syscalls.c freebsd32_syscall.h freebsd32_proto.h

Modified: head/sys/i386/linux/Makefile
==============================================================================
--- head/sys/i386/linux/Makefile	Thu May 30 20:42:36 2019	(r348445)
+++ head/sys/i386/linux/Makefile	Thu May 30 20:56:23 2019	(r348446)
@@ -11,5 +11,5 @@ all:
 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 syscalls.conf
-	sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
+		../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf
+	sh ../../kern/makesyscalls.sh syscalls.master ${.CURDIR}/syscalls.conf

Modified: head/sys/kern/makesyscalls.sh
==============================================================================
--- head/sys/kern/makesyscalls.sh	Thu May 30 20:42:36 2019	(r348445)
+++ head/sys/kern/makesyscalls.sh	Thu May 30 20:56:23 2019	(r348446)
@@ -58,7 +58,7 @@ case $# in
 esac
 
 if [ -n "$2" ]; then
-	. $2
+	. "$2"
 fi
 
 if [ -r $capabilities_conf ]; then