Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Use ${DESTDIR}/usr/mdec for DEFAULT_BOOTDIR on tools fdisk(8)
details: https://anonhg.NetBSD.org/src/rev/903f1398027e
branches: trunk
changeset: 779612:903f1398027e
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Tue Jun 05 13:41:23 2012 +0000
description:
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
diffstat:
sbin/fdisk/fdisk.c | 6 ++++--
tools/fdisk/Makefile | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
diffs (44 lines):
diff -r fd22c3208166 -r 903f1398027e sbin/fdisk/fdisk.c
--- a/sbin/fdisk/fdisk.c Tue Jun 05 13:20:01 2012 +0000
+++ b/sbin/fdisk/fdisk.c Tue Jun 05 13:41:23 2012 +0000
@@ -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 @@
#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)
diff -r fd22c3208166 -r 903f1398027e tools/fdisk/Makefile
--- a/tools/fdisk/Makefile Tue Jun 05 13:20:01 2012 +0000
+++ b/tools/fdisk/Makefile Tue Jun 05 13:41:23 2012 +0000
@@ -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"
Home |
Main Index |
Thread Index |
Old Index