summaryrefslogtreecommitdiffstats
path: root/rescue
diff options
context:
space:
mode:
authorgordon <gordon@FreeBSD.org>2003-06-30 18:18:05 +0000
committergordon <gordon@FreeBSD.org>2003-06-30 18:18:05 +0000
commit3bd8aa4473febc11b1c678dd3f91eb0970188982 (patch)
tree5fb5eefa0a64fe9597914c39da3975e49cba713c /rescue
parentaf13d33552593b7cb9676bfd7a90d049405a6bac (diff)
downloadFreeBSD-src-3bd8aa4473febc11b1c678dd3f91eb0970188982.zip
FreeBSD-src-3bd8aa4473febc11b1c678dd3f91eb0970188982.tar.gz
Don't build mount_nwfs or mount_smbfs in rescue.
Build fdisk_pc98 on pc98 arch, not fdisk. Don't alias disklabel on pc98, ia64. Don't build fdisk on sparc64, alpha. Pointed out by: tmm@ Submitted by: Tim Kientzle <kientzle@acm.org>
Diffstat (limited to 'rescue')
-rw-r--r--rescue/rescue/Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index d8672f8..43da5a4 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -119,30 +119,28 @@ CRUNCH_PROGS+=atm adjkerntz atacontrol badsect bsdlabel camcontrol \
# CRUNCH_PROGS+= devd
CRUNCH_LIBS+=-lalias -latm -lbsdxml -lcam -lcurses -ldevstat -lipsec -lipx \
- -lgeom -lmd -lncp -lreadline -lsbuf -lsmb -lufs -lz
+ -lgeom -lmd -lreadline -lsbuf -lufs -lz
.if ${MACHINE_ARCH} == "i386"
-CRUNCH_PROGS+= cxconfig fdisk mount_nwfs mount_smbfs
+CRUNCH_PROGS+= cxconfig fdisk
CRUNCH_ALIAS_bsdlabel= disklabel
+#CRUNCH_PROGS+= mount_nwfs mount_smbfs
+#CRUNCH_LIBS+= -lncp -lsmb
.endif
.if ${MACHINE} == "pc98"
-CRUNCH_PROGS+= fdisk_pc98
-CRUNCH_ALIAS_bsdlabel= disklabel
-CRUNCH_ALIAS_fdisk_pc98= fdisk
+CRUNCH_SRCDIR_fdisk=$(.CURDIR)/../../sbin/fdisk_pc98
.endif
.if ${MACHINE_ARCH} == "ia64"
CRUNCH_PROGS+= mca gpt fdisk
-CRUNCH_ALIAS_bsdlabel= disklabel
.endif
.if ${MACHINE_ARCH} == "sparc64"
-CRUNCH_PROGS+= fdisk sunlabel
+CRUNCH_PROGS+= sunlabel
.endif
.if ${MACHINE_ARCH} == "alpha"
-CRUNCH_PROGS+= fdisk
CRUNCH_ALIAS_bsdlabel= disklabel
.endif
OpenPOWER on IntegriCloud