Index: stand/i386/Makefile =================================================================== --- stand/i386/Makefile +++ stand/i386/Makefile @@ -14,7 +14,9 @@ SUBDIR.yes+= loader_simp # special boot programs, 'self-extracting boot2+loader' -SUBDIR.yes+= pxeldr +SUBDIR.${MK_FORTH}+= pxeldr_4th +SUBDIR.${MK_LOADER_LUA}+= pxeldr_lua +SUBDIR.yes+= pxeldr_simp SUBDIR.${MK_LOADER_ZFS}+= zfsboot gptzfsboot Index: stand/i386/pxeldr/Makefile =================================================================== --- stand/i386/pxeldr/Makefile +++ stand/i386/pxeldr/Makefile @@ -4,12 +4,12 @@ PROG= ${LDR} INTERNALPROG= -FILES= ${BOOT} -MAN= ${BOOT}.8 +FILES= ${PXEBOOT} +MAN= pxeboot.8 SRCS= ${LDR}.S -CLEANFILES+= ${BOOT} +CLEANFILES+= ${PXEBOOT} -BOOT= pxeboot +PXEBOOT= pxeboot_${LOADER_INTERP} LDR= pxeldr ORG= 0x7c00 LOADER= loader @@ -24,12 +24,12 @@ CFLAGS+=-I${BOOTSRC}/i386/common -L=${LOADER_DEFAULT_INTERP} +L=${LOADER_INTERP} LOADERBIN= ${BOOTOBJ}/i386/loader_${L}/loader_${L}.bin -CLEANFILES+= ${BOOT}.tmp +CLEANFILES+= ${PXEBOOT}.tmp -${BOOT}: ${LDR} ${LOADER} +${PXEBOOT}: ${LDR} ${LOADER} cat ${LDR} ${LOADER} > ${.TARGET}.tmp ${DD} if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync rm ${.TARGET}.tmp @@ -41,5 +41,9 @@ ${LOADER}: ${LOADERBIN} ${BTXLDR} ${BTXKERN} btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ -b ${BTXKERN} ${LOADERBIN} + +.if ${LOADER_INTERP} == ${LOADER_DEFAULT_INTERP} +LINKS+= ${BINDIR}/${PXEBOOT} ${BINDIR}/pxeboot +.endif .include Index: stand/i386/pxeldr_4th/Makefile =================================================================== --- /dev/null +++ stand/i386/pxeldr_4th/Makefile @@ -0,0 +1,8 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../pxeldr +SRCS+= pxeldr.S +LOADER_INTERP=4th + +.include "../pxeldr/Makefile" + Index: stand/i386/pxeldr_lua/Makefile =================================================================== --- /dev/null +++ stand/i386/pxeldr_lua/Makefile @@ -0,0 +1,8 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../pxeldr +SRCS+= pxeldr.S +LOADER_INTERP=lua + +.include "../pxeldr/Makefile" + Index: stand/i386/pxeldr_simp/Makefile =================================================================== --- /dev/null +++ stand/i386/pxeldr_simp/Makefile @@ -0,0 +1,8 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../pxeldr +SRCS+= pxeldr.S +LOADER_INTERP=simp + +.include "../pxeldr/Makefile" +