Mercurial > unleashed > wips

changeset 20711:111ccb776e79 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reporoot-to-srctop
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Fri, 12 Jan 2018 18:49:53 -0500
parents 0dfe55bd6964
children 47811baf5bcf
files kernel/mk/dboot-build.mk kernel/mk/dboot-defines.mk kernel/mk/dboot.mk kernel/mk/defines.mk kernel/mk/genunix-build-subsys.mk kernel/mk/genunix-build.mk kernel/mk/genunix-defines.mk kernel/mk/genunix-subsys.mk kernel/mk/genunix.mk kernel/mk/program-defines.mk kernel/mk/unix-defines.mk
diffstat 11 files changed, 66 insertions(+), 66 deletions(-) [+]
line wrap: on
line diff
--- a/kernel/mk/dboot-build.mk	Tue Jun 27 22:55:11 2017 +0300
+++ b/kernel/mk/dboot-build.mk	Fri Jan 12 18:49:53 2018 -0500
@@ -8,19 +8,19 @@
 # a 64-bit unix.o.  We accomplish this by messing with KERNEL_AFLAGS on some
 # targets.
 
-.if empty(REPOROOT)
-.error "You must define REPOROOT to point to the top-level of the repository"
+.if empty(SRCTOP)
+.error "You must define SRCTOP to point to the top-level of the repository"
 .endif
 
-.include <${REPOROOT}/Makefile.cfgparam>
+.include <${SRCTOP}/Makefile.cfgparam>
 
 # prevent dboot.mk inclusion in user's Makefile from setting up confusing targets
 _DBOOT_BUILD=yes
 .include <${.CURDIR}/Makefile>
 
-.include <${REPOROOT}/kernel/mk/defines.mk>
-.include <${REPOROOT}/kernel/mk/program-defines.mk>
-.include <${REPOROOT}/kernel/mk/dboot-defines.mk>
+.include <${SRCTOP}/kernel/mk/defines.mk>
+.include <${SRCTOP}/kernel/mk/program-defines.mk>
+.include <${SRCTOP}/kernel/mk/dboot-defines.mk>
 
 SRCS = $(DBOOT_SRCS)
 
--- a/kernel/mk/dboot-defines.mk	Tue Jun 27 22:55:11 2017 +0300
+++ b/kernel/mk/dboot-defines.mk	Fri Jan 12 18:49:53 2018 -0500
@@ -34,10 +34,10 @@
 	-D_I32LPx
 
 KERNEL_INCLUDES += \
-	-I$(REPOROOT)/usr/src/common \
-	-I$(REPOROOT)/usr/src/common/util
+	-I$(SRCTOP)/usr/src/common \
+	-I$(SRCTOP)/usr/src/common/util
 
 KERNEL_INCLUDES_i386 += \
-	-I$(REPOROOT)/arch/x86/kernel/platform/i86pc/include \
-	-I$(REPOROOT)/arch/x86/kernel/platform/i86xpv/include \
-	-I$(REPOROOT)/usr/src/uts/common/xen
+	-I$(SRCTOP)/arch/x86/kernel/platform/i86pc/include \
+	-I$(SRCTOP)/arch/x86/kernel/platform/i86xpv/include \
+	-I$(SRCTOP)/usr/src/uts/common/xen
--- a/kernel/mk/dboot.mk	Tue Jun 27 22:55:11 2017 +0300
+++ b/kernel/mk/dboot.mk	Fri Jan 12 18:49:53 2018 -0500
@@ -1,10 +1,10 @@
 .if empty(_DBOOT_BUILD)
 
-.if empty(REPOROOT)
-.error "You must define REPOROOT to point to the top-level of the repository"
+.if empty(SRCTOP)
+.error "You must define SRCTOP to point to the top-level of the repository"
 .endif
 
-.include <${REPOROOT}/Makefile.cfgparam>
+.include <${SRCTOP}/Makefile.cfgparam>
 .include <bsd.subdir.mk>
 
 BUILD=
@@ -19,13 +19,13 @@
 
 dboot-32:
 	@mkdir -p obj32
-	@${MAKE} -f ${REPOROOT}/kernel/mk/dboot-build.mk dboot \
-		BITS=32 REPOROOT=${REPOROOT}
+	@${MAKE} -f ${SRCTOP}/kernel/mk/dboot-build.mk dboot \
+		BITS=32 SRCTOP=${SRCTOP}
 
 dboot-64:
 	@mkdir -p obj64
