Module Name: src
Committed By: snj
Date: Thu Dec 4 19:18:09 UTC 2014
Modified Files:
src/etc/etc.amd64 [netbsd-7]: Makefile.inc
src/etc/etc.i386 [netbsd-7]: Makefile.inc
src/usr.sbin/sysinst/arch/amd64 [netbsd-7]: md.h
src/usr.sbin/sysinst/arch/i386 [netbsd-7]: md.h msg.md.de msg.md.en
msg.md.es msg.md.fr msg.md.pl
Log Message:
Apply patch (requested by bouyer in ticket #295):
Build the DRMKMS kernel on x86, and provide a sysinst option to
install it.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.12.1 src/etc/etc.amd64/Makefile.inc
cvs rdiff -u -r1.67 -r1.67.12.1 src/etc/etc.i386/Makefile.inc
cvs rdiff -u -r1.1 -r1.1.4.1 src/usr.sbin/sysinst/arch/amd64/md.h
cvs rdiff -u -r1.1 -r1.1.4.1 src/usr.sbin/sysinst/arch/i386/md.h \
src/usr.sbin/sysinst/arch/i386/msg.md.de \
src/usr.sbin/sysinst/arch/i386/msg.md.en \
src/usr.sbin/sysinst/arch/i386/msg.md.es \
src/usr.sbin/sysinst/arch/i386/msg.md.fr \
src/usr.sbin/sysinst/arch/i386/msg.md.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.amd64/Makefile.inc
diff -u src/etc/etc.amd64/Makefile.inc:1.14 src/etc/etc.amd64/Makefile.inc:1.14.12.1
--- src/etc/etc.amd64/Makefile.inc:1.14 Wed Jul 4 13:54:20 2012
+++ src/etc/etc.amd64/Makefile.inc Thu Dec 4 19:18:09 2014
@@ -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
Index: src/etc/etc.i386/Makefile.inc
diff -u src/etc/etc.i386/Makefile.inc:1.67 src/etc/etc.i386/Makefile.inc:1.67.12.1
--- src/etc/etc.i386/Makefile.inc:1.67 Wed Jul 4 13:54:20 2012
+++ src/etc/etc.i386/Makefile.inc Thu Dec 4 19:18:09 2014
@@ -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
Index: src/usr.sbin/sysinst/arch/amd64/md.h
diff -u src/usr.sbin/sysinst/arch/amd64/md.h:1.1 src/usr.sbin/sysinst/arch/amd64/md.h:1.1.4.1
--- src/usr.sbin/sysinst/arch/amd64/md.h:1.1 Sat Jul 26 19:30:44 2014
+++ src/usr.sbin/sysinst/arch/amd64/md.h Thu Dec 4 19:18:09 2014
@@ -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.
Index: src/usr.sbin/sysinst/arch/i386/md.h
diff -u src/usr.sbin/sysinst/arch/i386/md.h:1.1 src/usr.sbin/sysinst/arch/i386/md.h:1.1.4.1
--- src/usr.sbin/sysinst/arch/i386/md.h:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/i386/md.h Thu Dec 4 19:18:09 2014
@@ -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.
Index: src/usr.sbin/sysinst/arch/i386/msg.md.de
diff -u src/usr.sbin/sysinst/arch/i386/msg.md.de:1.1 src/usr.sbin/sysinst/arch/i386/msg.md.de:1.1.4.1
--- src/usr.sbin/sysinst/arch/i386/msg.md.de:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/i386/msg.md.de Thu Dec 4 19:18:09 2014
@@ -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 @@ message updatembr
NetBSD Bootcodes updaten?}
message set_kernel_1 {Kernel (GENERIC)}
+message set_kernel_2 {Kernel (DRMKMS)}
Index: src/usr.sbin/sysinst/arch/i386/msg.md.en
diff -u src/usr.sbin/sysinst/arch/i386/msg.md.en:1.1 src/usr.sbin/sysinst/arch/i386/msg.md.en:1.1.4.1
--- src/usr.sbin/sysinst/arch/i386/msg.md.en:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/i386/msg.md.en Thu Dec 4 19:18:09 2014
@@ -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 @@ message updatembr
the latest version of the NetBSD bootcode?}
message set_kernel_1 {Kernel (GENERIC)}
+message set_kernel_2 {Kernel (DRMKMS)}
Index: src/usr.sbin/sysinst/arch/i386/msg.md.es
diff -u src/usr.sbin/sysinst/arch/i386/msg.md.es:1.1 src/usr.sbin/sysinst/arch/i386/msg.md.es:1.1.4.1
--- src/usr.sbin/sysinst/arch/i386/msg.md.es:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/i386/msg.md.es Thu Dec 4 19:18:09 2014
@@ -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 @@ message updatembr
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)}
Index: src/usr.sbin/sysinst/arch/i386/msg.md.fr
diff -u src/usr.sbin/sysinst/arch/i386/msg.md.fr:1.1 src/usr.sbin/sysinst/arch/i386/msg.md.fr:1.1.4.1
--- src/usr.sbin/sysinst/arch/i386/msg.md.fr:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/i386/msg.md.fr Thu Dec 4 19:18:09 2014
@@ -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 @@ message updatembr
avec la derni�re version du code d'amor�age de NetBSD ?}
message set_kernel_1 {Kernel (GENERIC)}
+message set_kernel_2 {Kernel (DRMKMS)}
Index: src/usr.sbin/sysinst/arch/i386/msg.md.pl
diff -u src/usr.sbin/sysinst/arch/i386/msg.md.pl:1.1 src/usr.sbin/sysinst/arch/i386/msg.md.pl:1.1.4.1
--- src/usr.sbin/sysinst/arch/i386/msg.md.pl:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/i386/msg.md.pl Thu Dec 4 19:18:09 2014
@@ -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 @@ message updatembr
kodu rozruchowego NetBSD?}
message set_kernel_1 {Kernel (GENERIC)}
+message set_kernel_2 {Kernel (DRMKMS)}
