[src/trunk]: src/sys/arch/amiga/conf synchronize this with GENERIC.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/amiga/conf synchronize this with GENERIC.
From: is <is%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 06:37:54 +0000

details:   https://anonhg.NetBSD.org/src/rev/92850c70b76b
branches:  trunk
changeset: 480896:92850c70b76b
user:      is <is%NetBSD.org@localhost>
date:      Sat Jan 22 21:09:38 2000 +0000

description:
synchronize this with GENERIC.

diffstat:

 sys/arch/amiga/conf/AMIGA |  23 +++++++++++++++++++++--
 sys/arch/amiga/conf/DRACO |  23 +++++++++++++++++++++--
 2 files changed, 42 insertions(+), 4 deletions(-)

diffs (132 lines):

diff -r c59058f99031 -r 92850c70b76b sys/arch/amiga/conf/AMIGA
--- a/sys/arch/amiga/conf/AMIGA Sat Jan 22 21:05:53 2000 +0000
+++ b/sys/arch/amiga/conf/AMIGA Sat Jan 22 21:09:38 2000 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: AMIGA,v 1.22 1999/10/15 21:54:43 is Exp $
+# $NetBSD: AMIGA,v 1.23 2000/01/22 21:09:38 is Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running make in this directory.
 #
 # Created from: 
-#$ NetBSD: GENERIC,v 1.129 1999/10/15 21:50:34 is Exp $
+#$ NetBSD: GENERIC,v 1.132 2000/01/20 19:12:28 wrstuden Exp $
 
 include "arch/amiga/conf/std.amiga"
 
@@ -32,9 +32,24 @@
 options        M68020          # support for 020/851
 options        FPU_EMULATE     # FPU emulation
 
+#Pull in config fragments for kernel crypto.  This is required for
+#options IPSEC etc. to work. If you want to run with IPSEC, uncomment
+#one of these, based on whether you use crypto-us or crypto-intl, and
+#adjust the prefixes as necessary.
+
+#prefix ../crypto-us/sys
+#cinclude "conf/files.crypto-us"
+#prefix
+#prefix ../crypto-intl/sys
+#cinclude "conf/files.crypto-intl"
+#prefix
 #Networking options
 
 options        INET            # IP networking support (Required)
+options        INET6           # IPV6
+#options       IPSEC           # IP security
+#options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
+#options       IPSEC_DEBUG     # debug for IP security
 #options       GATEWAY         # Packet forwarding
 #options       DIRECTED_BROADCAST      # Broadcast across subnets
 #options       MROUTING        # Multicast routing
@@ -61,6 +76,7 @@
 file-system    FDESC           # user file descriptor filesystem
 file-system    KERNFS          # kernel data-structure filesystem
 file-system    NULLFS          # loopback filesystem
+file-system    OVERLAY         # overlay filesystem
 #file-system   PORTAL          # Portal filesystem
 file-system    PROCFS          # /proc filesystem
 file-system    UMAPFS          # NULLFS + uid and gid remapping
@@ -69,6 +85,7 @@
 #Filesystem options
 options        QUOTA           # User and group quotas in FFS
 #options       FFS_EI          # FFS Endian Independant support
+#options       SOFTDEP         # FFS soft updates support.
 options        NFSSERVER       # Network File System server side code
 #options       EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
                                # immutable) behave as system flags.
@@ -312,6 +329,8 @@
 #pseudo-device ipip            2       # IP Encapsulation within IP (RFC 2003)
 pseudo-device  bpfilter        16      # Berkeley packet filter
 pseudo-device  ipfilter                # IP Filter package
+pseudo-device  gif             4       # IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device faith           1       # IPv[46] tcp relay translation i/f
 
 pseudo-device  view            4       # views (needed for grfcc)
 pseudo-device  pty             16      # pseudo ptys
diff -r c59058f99031 -r 92850c70b76b sys/arch/amiga/conf/DRACO
--- a/sys/arch/amiga/conf/DRACO Sat Jan 22 21:05:53 2000 +0000
+++ b/sys/arch/amiga/conf/DRACO Sat Jan 22 21:09:38 2000 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: DRACO,v 1.41 1999/10/15 21:54:43 is Exp $
+# $NetBSD: DRACO,v 1.42 2000/01/22 21:09:40 is Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running make in this directory.
 #
 # Created from: 
-#$ NetBSD: GENERIC,v 1.129 1999/10/15 21:50:34 is Exp $
+#$ NetBSD: GENERIC,v 1.132 2000/01/20 19:12:28 wrstuden Exp $
 
 include "arch/amiga/conf/std.amiga"
 
@@ -20,9 +20,24 @@
 options        M68060          # support for 060
 options        M060SP          # MC68060 software support (Required for 060)
 
+#Pull in config fragments for kernel crypto.  This is required for
+#options IPSEC etc. to work. If you want to run with IPSEC, uncomment
+#one of these, based on whether you use crypto-us or crypto-intl, and
+#adjust the prefixes as necessary.
+
+#prefix ../crypto-us/sys
+#cinclude "conf/files.crypto-us"
+#prefix
+#prefix ../crypto-intl/sys
+#cinclude "conf/files.crypto-intl"
+#prefix
 #Networking options
 
 options        INET            # IP networking support (Required)
+options        INET6           # IPV6
+#options       IPSEC           # IP security
+#options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
+#options       IPSEC_DEBUG     # debug for IP security
 #options       GATEWAY         # Packet forwarding
 #options       DIRECTED_BROADCAST      # Broadcast across subnets
 #options       MROUTING        # Multicast routing
@@ -49,6 +64,7 @@
 file-system    FDESC           # user file descriptor filesystem
 file-system    KERNFS          # kernel data-structure filesystem
 file-system    NULLFS          # loopback filesystem
+file-system    OVERLAY         # overlay filesystem
 #file-system   PORTAL          # Portal filesystem
 file-system    PROCFS          # /proc filesystem
 file-system    UMAPFS          # NULLFS + uid and gid remapping
@@ -57,6 +73,7 @@
 #Filesystem options
 options        QUOTA           # User and group quotas in FFS
 #options       FFS_EI          # FFS Endian Independant support
+#options       SOFTDEP         # FFS soft updates support.
 options        NFSSERVER       # Network File System server side code
 #options       EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
                                # immutable) behave as system flags.
@@ -206,6 +223,8 @@
 #pseudo-device ipip            2       # IP Encapsulation within IP (RFC 2003)
 pseudo-device  bpfilter        16      # Berkeley packet filter
 pseudo-device  ipfilter                # IP Filter package
+pseudo-device  gif             4       # IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device faith           1       # IPv[46] tcp relay translation i/f
 
 pseudo-device  view            4       # views (needed for grfcc)
 pseudo-device  pty             16      # pseudo ptys

Prev by Date: [src/trunk]: src/share/mk Do the NEED_OWN_INSTALL_TARGET klugery for depend a...
Next by Date: [src/trunk]: src/sys/arch/amiga/conf Tell changers to commit AMIGA and DRACO, ...
Previous by Thread: [src/trunk]: src/share/mk Do the NEED_OWN_INSTALL_TARGET klugery for depend a...
Next by Thread: [src/trunk]: src/sys/arch/amiga/conf Tell changers to commit AMIGA and DRACO, ...
Indexes:

Home | Main Index | Thread Index | Old Index