-	@${MAKE} -f ${REPOROOT}/kernel/mk/dboot-build.mk dboot \
-		BITS=64 REPOROOT=${REPOROOT}
+	@${MAKE} -f ${SRCTOP}/kernel/mk/dboot-build.mk dboot \
+		BITS=64 SRCTOP=${SRCTOP}
 
 clean cleandir:
 	@rm -rf obj32 obj64
--- a/kernel/mk/defines.mk	Tue Jun 27 22:55:11 2017 +0300
+++ b/kernel/mk/defines.mk	Fri Jan 12 18:49:53 2018 -0500
@@ -81,13 +81,13 @@
 	-D_SYSCALL32_IMPL
 
 KERNEL_INCLUDES = \
-	-I${REPOROOT}/usr/src/uts/common \
-	-I${REPOROOT}/arch/${CONFIG_MACH}/include \
-	-I${REPOROOT}/arch/${CONFIG_MACH}/include/offsets/${BITS} \
-	-I${REPOROOT}/include
+	-I${SRCTOP}/usr/src/uts/common \
+	-I${SRCTOP}/arch/${CONFIG_MACH}/include \
+	-I${SRCTOP}/arch/${CONFIG_MACH}/include/offsets/${BITS} \
+	-I${SRCTOP}/include
 
 KERNEL_INCLUDES_i386 = \
-	-I${REPOROOT}/usr/src/uts/intel
+	-I${SRCTOP}/usr/src/uts/intel
 
 KERNEL_INCLUDES_sparc =
 
--- a/kernel/mk/genunix-build-subsys.mk	Tue Jun 27 22:55:11 2017 +0300
+++ b/kernel/mk/genunix-build-subsys.mk	Fri Jan 12 18:49:53 2018 -0500
@@ -2,26 +2,26 @@
 # Build genunix subsystem
 #
 
-.if empty(REPOROOT)
-.error "You must define REPOROOT to point to the top-level of the repository"
+.if empty(SRCTOP)
+.error "You must define SRCTOP to point to the top-level of the repository"
 .endif
 
-.include <${REPOROOT}/Makefile.cfgparam>
+.include <${SRCTOP}/Makefile.cfgparam>
 
 # prevent genunix.mk inclusion in user's Makefile from setting up confusing targets
 _GENUNIX_BUILD=yes
 .include <${.CURDIR}/Makefile>
 
-.include <${REPOROOT}/kernel/mk/defines.mk>
-.include <${REPOROOT}/kernel/mk/program-defines.mk>
+.include <${SRCTOP}/kernel/mk/defines.mk>
+.include <${SRCTOP}/kernel/mk/program-defines.mk>
 .if ${BUILD_GENUNIX} == "yes"
-.include <${REPOROOT}/kernel/mk/genunix-defines.mk>
+.include <${SRCTOP}/kernel/mk/genunix-defines.mk>
 SRCS = $(GENUNIX_SRCS)
 DIRS = $(GENUNIX_SUBDIR)
 TGT = genunix
 OFILE = genunix.o
 .else
-.include <${REPOROOT}/kernel/mk/unix-defines.mk>
+.include <${SRCTOP}/kernel/mk/unix-defines.mk>
 SRCS = $(UNIX_SRCS)
 DIRS = $(UNIX_SUBDIR)
 TGT = unix
--- a/kernel/mk/genunix-build.mk	Tue Jun 27 22:55:11 2017 +0300
+++ b/kernel/mk/genunix-build.mk	Fri Jan 12 18:49:53 2018 -0500
@@ -2,18 +2,18 @@
 # Build and install genunix
 #
 
-.if empty(REPOROOT)
-.error "You must define REPOROOT to point to the top-level of the repository"
+.if empty(SRCTOP)
+.error "You must define SRCTOP to point to the top-level of the repository"
 .endif
 
-.include <${REPOROOT}/Makefile.cfgparam>
+.include <${SRCTOP}/Makefile.cfgparam>
 
 # prevent genunix.mk inclusion in user's Makefile from setting up confusing targets
 _GENUNIX_BUILD=yes
 .include <${.CURDIR}/Makefile>
 
