diff options
-rw-r--r-- | sys/alpha/Makefile | 3 | ||||
-rw-r--r-- | sys/alpha/conf/NOTES | 7 | ||||
-rw-r--r-- | sys/conf/NOTES | 4 | ||||
-rw-r--r-- | sys/conf/files | 1 | ||||
-rw-r--r-- | sys/conf/files.alpha | 43 | ||||
-rw-r--r-- | sys/conf/files.amd64 | 1 | ||||
-rw-r--r-- | sys/conf/files.i386 | 1 | ||||
-rw-r--r-- | sys/conf/files.pc98 | 1 | ||||
-rw-r--r-- | sys/conf/options | 1 | ||||
-rw-r--r-- | sys/conf/options.alpha | 1 | ||||
-rw-r--r-- | sys/conf/options.amd64 | 1 | ||||
-rw-r--r-- | sys/conf/options.i386 | 1 | ||||
-rw-r--r-- | sys/conf/options.pc98 | 1 |
13 files changed, 16 insertions, 50 deletions
diff --git a/sys/alpha/Makefile b/sys/alpha/Makefile index da04916..4df175d 100644 --- a/sys/alpha/Makefile +++ b/sys/alpha/Makefile @@ -15,8 +15,7 @@ all: SALPHA= ${SYS}/alpha/mcbus/*.[ch] ${SYS}/alpha/tlsb/*.[ch] \ ${SYS}/alpha/alpha/*.[ch] ${SYS}/alpha/pci/*.[ch] \ ${SYS}/alpha/include/*.[ch] ${SYS}/alpha/isa/*.[ch] \ - ${SYS}/alpha/tc/*.[ch] ${SYS}/alpha/osf1/*.[ch] \ - ${SYS}/alpha/linux/*.[ch] + ${SYS}/alpha/tc/*.[ch] ${SYS}/alpha/osf1/*.[ch] AALPHA= ${SYS}/alpha/alpha/*.s tags:: diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES index 7b4f25b..47233e0 100644 --- a/sys/alpha/conf/NOTES +++ b/sys/alpha/conf/NOTES @@ -62,10 +62,3 @@ device tga # TGA video card driver # Enable OSF/1 ABI emulation options COMPAT_OSF1 - -# Enable Linux ABI emulation (requires COMPAT_OSF1) -options COMPAT_LINUX - -# Enable the linux-like proc filesystem support (requires COMPAT_LINUX -# and PSEUDOFS) -options LINPROCFS diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 7ef2e6f..530afbb 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -73,8 +73,8 @@ maxusers 10 makeoptions CONF_CFLAGS=-fno-builtin #Don't allow use of memcmp, etc. #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols #makeoptions KERNEL=foo #Build kernel "foo" and install "/foo" -# Only build Linux API modules and plus those parts of the sound system I need. -#makeoptions MODULES_OVERRIDE="linux sound/sound sound/driver/maestro3" +# Only build ext2fs module plus those parts of the sound system I need. +#makeoptions MODULES_OVERRIDE="ext2fs sound/sound sound/driver/maestro3" makeoptions DESTDIR=/tmp # diff --git a/sys/conf/files b/sys/conf/files index 922a84c..e59de53 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -99,7 +99,6 @@ coda/coda_subr.c optional vcoda coda/coda_venus.c optional vcoda coda/coda_vfsops.c optional vcoda coda/coda_vnops.c optional vcoda -compat/linprocfs/linprocfs.c optional linprocfs contrib/altq/altq/altq_cbq.c optional altq \ compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/altq/altq/altq_cdnr.c optional altq diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha index 3913a07..17b9f16 100644 --- a/sys/conf/files.alpha +++ b/sys/conf/files.alpha @@ -8,18 +8,6 @@ # dependency lines other than the first are silently ignored. # # -linux_genassym.o optional compat_linux \ - dependency "$S/alpha/linux/linux_genassym.c" \ - compile-with "${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}" \ - no-obj no-implicit-rule \ - clean "linux_genassym.o" -# -linux_assym.h optional compat_linux \ - dependency "$S/kern/genassym.sh linux_genassym.o" \ - compile-with "sh $S/kern/genassym.sh linux_genassym.o > ${.TARGET}" \ - no-obj no-implicit-rule before-depend \ - clean "linux_assym.h" -# font.h optional sc_dflt_font \ compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ no-obj no-implicit-rule before-depend \ @@ -96,22 +84,16 @@ alpha/alpha/vm_machdep.c standard alpha/isa/isa.c optional isa alpha/isa/isa_dma.c optional isa alpha/isa/mcclock_isa.c optional isa -alpha/linux/linux_dummy.c optional compat_linux -alpha/linux/linux_locore.s optional compat_linux \ - dependency "linux_assym.h" -alpha/linux/linux_machdep.c optional compat_linux -alpha/linux/linux_sysent.c optional compat_linux -alpha/linux/linux_sysvec.c optional compat_linux alpha/mcbus/mcbus.c optional dec_kn300 alpha/mcbus/mcmem.c optional dec_kn300 alpha/mcbus/mcpcia.c optional dec_kn300 -alpha/osf1/imgact_osf1.c optional compat_linux | compat_osf1 -alpha/osf1/osf1_ioctl.c optional compat_linux | compat_osf1 -alpha/osf1/osf1_misc.c optional compat_linux | compat_osf1 -alpha/osf1/osf1_mount.c optional compat_linux | compat_osf1 -alpha/osf1/osf1_signal.c optional compat_linux | compat_osf1 -alpha/osf1/osf1_sysent.c optional compat_linux | compat_osf1 -alpha/osf1/osf1_sysvec.c optional compat_linux | compat_osf1 +alpha/osf1/imgact_osf1.c optional compat_osf1 +alpha/osf1/osf1_ioctl.c optional compat_osf1 +alpha/osf1/osf1_misc.c optional compat_osf1 +alpha/osf1/osf1_mount.c optional compat_osf1 +alpha/osf1/osf1_signal.c optional compat_osf1 +alpha/osf1/osf1_sysent.c optional compat_osf1 +alpha/osf1/osf1_sysvec.c optional compat_osf1 alpha/pci/alphapci_if.m optional pci alpha/pci/apecs.c optional dec_1000a | dec_2100_a50 | \ dec_eb64plus @@ -143,17 +125,6 @@ alpha/tlsb/tlsb.c optional dec_kn8ae alpha/tlsb/tlsbcpu.c optional dec_kn8ae alpha/tlsb/tlsbmem.c optional dec_kn8ae alpha/tlsb/zs_tlsb.c optional dec_kn8ae -compat/linux/linux_file.c optional compat_linux -compat/linux/linux_getcwd.c optional compat_linux -compat/linux/linux_ioctl.c optional compat_linux -compat/linux/linux_ipc.c optional compat_linux -compat/linux/linux_mib.c optional compat_linux -compat/linux/linux_misc.c optional compat_linux -compat/linux/linux_signal.c optional compat_linux -compat/linux/linux_socket.c optional compat_linux -compat/linux/linux_sysctl.c optional compat_linux -compat/linux/linux_stats.c optional compat_linux -compat/linux/linux_util.c optional compat_linux crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \ netsmb diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index a69fe1f..992b258 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -217,6 +217,7 @@ compat/freebsd32/freebsd32_misc.c optional compat_ia32 compat/freebsd32/freebsd32_syscalls.c optional compat_ia32 compat/freebsd32/freebsd32_sysent.c optional compat_ia32 compat/ia32/ia32_sysvec.c optional compat_ia32 +compat/linprocfs/linprocfs.c optional linprocfs kern/imgact_elf32.c optional compat_ia32 # # Linux/i386 binary support diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index b6ac707..007870a 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -83,6 +83,7 @@ rr232x_lib.o optional rr232x \ no-implicit-rule # # +compat/linprocfs/linprocfs.c optional linprocfs compat/linux/linux_file.c optional compat_linux compat/linux/linux_getcwd.c optional compat_linux compat/linux/linux_ioctl.c optional compat_linux diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 3d90ede..bccf942 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -43,6 +43,7 @@ trlld.o optional oltr \ compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ no-implicit-rule # +compat/linprocfs/linprocfs.c optional linprocfs compat/linux/linux_file.c optional compat_linux compat/linux/linux_getcwd.c optional compat_linux compat/linux/linux_ioctl.c optional compat_linux diff --git a/sys/conf/options b/sys/conf/options index 9aed743..c5a19a7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -178,7 +178,6 @@ CODA opt_dontuse.h EXT2FS opt_dontuse.h FDESCFS opt_dontuse.h HPFS opt_dontuse.h -LINPROCFS opt_dontuse.h MSDOSFS opt_dontuse.h NTFS opt_dontuse.h NULLFS opt_dontuse.h diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha index 1b5ea9c..2ee6d78 100644 --- a/sys/conf/options.alpha +++ b/sys/conf/options.alpha @@ -47,5 +47,4 @@ TIMER_FREQ opt_clock.h # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems # (see src/sys/conf/options). -COMPAT_LINUX opt_dontuse.h COMPAT_OSF1 opt_dontuse.h diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index 5415118..f80dfcd 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -17,6 +17,7 @@ COMPAT_IA32 opt_compat.h COMPAT_LINUX32 opt_compat.h #COMPAT_SVR4 opt_dontuse.h #DEBUG_SVR4 opt_svr4.h +LINPROCFS opt_dontuse.h NDISAPI opt_dontuse.h CLK_CALIBRATION_LOOP opt_clock.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 4d2484b..c862c05 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -24,6 +24,7 @@ IBCS2 opt_dontuse.h COMPAT_LINUX opt_dontuse.h COMPAT_SVR4 opt_dontuse.h DEBUG_SVR4 opt_svr4.h +LINPROCFS opt_dontuse.h NDISAPI opt_dontuse.h PECOFF_DEBUG opt_pecoff.h PECOFF_SUPPORT opt_dontuse.h diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index f6f6c95..96ac0fd 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -23,6 +23,7 @@ IBCS2 opt_dontuse.h COMPAT_LINUX opt_dontuse.h COMPAT_SVR4 opt_dontuse.h DEBUG_SVR4 opt_svr4.h +LINPROCFS opt_dontuse.h PECOFF_DEBUG opt_pecoff.h PECOFF_SUPPORT opt_dontuse.h |