[src/netbsd-7]: src Apply patch (requested by bouyer in ticket #295):

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/11ebeca660d8
branches:  netbsd-7
changeset: 798667:11ebeca660d8
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Dec 04 19:18:09 2014 +0000

description:
Apply patch (requested by bouyer in ticket #295):
Build the DRMKMS kernel on x86, and provide a sysinst option to
install it.

diffstat:

 etc/etc.amd64/Makefile.inc           |  3 ++-
 etc/etc.i386/Makefile.inc            |  3 ++-
 usr.sbin/sysinst/arch/amd64/md.h     |  4 +++-
 usr.sbin/sysinst/arch/i386/md.h      |  4 +++-
 usr.sbin/sysinst/arch/i386/msg.md.de |  3 ++-
 usr.sbin/sysinst/arch/i386/msg.md.en |  3 ++-
 usr.sbin/sysinst/arch/i386/msg.md.es |  3 ++-
 usr.sbin/sysinst/arch/i386/msg.md.fr |  3 ++-
 usr.sbin/sysinst/arch/i386/msg.md.pl |  3 ++-
 9 files changed, 20 insertions(+), 9 deletions(-)

diffs (144 lines):

diff -r 5a20b5bcfc03 -r 11ebeca660d8 etc/etc.amd64/Makefile.inc
--- a/etc/etc.amd64/Makefile.inc        Thu Dec 04 11:09:28 2014 +0000
+++ b/etc/etc.amd64/Makefile.inc        Thu Dec 04 19:18:09 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.14 2012/07/04 13:54:20 reinoud Exp $
+#      $NetBSD: Makefile.inc,v 1.14.12.1 2014/12/04 19:18:09 snj Exp $
 #
 #      etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
 #
@@ -8,6 +8,7 @@
 
 KERNEL_SETS=           GENERIC
 KERNEL_SETS+=          XEN3_DOM0 XEN3_DOMU
+KERNEL_SETS+=          DRMKMS
 # KERNEL_SETS+=                GENERIC_USERMODE
 
 BUILD_KERNELS=         INSTALL INSTALL_XEN3_DOMU
diff -r 5a20b5bcfc03 -r 11ebeca660d8 etc/etc.i386/Makefile.inc
--- a/etc/etc.i386/Makefile.inc Thu Dec 04 11:09:28 2014 +0000
+++ b/etc/etc.i386/Makefile.inc Thu Dec 04 19:18:09 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.67 2012/07/04 13:54:20 reinoud Exp $
+#      $NetBSD: Makefile.inc,v 1.67.12.1 2014/12/04 19:18:09 snj Exp $
 #
 #      etc.i386/Makefile.inc -- i386-specific etc Makefile targets
 #
@@ -8,6 +8,7 @@
 
 KERNEL_SETS=   GENERIC
 KERNEL_SETS+=  MONOLITHIC
+KERNEL_SETS+=  DRMKMS
 KERNEL_SETS+=  XEN3_DOM0
 KERNEL_SETS+=  XEN3_DOMU
 KERNEL_SETS+=  XEN3PAE_DOM0
diff -r 5a20b5bcfc03 -r 11ebeca660d8 usr.sbin/sysinst/arch/amd64/md.h
--- a/usr.sbin/sysinst/arch/amd64/md.h  Thu Dec 04 11:09:28 2014 +0000
+++ b/usr.sbin/sysinst/arch/amd64/md.h  Thu Dec 04 19:18:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.1 2014/07/26 19:30:44 dholland Exp $  */
+/*     $NetBSD: md.h,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -80,8 +80,10 @@
  * from floppy.
  */
 #define SET_KERNEL_1_NAME      "kern-GENERIC"
+#define SET_KERNEL_2_NAME      "kern-DRMKMS"
 
 #define SET_KERNEL_GENERIC     SET_KERNEL_1
+#define SET_KERNEL_DRMKMS      SET_KERNEL_2
 
 /*
  * Disk names accepted as valid targets for a from-scratch installation.
diff -r 5a20b5bcfc03 -r 11ebeca660d8 usr.sbin/sysinst/arch/i386/md.h
--- a/usr.sbin/sysinst/arch/i386/md.h   Thu Dec 04 11:09:28 2014 +0000
+++ b/usr.sbin/sysinst/arch/i386/md.h   Thu Dec 04 19:18:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.1 2014/07/26 19:30:45 dholland Exp $  */
+/*     $NetBSD: md.h,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -75,8 +75,10 @@
  */
 
 #define SET_KERNEL_GENERIC     SET_KERNEL_1
+#define SET_KERNEL_DRMKMS      SET_KERNEL_2
 
 #define SET_KERNEL_1_NAME      "kern-GENERIC"
+#define SET_KERNEL_2_NAME      "kern-DRMKMS"
 
 /*
  * Disk names accepted as valid targets for a from-scratch installation.
diff -r 5a20b5bcfc03 -r 11ebeca660d8 usr.sbin/sysinst/arch/i386/msg.md.de
--- a/usr.sbin/sysinst/arch/i386/msg.md.de      Thu Dec 04 11:09:28 2014 +0000
+++ b/usr.sbin/sysinst/arch/i386/msg.md.de      Thu Dec 04 19:18:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.md.de,v 1.1 2014/07/26 19:30:45 dholland Exp $     */
+/*     $NetBSD: msg.md.de,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -165,3 +165,4 @@
 NetBSD Bootcodes updaten?}
 
 message set_kernel_1   {Kernel (GENERIC)}
+message set_kernel_2   {Kernel (DRMKMS)}
diff -r 5a20b5bcfc03 -r 11ebeca660d8 usr.sbin/sysinst/arch/i386/msg.md.en
--- a/usr.sbin/sysinst/arch/i386/msg.md.en      Thu Dec 04 11:09:28 2014 +0000
+++ b/usr.sbin/sysinst/arch/i386/msg.md.en      Thu Dec 04 19:18:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.md.en,v 1.1 2014/07/26 19:30:45 dholland Exp $     */
+/*     $NetBSD: msg.md.en,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -161,3 +161,4 @@
 the latest version of the NetBSD bootcode?}
 
 message set_kernel_1   {Kernel (GENERIC)}
+message set_kernel_2   {Kernel (DRMKMS)}
diff -r 5a20b5bcfc03 -r 11ebeca660d8 usr.sbin/sysinst/arch/i386/msg.md.es
--- a/usr.sbin/sysinst/arch/i386/msg.md.es      Thu Dec 04 11:09:28 2014 +0000
+++ b/usr.sbin/sysinst/arch/i386/msg.md.es      Thu Dec 04 19:18:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.md.es,v 1.1 2014/07/26 19:30:45 dholland Exp $     */
+/*     $NetBSD: msg.md.es,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -162,3 +162,4 @@
 Record a la ultima versión del código de arranque de NetBSD?}
 
 message set_kernel_1  {Núcleo (GENERIC)}
+message set_kernel_2  {Núcleo (DRMKMS)}
diff -r 5a20b5bcfc03 -r 11ebeca660d8 usr.sbin/sysinst/arch/i386/msg.md.fr
--- a/usr.sbin/sysinst/arch/i386/msg.md.fr      Thu Dec 04 11:09:28 2014 +0000
+++ b/usr.sbin/sysinst/arch/i386/msg.md.fr      Thu Dec 04 19:18:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.md.fr,v 1.1 2014/07/26 19:30:45 dholland Exp $     */
+/*     $NetBSD: msg.md.fr,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -157,3 +157,4 @@
 avec la dernière version du code d'amorçage de NetBSD ?}
 
 message set_kernel_1   {Kernel (GENERIC)}
+message set_kernel_2   {Kernel (DRMKMS)}
diff -r 5a20b5bcfc03 -r 11ebeca660d8 usr.sbin/sysinst/arch/i386/msg.md.pl
--- a/usr.sbin/sysinst/arch/i386/msg.md.pl      Thu Dec 04 11:09:28 2014 +0000
+++ b/usr.sbin/sysinst/arch/i386/msg.md.pl      Thu Dec 04 19:18:09 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.md.pl,v 1.1 2014/07/26 19:30:45 dholland Exp $     */
+/*     $NetBSD: msg.md.pl,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $      */
 /*     Based on english version: */
 /*     NetBSD: msg.md.en,v 1.24 2001/01/27 07:34:39 jmc Exp    */
 
@@ -156,3 +156,4 @@
 kodu rozruchowego NetBSD?}
 
 message set_kernel_1   {Kernel (GENERIC)}
+message set_kernel_2   {Kernel (DRMKMS)}