-.include <${REPOROOT}/kernel/mk/defines.mk>
-.include <${REPOROOT}/kernel/mk/genunix-defines.mk>
+.include <${SRCTOP}/kernel/mk/defines.mk>
+.include <${SRCTOP}/kernel/mk/genunix-defines.mk>
 
 CFLAGS = $(KERNEL_CFLAGS)
 LDFLAGS = $(KERNEL_LDFLAGS)
--- a/kernel/mk/genunix-defines.mk	Tue Jun 27 22:55:11 2017 +0300
+++ b/kernel/mk/genunix-defines.mk	Fri Jan 12 18:49:53 2018 -0500
@@ -35,8 +35,8 @@
 	-DOPTERON_ERRATUM_721
 
 KERNEL_INCLUDES += \
-	-I$(REPOROOT)/usr/src/uts/common/fs/zfs \
-	-I$(REPOROOT)/usr/src/common
+	-I$(SRCTOP)/usr/src/uts/common/fs/zfs \
+	-I$(SRCTOP)/usr/src/common
 
 KERNEL_INCLUDES_i386 += \
-	-I$(REPOROOT)/arch/x86/kernel/platform/i86pc/include
+	-I$(SRCTOP)/arch/x86/kernel/platform/i86pc/include
--- a/kernel/mk/genunix-subsys.mk	Tue Jun 27 22:55:11 2017 +0300
+++ b/kernel/mk/genunix-subsys.mk	Fri Jan 12 18:49:53 2018 -0500
@@ -1,7 +1,7 @@
 .if empty(_GENUNIX_BUILD)
 
-.if empty(REPOROOT)
-.error "You must define REPOROOT to point to the top-level of the repository"
+.if empty(SRCTOP)
+.error "You must define SRCTOP to point to the top-level of the repository"
 .endif
 
 # process all subdirs only once
@@ -14,7 +14,7 @@
 SUBDIR += ${GENUNIX_SUBDIR} ${UNIX_SUBDIR}
 SUBDIR := ${SUBDIR:O:u}
 
-.include <${REPOROOT}/Makefile.cfgparam>
+.include <${SRCTOP}/Makefile.cfgparam>
 .include <bsd.subdir.mk>
 
 BUILD=
@@ -29,23 +29,23 @@
 
 genunix-32: ${GENUNIX_SUBDIR}
 	@mkdir -p obj32
-	@${MAKE} -f ${REPOROOT}/kernel/mk/genunix-build-subsys.mk genunix \
-		BITS=32 REPOROOT=${REPOROOT} BUILD_GENUNIX=yes
+	@${MAKE} -f ${SRCTOP}/kernel/mk/genunix-build-subsys.mk genunix \
+		BITS=32 SRCTOP=${SRCTOP} BUILD_GENUNIX=yes
 
 genunix-64: ${GENUNIX_SUBDIR}
 	@mkdir -p obj64
-	@${MAKE} -f ${REPOROOT}/kernel/mk/genunix-build-subsys.mk genunix \
-		BITS=64 REPOROOT=${REPOROOT} BUILD_GENUNIX=yes
+	@${MAKE} -f ${SRCTOP}/kernel/mk/genunix-build-subsys.mk genunix \
+		BITS=64 SRCTOP=${SRCTOP} BUILD_GENUNIX=yes
 
 unix-32: ${UNIX_SUBDIR}
 	@mkdir -p obj32
-	@${MAKE} -f ${REPOROOT}/kernel/mk/genunix-build-subsys.mk unix \
-		BITS=32 REPOROOT=${REPOROOT} BUILD_GENUNIX=no
+	@${MAKE} -f ${SRCTOP}/kernel/mk/genunix-build-subsys.mk unix \
+		BITS=32 SRCTOP=${SRCTOP} BUILD_GENUNIX=no
 
 unix-64: ${UNIX_SUBDIR}
 	@mkdir -p obj64
-	@${MAKE} -f ${REPOROOT}/kernel/mk/genunix-build-subsys.mk unix \
-		BITS=64 REPOROOT=${REPOROOT} BUILD_GENUNIX=no
+	@${MAKE} -f ${SRCTOP}/kernel/mk/genunix-build-subsys.mk unix \
+		BITS=64 SRCTOP=${SRCTOP} BUILD_GENUNIX=no
 
 clean cleandir:
 	@rm -rf obj32 obj64
