D16945.id47447.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D16945.id47447.diff
View Options

	Index: stand/userboot/Makefile
	===================================================================
	--- stand/userboot/Makefile
	+++ stand/userboot/Makefile
	@@ -1,8 +1,10 @@
	# $FreeBSD$

	-.include <bsd.own.mk>
	+.include <bsd.init.mk>

	-SUBDIR= test userboot
	+SUBDIR.yes= test
	+SUBDIR.${MK_FORTH}+= userboot_4th
	+SUBDIR.${MK_LOADER_LUA}+= userboot_lua

	.include <bsd.subdir.mk>

	Index: stand/userboot/userboot/Makefile
	===================================================================
	--- stand/userboot/userboot/Makefile
	+++ stand/userboot/userboot/Makefile
	@@ -5,14 +5,14 @@
	LOADER_CD9660_SUPPORT?= no
	LOADER_EXT2FS_SUPPORT?= no
	PIC=yes
	-LOADER_INTERP=4th

	.include <bsd.init.mk>

	-SHLIB_NAME= userboot.so
	+SHLIB_NAME= userboot_${LOADER_INTERP}.so
	STRIP=
	LIBDIR= /boot

	+.PATH: ${.CURDIR}/../userboot
	SRCS= autoload.c
	SRCS+= bcache.c
	SRCS+= biossmap.c
	@@ -38,7 +38,12 @@

	LDFLAGS+= -nostdlib -Wl,-Bsymbolic

	-NEWVERSWHAT= "User boot" ${MACHINE_CPUARCH}
	+NEWVERSWHAT= "User boot ${LOADER_INTERP}" ${MACHINE_CPUARCH}
	+VERSION_FILE= ${.CURDIR}/../userboot/version
	+
	+.if ${LOADER_INTERP} == ${LOADER_DEFAULT_INTERP}
	+LINKS+= ${BINDIR}/${SHLIB_NAME} ${BINDIR}/userboot.so
	+.endif

	.if ${MK_ZFS} != "no"
	CFLAGS+= -DUSERBOOT_ZFS_SUPPORT
	Index: stand/userboot/userboot/version
	===================================================================
	--- stand/userboot/userboot/version
	+++ stand/userboot/userboot/version
	@@ -1,4 +1,5 @@
	$FreeBSD$

	+1.2: Userboot with lua or forth
	1.1: Initial userland boot