From 58d502c1bfc6f390281336bcdc33803f0b212b71 Mon Sep 17 00:00:00 2001 From: ambrisko Date: Thu, 15 Jun 2006 17:57:50 +0000 Subject: [PATCH] MFC, let's hook up things to the build and see what I messed up! - enable linsysfs - enable mfi_linux - enable ipmi A new make universe will be fired off shortly once this makes it back via cvsup. --- share/man/man4/Makefile | 2 ++ share/man/man5/Makefile | 1 + sys/conf/files | 2 ++ sys/conf/files.amd64 | 3 +++ sys/conf/files.i386 | 3 +++ sys/conf/options | 1 + sys/i386/conf/NOTES | 3 +++ sys/modules/Makefile | 6 ++++++ sys/modules/linprocfs/Makefile | 1 + sys/pc98/conf/NOTES | 3 +++ 10 files changed, 25 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 4996befad362..b67ba34d4417 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -115,6 +115,7 @@ MAN= aac.4 \ ip.4 \ ip6.4 \ ipfirewall.4 \ + ${_ipmi.4} \ ips.4 \ ipsec.4 \ ipw.4 \ @@ -494,6 +495,7 @@ MLINKS+=xl.4 if_xl.4 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _if_nve.4= if_nve.4 +_ipmi.4= ipmi.4 _nve.4= nve.4 _rr232x.4= rr232x.4 _spkr.4= spkr.4 diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index ce7f01b08873..174d0970b9fe 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -32,6 +32,7 @@ MAN= acct.5 \ libmap.conf.5 \ link.5 \ linprocfs.5 \ + linsysfs.5 \ mailer.conf.5 \ make.conf.5 \ moduli.5 \ diff --git a/sys/conf/files b/sys/conf/files index 47076108087d..4e3a2674079f 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -111,6 +111,7 @@ coda/coda_venus.c optional vcoda coda/coda_vfsops.c optional vcoda coda/coda_vnops.c optional vcoda compat/linprocfs/linprocfs.c optional linprocfs +compat/linsysfs/linsysfs.c optional linsysfs contrib/altq/altq/altq_cbq.c optional altq contrib/altq/altq/altq_cdnr.c optional altq contrib/altq/altq/altq_hfsc.c optional altq @@ -659,6 +660,7 @@ dev/mem/memdev.c optional mem dev/mfi/mfi.c optional mfi dev/mfi/mfi_pci.c optional mfi pci dev/mfi/mfi_disk.c optional mfi +dev/mfi/mfi_linux.c optional mfi compat_linux dev/mii/acphy.c optional miibus dev/mii/amphy.c optional miibus dev/mii/bmtphy.c optional miibus diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 4e18dfc46959..a8b087209286 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -156,6 +156,9 @@ dev/if_ndis/if_ndis_pci.c optional ndis cardbus dev/if_ndis/if_ndis_pci.c optional ndis pci dev/if_ndis/if_ndis_usb.c optional ndis usb dev/io/iodev.c optional io +dev/ipmi/ipmi.c optional ipmi +dev/ipmi/ipmi_smbios.c optional ipmi isa +dev/ipmi/ipmi_pci.c optional ipmi pci dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 9cbc2515d46d..35d449ac63c2 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -198,6 +198,9 @@ dev/if_ndis/if_ndis_pci.c optional ndis cardbus dev/if_ndis/if_ndis_pci.c optional ndis pci dev/if_ndis/if_ndis_usb.c optional ndis usb dev/io/iodev.c optional io +dev/ipmi/ipmi.c optional ipmi +dev/ipmi/ipmi_smbios.c optional ipmi isa +dev/ipmi/ipmi_pci.c optional ipmi pci dev/kbd/kbd.c optional atkbd dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd diff --git a/sys/conf/options b/sys/conf/options index 3c3d882000d7..36051681c34b 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -174,6 +174,7 @@ EXT2FS opt_dontuse.h FDESCFS opt_dontuse.h HPFS opt_dontuse.h LINPROCFS opt_dontuse.h +LINSYSFS opt_dontuse.h MSDOSFS opt_dontuse.h NTFS opt_dontuse.h NULLFS opt_dontuse.h diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 05c08cfd6ea8..c165ee2b73c4 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -1020,6 +1020,9 @@ options COMPAT_AOUT # and PSEUDOFS) options LINPROCFS +#Enable the linux-like sys filesystem support (requires COMPAT_LINUX) +options LINSYSFS + # # SysVR4 ABI emulation # diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 64653389feae..bf67b582674b 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -122,6 +122,7 @@ SUBDIR= ${_3dfx} \ ${_ipfilter} \ ipfw \ ip_mroute_mod \ + ${_ipmi} \ ${_ips} \ ipw \ isp \ @@ -137,6 +138,7 @@ SUBDIR= ${_3dfx} \ libmbpool \ libmchain \ ${_linprocfs} \ + ${_linsysfs} \ ${_linux} \ ${_lnc} \ lpt \ @@ -354,6 +356,7 @@ _ie= ie _if_ndis= if_ndis _io= io _linprocfs= linprocfs +_linsysfs= linsysfs _linux= linux _lnc= lnc _mse= mse @@ -404,6 +407,7 @@ _ichwd= ichwd _ida= ida _idt= idt _iir= iir +_ipmi= ipmi _ips= ips _mly= mly _nve= nve @@ -429,6 +433,7 @@ _agp= agp _ahb= ahb _ext2fs= ext2fs _linprocfs= linprocfs +_linsysfs= linsysfs _linux= linux _osf1= osf1 _sound= sound @@ -454,6 +459,7 @@ _ida= ida _if_ndis= if_ndis _iir= iir _io= io +_ipmi= ipmi _ips= ips #_lnc= lnc _mly= mly diff --git a/sys/modules/linprocfs/Makefile b/sys/modules/linprocfs/Makefile index 98f9fcb55c36..e81a53f37785 100644 --- a/sys/modules/linprocfs/Makefile +++ b/sys/modules/linprocfs/Makefile @@ -4,6 +4,7 @@ KMOD= linprocfs SRCS= vnode_if.h \ + device_if.h bus_if.h \ linprocfs.c \ opt_compat.h diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES index 52d526ac1aaa..5a07c100f66f 100644 --- a/sys/pc98/conf/NOTES +++ b/sys/pc98/conf/NOTES @@ -654,6 +654,9 @@ options COMPAT_AOUT # and PSEUDOFS) options LINPROCFS +#Enable the linux-like sys filesystem support (requires COMPAT_LINUX) +options LINSYSFS + # # SysVR4 ABI emulation #