--- a/kernel/mk/genunix.mk	Tue Jun 27 22:55:11 2017 +0300
+++ b/kernel/mk/genunix.mk	Fri Jan 12 18:49:53 2018 -0500
@@ -1,7 +1,7 @@
 .if empty(_GENUNIX_BUILD)
 
-REPOROOT=..
-.include <$(REPOROOT)/Makefile.cfgparam>
+SRCTOP=..
+.include <$(SRCTOP)/Makefile.cfgparam>
 .include <bsd.subdir.mk>
 
 SUBDIR += ${GENUNIX_SUBDIR}
@@ -21,23 +21,23 @@
 # we don't use a for loop to allow for more parallelism
 all-32:
 	@mkdir -p obj32
-	@${MAKE} -f ${REPOROOT}/kernel/mk/genunix-build.mk all \
-		BITS=32 REPOROOT=${REPOROOT}
+	@${MAKE} -f ${SRCTOP}/kernel/mk/genunix-build.mk all \
+		BITS=32 SRCTOP=${SRCTOP}
 
 all-64:
 	@mkdir -p obj64
-	@${MAKE} -f ${REPOROOT}/kernel/mk/genunix-build.mk all \
-		BITS=64 REPOROOT=${REPOROOT}
+	@${MAKE} -f ${SRCTOP}/kernel/mk/genunix-build.mk all \
+		BITS=64 SRCTOP=${SRCTOP}
 
 clean cleandir:
-	@${MAKE} -f ${REPOROOT}/kernel/mk/genunix-build.mk clean \
-		REPOROOT=${REPOROOT}
+	@${MAKE} -f ${SRCTOP}/kernel/mk/genunix-build.mk clean \
+		SRCTOP=${SRCTOP}
 	@rm -rf obj32 obj64
 
 install:
 .for bits in ${BUILD}
-	@${MAKE} -f ${REPOROOT}/kernel/mk/genunix-build.mk install \
-		BITS=${bits} REPOROOT=${REPOROOT}
+	@${MAKE} -f ${SRCTOP}/kernel/mk/genunix-build.mk install \
+		BITS=${bits} SRCTOP=${SRCTOP}
 .endfor
 
 .PHONY: all all-32 all-64 clean cleandir install
--- a/kernel/mk/program-defines.mk	Tue Jun 27 22:55:11 2017 +0300
+++ b/kernel/mk/program-defines.mk	Fri Jan 12 18:49:53 2018 -0500
@@ -39,4 +39,4 @@
 .SUFFIXES: .bdf
 
 .bdf.c:
-	awk -f ${REPOROOT}/tools/bdf_to_c.awk ${.IMPSRC} > ${.TARGET}
+	awk -f ${SRCTOP}/tools/bdf_to_c.awk ${.IMPSRC} > ${.TARGET}
--- a/kernel/mk/unix-defines.mk	Tue Jun 27 22:55:11 2017 +0300
+++ b/kernel/mk/unix-defines.mk	Fri Jan 12 18:49:53 2018 -0500
@@ -43,11 +43,11 @@
 	-DMODDIR_SUFFIX='"${CONFIG_MACH64}"'
 
 KERNEL_INCLUDES += \
-	-I$(REPOROOT)/usr/src/uts/common/fs/zfs \
-	-I$(REPOROOT)/usr/src/common
+	-I$(SRCTOP)/usr/src/uts/common/fs/zfs \
+	-I$(SRCTOP)/usr/src/common
 
 KERNEL_INCLUDES_i386 += \
-	-I$(REPOROOT)/arch/x86/kernel/platform/i86pc/include \
-	-I$(REPOROOT)/arch/x86/kernel/platform/i86xpv/include \
-	-I$(REPOROOT)/usr/src/common/dis/i386 \
-	-I$(REPOROOT)/usr/src/uts/common/xen
+	-I$(SRCTOP)/arch/x86/kernel/platform/i86pc/include \
+	-I$(SRCTOP)/arch/x86/kernel/platform/i86xpv/include \
+	-I$(SRCTOP)/usr/src/common/dis/i386 \
+	-I$(SRCTOP)/usr/src/uts/common/xen