summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2008-07-06 20:57:35 +0000
committermarcel <marcel@FreeBSD.org>2008-07-06 20:57:35 +0000
commitbdbada7ab202ec9b0f096811f6fbe2eda04cc5c9 (patch)
tree5fb3c31b1094da670f84d4c5bf11ca4b019ba97e
parent05c2789f33c730e889d36df7147bfead717bc1e7 (diff)
downloadFreeBSD-src-bdbada7ab202ec9b0f096811f6fbe2eda04cc5c9.zip
FreeBSD-src-bdbada7ab202ec9b0f096811f6fbe2eda04cc5c9.tar.gz
Obsolete bsdlabel(8) on powerpc. Use gpart(8) instead.
-rw-r--r--ObsoleteFiles.inc5
-rw-r--r--sbin/Makefile2
2 files changed, 6 insertions, 1 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 9fe8b33..08b5ef2 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -14,6 +14,11 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20080706: bsdlabel(8) removed on powerpc
+.if ${TARGET_ARCH} == "powerpc"
+OLD_FILES+=sbin/bsdlabel
+OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz
+.endif
# 20080704: sbsh(4) removed
OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz
OLD_FILES+=usr/share/man/man4/sbsh.4.gz
diff --git a/sbin/Makefile b/sbin/Makefile
index a5dc1c4..1af63c0 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -113,7 +113,7 @@ _ping6= ping6
_rtsol= rtsol
.endif
-.if ${MACHINE_ARCH} != "ia64"
+.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "powerpc"
_bsdlabel= bsdlabel
.endif
OpenPOWER on IntegriCloud