Module Name: src
Committed By: tsutsui
Date: Tue Jun 5 13:41:23 UTC 2012
Modified Files:
src/sbin/fdisk: fdisk.c
src/tools/fdisk: Makefile
Log Message:
Use ${DESTDIR}/usr/mdec for DEFAULT_BOOTDIR on tools fdisk(8)
rather than unknown build host's /usr/mdec directory.
XXX: no option to leave MBR bootcode empty on x86 targets
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sbin/fdisk/fdisk.c
cvs rdiff -u -r1.6 -r1.7 src/tools/fdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fdisk/fdisk.c
diff -u src/sbin/fdisk/fdisk.c:1.141 src/sbin/fdisk/fdisk.c:1.142
--- src/sbin/fdisk/fdisk.c:1.141 Sat May 5 16:03:55 2012
+++ src/sbin/fdisk/fdisk.c Tue Jun 5 13:41:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fdisk.c,v 1.141 2012/05/05 16:03:55 tsutsui Exp $ */
+/* $NetBSD: fdisk.c,v 1.142 2012/06/05 13:41:23 tsutsui Exp $ */
/*
* Mach Operating System
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fdisk.c,v 1.141 2012/05/05 16:03:55 tsutsui Exp $");
+__RCSID("$NetBSD: fdisk.c,v 1.142 2012/06/05 13:41:23 tsutsui Exp $");
#endif /* not lint */
#define MBRPTYPENAMES
@@ -86,7 +86,9 @@ __RCSID("$NetBSD: fdisk.c,v 1.141 2012/0
#endif
#endif /* HAVE_NBTOOL_CONFIG_H */
+#ifndef DEFAULT_BOOTDIR
#define DEFAULT_BOOTDIR "/usr/mdec"
+#endif
#define LE_MBR_MAGIC htole16(MBR_MAGIC)
#define LE_MBR_BS_MAGIC htole16(MBR_BS_MAGIC)
Index: src/tools/fdisk/Makefile
diff -u src/tools/fdisk/Makefile:1.6 src/tools/fdisk/Makefile:1.7
--- src/tools/fdisk/Makefile:1.6 Mon Jun 4 18:53:03 2012
+++ src/tools/fdisk/Makefile Tue Jun 5 13:41:23 2012
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2012/06/04 18:53:03 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2012/06/05 13:41:23 tsutsui Exp $
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-fdisk
HOST_SRCDIR= sbin/fdisk
HOST_SRCS= disklabel.c
+HOST_CPPFLAGS= -DDEFAULT_BOOTDIR=\"${DESTDIR}/usr/mdec\"
+
.include "${.CURDIR}/../Makefile.nbincludes"
.include "${.CURDIR}/../Makefile.host"
