Page MenuHomeFreeBSD
Files F159216465

D16361.diff
No OneTemporary
Actions

D16361.diff
View Options

Index: head/stand/common/paths.h
===================================================================
--- head/stand/common/paths.h
+++ head/stand/common/paths.h
@@ -33,7 +33,6 @@
#define PATH_CONFIG "/boot/config"
#define PATH_LOADER "/boot/loader"
#define PATH_LOADER_EFI "/boot/loader.efi"
-#define PATH_LOADER_ZFS "/boot/zfsloader"
#define PATH_KERNEL "/boot/kernel/kernel"
#endif /* _PATHS_H_ */
Index: head/stand/i386/Makefile
===================================================================
--- head/stand/i386/Makefile
+++ head/stand/i386/Makefile
@@ -18,6 +18,6 @@
SUBDIR.yes+= kgzldr
.endif
-SUBDIR.${MK_ZFS}+= zfsboot gptzfsboot zfsloader
+SUBDIR.${MK_ZFS}+= zfsboot gptzfsboot
.include <bsd.subdir.mk>
Index: head/stand/i386/loader/Makefile
===================================================================
--- head/stand/i386/loader/Makefile
+++ head/stand/i386/loader/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+HAVE_ZFS= ${MK_ZFS}
+
LOADER_NET_SUPPORT?= yes
LOADER_NFS_SUPPORT?= yes
LOADER_TFTP_SUPPORT?= yes
@@ -62,6 +64,9 @@
${LOADER}.bin: ${LOADER}.sym
strip -R .comment -R .note -o ${.TARGET} ${.ALLSRC}
+.if ${MK_ZFS} == "yes"
+SYMLINKS= ${BINDIR}/${LOADER} ${BINDIR}/zfs${LOADER}
+.endif
FILES+= ${LOADER}
# XXX INSTALLFLAGS_loader= -b
FILESMODE_${LOADER}= ${BINMODE} -b
Index: head/stand/i386/zfsboot/zfsboot.c
===================================================================
--- head/stand/i386/zfsboot/zfsboot.c
+++ head/stand/i386/zfsboot/zfsboot.c
@@ -848,7 +848,7 @@
*/
if (autoboot && !*kname) {
- memcpy(kname, PATH_LOADER_ZFS, sizeof(PATH_LOADER_ZFS));
+ memcpy(kname, PATH_LOADER, sizeof(PATH_LOADER));
if (!keyhit(3)) {
load();
memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL));
Index: head/stand/i386/zfsloader/Makefile
===================================================================
--- head/stand/i386/zfsloader/Makefile
+++ head/stand/i386/zfsloader/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-LOADER= zfsloader
-NEWVERSWHAT= "ZFS enabled bootstrap loader" x86
-HAVE_ZFS= yes
-CFLAGS+= -DBOOTPROG=\"zfsloader\"
-
-.include "${.CURDIR}/../loader/Makefile"
Index: head/stand/i386/zfsloader/Makefile.depend
===================================================================
--- head/stand/i386/zfsloader/Makefile.depend
+++ head/stand/i386/zfsloader/Makefile.depend
@@ -1,21 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
- include \
- include/xlocale \
- stand/ficl32 \
- stand/geli \
- stand/i386/btx/btx \
- stand/i386/btx/btxldr \
- stand/i386/btx/lib \
- stand/i386/libi386 \
- stand/libsa32 \
- stand/zfs32 \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
Index: head/stand/loader.mk
===================================================================
--- head/stand/loader.mk
+++ head/stand/loader.mk
@@ -124,7 +124,7 @@
CFLAGS+= -DLOADER_MBR_SUPPORT
.endif
-.if defined(HAVE_ZFS)
+.if ${HAVE_ZFS:Uno} == "yes"
CFLAGS+= -DLOADER_ZFS_SUPPORT
CFLAGS+= -I${ZFSSRC}
CFLAGS+= -I${SYSDIR}/cddl/boot/zfs
Index: head/stand/sparc64/Makefile
===================================================================
--- head/stand/sparc64/Makefile
+++ head/stand/sparc64/Makefile
@@ -5,6 +5,6 @@
.include <bsd.init.mk>
SUBDIR.yes= boot1 loader
-SUBDIR.${MK_ZFS}+=zfsboot zfsloader
+SUBDIR.${MK_ZFS}+=zfsboot
.include <bsd.subdir.mk>
Index: head/stand/sparc64/loader/Makefile
===================================================================
--- head/stand/sparc64/loader/Makefile
+++ head/stand/sparc64/loader/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+HAVE_ZFS= ${MK_ZFS}
+
LOADER_DISK_SUPPORT?= yes
LOADER_UFS_SUPPORT?= yes
LOADER_CD9660_SUPPORT?= yes
@@ -39,6 +41,10 @@
.include "${BOOTSRC}/loader.mk"
LDFLAGS+= -static
+
+.if ${MK_ZFS} == "yes"
+SYMLINKS= ${BINDIR}/loader ${BINDIR}/zfsloader
+.endif
# Open Firmware standalone support library
LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a
Index: head/stand/sparc64/zfsloader/Makefile
===================================================================
--- head/stand/sparc64/zfsloader/Makefile
+++ head/stand/sparc64/zfsloader/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-PROG= zfsloader
-NEWVERSWHAT= "ZFS enabled bootstrap loader" sparc64
-HAVE_ZFS= yes
-CFLAGS+= -DBOOTPROG=\"zfsloader\"
-
-.include "${.CURDIR}/../loader/Makefile"

File Metadata

Mime Type
text/plain
Expires
Fri, Jun 12, 10:52 AM (12 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33905814
Default Alt Text
D16361.diff (4 KB)

Event Timeline