From owner-freebsd-bugs Tue Mar 14 21: 0: 5 2000 Delivered-To: freebsd-bugs@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id DC4BD37B50C for ; Tue, 14 Mar 2000 21:00:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id VAA66748; Tue, 14 Mar 2000 21:00:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from localhost.posi.net (alc-182.alcnet.com [63.69.28.182]) by hub.freebsd.org (Postfix) with ESMTP id 7465037B89B for ; Tue, 14 Mar 2000 20:51:47 -0800 (PST) (envelope-from kbyanc@localhost.posi.net) Received: (from kbyanc@localhost) by localhost.posi.net (8.9.3/8.9.3) id AAA00489; Wed, 15 Mar 2000 00:02:21 -0500 (EST) (envelope-from kbyanc) Message-Id: <200003150502.AAA00489@localhost.posi.net> Date: Wed, 15 Mar 2000 00:02:21 -0500 (EST) From: kbyanc@posi.net Reply-To: kbyanc@posi.net To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: conf/17383: [patch] PicoBSD kernel configs include obsolete 'conflicts' Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 17383 >Category: conf >Synopsis: 4.0 config yields warnings on PicoBSD's use of 'conflicts' >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Mar 14 21:00:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Kelly Yancey >Release: FreeBSD 4.0-CURRENT i386 >Organization: >Environment: FreeBSD laptop 4.0-CURRENT FreeBSD 4.0-CURRENT #4: Wed Mar 8 10:21:01 EST 2000 root@laptop:/usr/src/sys/compile/LAPTOP i386 >Description: PicoBSD kernel config files include the now-obsolete 'conflicts' keyword which causes the config utility to output warnings. >How-To-Repeat: Build PicoBSD floppy using one of the default configurations. >Fix: Build a custom PicoBSD kernel config which doesn't include the 'conflicts' keyword. The attached patch fixes the kernel configs shipped as default configurations. diff -ruN src/release/picobsd.orig/bridge/PICOBSD src/release/picobsd/bridge/PICOBSD --- src/release/picobsd.orig/bridge/PICOBSD Tue Mar 14 23:39:37 2000 +++ src/release/picobsd/bridge/PICOBSD Tue Mar 14 23:40:08 2000 @@ -62,7 +62,7 @@ device atkbd0 at atkbdc? irq 1 device psm0 at atkbdc? irq 12 -device vga0 at isa? conflicts +device vga0 at isa? # syscons is the default console driver, resembling an SCO console device sc0 at isa? diff -ruN src/release/picobsd.orig/custom/PICOBSD-C src/release/picobsd/custom/PICOBSD-C --- src/release/picobsd.orig/custom/PICOBSD-C Tue Mar 14 23:39:28 2000 +++ src/release/picobsd/custom/PICOBSD-C Tue Mar 14 23:40:42 2000 @@ -118,7 +118,7 @@ device atkbd0 at atkbdc? irq 1 device psm0 at atkbdc? irq 12 -device vga0 at isa? port ? conflicts +device vga0 at isa? port ? # splash screen/screen saver # pseudo-device splash diff -ruN src/release/picobsd.orig/dial/PICOBSD src/release/picobsd/dial/PICOBSD --- src/release/picobsd.orig/dial/PICOBSD Tue Mar 14 23:39:25 2000 +++ src/release/picobsd/dial/PICOBSD Tue Mar 14 23:41:05 2000 @@ -48,7 +48,7 @@ device atkbd0 at atkbdc? irq 1 device psm0 at atkbdc? irq 12 -device vga0 at isa? port ? conflicts +device vga0 at isa? port ? # syscons is the default console driver, resembling an SCO console device sc0 at isa? diff -ruN src/release/picobsd.orig/isp/PICOBSD src/release/picobsd/isp/PICOBSD --- src/release/picobsd.orig/isp/PICOBSD Tue Mar 14 23:39:35 2000 +++ src/release/picobsd/isp/PICOBSD Tue Mar 14 23:41:27 2000 @@ -56,7 +56,7 @@ # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc0 at isa? port IO_KBD device atkbd0 at atkbdc? irq 1 -device vga0 at isa? conflicts +device vga0 at isa? # syscons is the default console driver, resembling an SCO console device sc0 at isa? diff -ruN src/release/picobsd.orig/net/PICOBSD src/release/picobsd/net/PICOBSD --- src/release/picobsd.orig/net/PICOBSD Tue Mar 14 23:39:35 2000 +++ src/release/picobsd/net/PICOBSD Tue Mar 14 23:41:43 2000 @@ -52,7 +52,7 @@ device atkbdc0 at isa? port IO_KBD device atkbd0 at atkbdc? irq 1 -device vga0 at isa? conflicts +device vga0 at isa? # syscons is the default console driver, resembling an SCO console device sc0 at isa? diff -ruN src/release/picobsd.orig/router/PICOBSD src/release/picobsd/router/PICOBSD --- src/release/picobsd.orig/router/PICOBSD Tue Mar 14 23:39:33 2000 +++ src/release/picobsd/router/PICOBSD Tue Mar 14 23:42:06 2000 @@ -48,7 +48,7 @@ device atkbdc0 at isa? port IO_KBD device atkbd0 at atkbdc? irq 1 -device vga0 at isa? port ? conflicts +device vga0 at isa? port ? # syscons is the default console driver, resembling an SCO console device sc0 at isa? >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message