From c594648cd7b8a212bf29a2ddee98d16198dc0834 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 28 Jul 2013 00:51:03 +0200 Subject: [PATCH] kernel: Stop installing pst(4) module and manual page on x86_64. It is i386 only. --- Makefile_upgrade.inc | 3 +++ share/man/man4/Makefile | 1 - share/man/man4/man4.i386/Makefile | 1 + share/man/man4/{ => man4.i386}/pst.4 | 2 +- sys/config/LINT64 | 5 ----- sys/dev/raid/Makefile | 6 +++++- 6 files changed, 10 insertions(+), 8 deletions(-) rename share/man/man4/{ => man4.i386}/pst.4 (99%) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index ccb49d6540..c093bff7a8 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -2138,6 +2138,8 @@ TO_REMOVE+=/usr/share/man/man4/i386/pcf.4.gz TO_REMOVE+=/usr/share/man/cat3/fpsetsticky.3.gz TO_REMOVE+=/usr/share/man/man3/fpsetsticky.3.gz TO_REMOVE+=/usr/include/sys/bitstring.h +TO_REMOVE+=/usr/share/man/cat4/pst.4.gz +TO_REMOVE+=/usr/share/man/man4/pst.4.gz .if ${MACHINE_ARCH} == "x86_64" TO_REMOVE+=/usr/sbin/stlstats @@ -2154,6 +2156,7 @@ TO_REMOVE+=/usr/share/man/man8/pnpinfo.8.gz TO_REMOVE+=/boot/kernel/if_ar.ko TO_REMOVE+=/boot/kernel/glxsb.ko TO_REMOVE+=/boot/kernel/if_sbni.ko +TO_REMOVE+=/boot/kernel/pst.ko .endif # XXX Remove when pfsync(4) has been fixed diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 8e514105fd..bb496d487a 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -236,7 +236,6 @@ MAN= aac.4 \ ppi.4 \ ppp.4 \ psm.4 \ - pst.4 \ pt.4 \ pty.4 \ puc.4 \ diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile index ff7627d87b..027118ba77 100644 --- a/share/man/man4/man4.i386/Makefile +++ b/share/man/man4/man4.i386/Makefile @@ -17,6 +17,7 @@ MAN= ar.4 \ perfmon.4 \ pnp.4 \ pnpbios.4 \ + pst.4 \ sbni.4 \ spic.4 \ sr.4 \ diff --git a/share/man/man4/pst.4 b/share/man/man4/man4.i386/pst.4 similarity index 99% rename from share/man/man4/pst.4 rename to share/man/man4/man4.i386/pst.4 index 3a153272f9..9981f9d0cc 100644 --- a/share/man/man4/pst.4 +++ b/share/man/man4/man4.i386/pst.4 @@ -26,7 +26,7 @@ .\" $FreeBSD: src/share/man/man4/pst.4,v 1.1.2.1 2002/09/28 11:19:07 sos Exp $ .\" .Dd November 21, 2001 -.Dt PST 4 +.Dt PST 4 i386 .Os .Sh NAME .Nm pst diff --git a/sys/config/LINT64 b/sys/config/LINT64 index 60312c0a69..77c661394c 100644 --- a/sys/config/LINT64 +++ b/sys/config/LINT64 @@ -1061,11 +1061,6 @@ device twa # 3ware 9000 series PATA/SATA RAID options TWA_DEBUG=10 # enable debug messages device tws # 3ware 9750 series SATA/SAS RAID -# -# Promise Supertrack SX6000 -# -#device pst - # # IBM ServeRAID # diff --git a/sys/dev/raid/Makefile b/sys/dev/raid/Makefile index b89ec5e37f..d4a83e9d93 100644 --- a/sys/dev/raid/Makefile +++ b/sys/dev/raid/Makefile @@ -1,4 +1,8 @@ SUBDIR= aac amr arcmsr asr ciss hpt27xx hptiop hptmv hptrr \ - iir ips mfi mlx mly mps pst twa twe tws vinum + iir ips mfi mlx mly mps twa twe tws vinum + +.if ${MACHINE_ARCH} == i386 +SUBDIR+=pst +.endif .include -- 2.41.0