Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use ${DESTDIR}/usr/mdec for DEFAULT_BOOTDIR on tools fdisk(8)

Browse Source 
rather than unknown build host's /usr/mdec directory.

XXX: no option to leave MBR bootcode empty on x86 targets
This commit is contained in:
tsutsui 2012-06-05 13:41:23 +00:00
parent ac2c5cf13a
commit 0532bb776d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/fdisk/fdisk.c
View File

@ -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/05/05 16:03:55 tsutsui Exp $");
#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)

4
tools/fdisk/Makefile
View File

@ -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"