From nobody@FreeBSD.org  Thu Aug 23 19:06:14 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7CFC71065670
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Aug 2012 19:06:14 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 5DCF18FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Aug 2012 19:06:14 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q7NJ6EeD021549
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Aug 2012 19:06:14 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q7NJ6EfV021541;
	Thu, 23 Aug 2012 19:06:14 GMT
	(envelope-from nobody)
Message-Id: <201208231906.q7NJ6EfV021541@red.freebsd.org>
Date: Thu, 23 Aug 2012 19:06:14 GMT
From: Luiz Otavio O Souza <loos.br@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Remove duplicated GEOM_PART_* options from MIPS kernels
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         170931
>Category:       kern
>Synopsis:       [mips] [patch] Remove duplicated GEOM_PART_* options from MIPS kernels
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-mips
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 23 19:10:00 UTC 2012
>Closed-Date:    Thu Aug 23 22:39:40 UTC 2012
>Last-Modified:  Thu Aug 23 22:39:40 UTC 2012
>Originator:     Luiz Otavio O Souza
>Release:        -current
>Organization:
>Environment:
FreeBSD server01 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r238303: Mon Jul  9 21:47:19 BRT 2012     root@server01:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
The GEOM_PART_MBR and GEOM_PART_BSD options are already defined in sys/mips/conf/DEFAULTS so adding it to any other MIPS kernel will generate the following warning:


--------------------------------------------------------------
>How-To-Repeat:

>Fix:

The following patch is also available at: http://loos.no-ip.org/rb/duplicated-kernel-options.patch



Patch attached with submission follows:

Index: sys/mips/conf/AP96
===================================================================
--- sys/mips/conf/AP96	(revision 239611)
+++ sys/mips/conf/AP96	(working copy)
@@ -22,8 +22,6 @@
 options		AR71XX_ENV_UBOOT
 
 # For DOS - enable if required
-options 	GEOM_PART_BSD
-options 	GEOM_PART_MBR
 options 	MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
Index: sys/mips/conf/ROUTERSTATION
===================================================================
--- sys/mips/conf/ROUTERSTATION	(revision 239611)
+++ sys/mips/conf/ROUTERSTATION	(working copy)
@@ -16,8 +16,6 @@
 options		GEOM_UZIP
 
 # For DOS
-options		GEOM_PART_BSD
-options		GEOM_PART_MBR
 options		MSDOSFS
 
 # Boot path - redboot MFS
Index: sys/mips/conf/TP-WN1043ND
===================================================================
--- sys/mips/conf/TP-WN1043ND	(revision 239611)
+++ sys/mips/conf/TP-WN1043ND	(working copy)
@@ -29,8 +29,6 @@
 
 # read MSDOS formatted disks - USB
 options		MSDOSFS
-options		GEOM_PART_BSD
-options		GEOM_PART_MBR
 
 # Enable the uboot environment stuff rather then the
 # redboot stuff.
Index: sys/mips/conf/PB92
===================================================================
--- sys/mips/conf/PB92	(revision 239611)
+++ sys/mips/conf/PB92	(working copy)
@@ -106,8 +106,6 @@
 #device		da
 
 # Read MSDOS formatted disks
-options		GEOM_PART_BSD
-options		GEOM_PART_MBR
 # options		MSDOSFS
 
 # GPIO Bus
Index: sys/mips/conf/RSPRO
===================================================================
--- sys/mips/conf/RSPRO	(revision 239611)
+++ sys/mips/conf/RSPRO	(working copy)
@@ -17,8 +17,6 @@
 options		GEOM_UZIP
 
 # For DOS
-options		GEOM_PART_BSD
-options		GEOM_PART_MBR
 options		MSDOSFS
 
 # For etherswitch support
Index: sys/mips/conf/PB47
===================================================================
--- sys/mips/conf/PB47	(revision 239611)
+++ sys/mips/conf/PB47	(working copy)
@@ -27,8 +27,6 @@
 options		AR71XX_REALMEM=64*1024*1024
 
 # For DOS - enable if required
-options		GEOM_PART_BSD
-options		GEOM_PART_MBR
 options		MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
Index: sys/mips/conf/AP93
===================================================================
--- sys/mips/conf/AP93	(revision 239611)
+++ sys/mips/conf/AP93	(working copy)
@@ -108,8 +108,6 @@
 #device		da
 
 # Read MSDOS formatted disks
-options		GEOM_PART_BSD
-options		GEOM_PART_MBR
 #options		MSDOSFS
 
 # GPIO Bus
Index: sys/mips/conf/RSPRO_STANDALONE
===================================================================
--- sys/mips/conf/RSPRO_STANDALONE	(revision 239611)
+++ sys/mips/conf/RSPRO_STANDALONE	(working copy)
@@ -18,8 +18,6 @@
 options		GEOM_UZIP
 
 # For DOS
-options		GEOM_PART_BSD
-options		GEOM_PART_MBR
 options		MSDOSFS
 
 # .. first DOS-partitioned, BSD sliced flash disk


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-mips 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu Aug 23 21:24:04 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170931 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/170931: commit references a PR
Date: Thu, 23 Aug 2012 22:24:09 +0000 (UTC)

 Author: ray
 Date: Thu Aug 23 22:23:56 2012
 New Revision: 239625
 URL: http://svn.freebsd.org/changeset/base/239625
 
 Log:
   Remove duplicated GEOM_PART_* options.
   
   PR:		170931
   Approved by:	adrian
 
 Modified:
   head/sys/mips/conf/AP93
   head/sys/mips/conf/AP96
   head/sys/mips/conf/PB47
   head/sys/mips/conf/PB92
   head/sys/mips/conf/ROUTERSTATION
   head/sys/mips/conf/RSPRO
   head/sys/mips/conf/RSPRO_STANDALONE
   head/sys/mips/conf/TP-WN1043ND
 
 Modified: head/sys/mips/conf/AP93
 ==============================================================================
 --- head/sys/mips/conf/AP93	Thu Aug 23 21:32:02 2012	(r239624)
 +++ head/sys/mips/conf/AP93	Thu Aug 23 22:23:56 2012	(r239625)
 @@ -108,8 +108,6 @@ options		USB_HOST_ALIGN=32
  #device		da
  
  # Read MSDOS formatted disks
 -options		GEOM_PART_BSD
 -options		GEOM_PART_MBR
  #options		MSDOSFS
  
  # GPIO Bus
 
 Modified: head/sys/mips/conf/AP96
 ==============================================================================
 --- head/sys/mips/conf/AP96	Thu Aug 23 21:32:02 2012	(r239624)
 +++ head/sys/mips/conf/AP96	Thu Aug 23 22:23:56 2012	(r239625)
 @@ -22,8 +22,6 @@ options		AR71XX_REALMEM=64*1024*1024
  options		AR71XX_ENV_UBOOT
  
  # For DOS - enable if required
 -options 	GEOM_PART_BSD
 -options 	GEOM_PART_MBR
  options 	MSDOSFS
  
  # uncompress - to boot read-only lzma natively from flash
 
 Modified: head/sys/mips/conf/PB47
 ==============================================================================
 --- head/sys/mips/conf/PB47	Thu Aug 23 21:32:02 2012	(r239624)
 +++ head/sys/mips/conf/PB47	Thu Aug 23 22:23:56 2012	(r239625)
 @@ -27,8 +27,6 @@ options		AR71XX_ENV_UBOOT
  options		AR71XX_REALMEM=64*1024*1024
  
  # For DOS - enable if required
 -options		GEOM_PART_BSD
 -options		GEOM_PART_MBR
  options		MSDOSFS
  
  # uncompress - to boot read-only lzma natively from flash
 
 Modified: head/sys/mips/conf/PB92
 ==============================================================================
 --- head/sys/mips/conf/PB92	Thu Aug 23 21:32:02 2012	(r239624)
 +++ head/sys/mips/conf/PB92	Thu Aug 23 22:23:56 2012	(r239625)
 @@ -106,8 +106,6 @@ options		USB_HOST_ALIGN=32
  #device		da
  
  # Read MSDOS formatted disks
 -options		GEOM_PART_BSD
 -options		GEOM_PART_MBR
  # options		MSDOSFS
  
  # GPIO Bus
 
 Modified: head/sys/mips/conf/ROUTERSTATION
 ==============================================================================
 --- head/sys/mips/conf/ROUTERSTATION	Thu Aug 23 21:32:02 2012	(r239624)
 +++ head/sys/mips/conf/ROUTERSTATION	Thu Aug 23 22:23:56 2012	(r239625)
 @@ -16,8 +16,6 @@ device		geom_uzip	# compressed in-memory
  options		GEOM_UZIP
  
  # For DOS
 -options		GEOM_PART_BSD
 -options		GEOM_PART_MBR
  options		MSDOSFS
  
  # Boot path - redboot MFS
 
 Modified: head/sys/mips/conf/RSPRO
 ==============================================================================
 --- head/sys/mips/conf/RSPRO	Thu Aug 23 21:32:02 2012	(r239624)
 +++ head/sys/mips/conf/RSPRO	Thu Aug 23 22:23:56 2012	(r239625)
 @@ -17,8 +17,6 @@ device		geom_uzip	# compressed in-memory
  options		GEOM_UZIP
  
  # For DOS
 -options		GEOM_PART_BSD
 -options		GEOM_PART_MBR
  options		MSDOSFS
  
  # For etherswitch support
 
 Modified: head/sys/mips/conf/RSPRO_STANDALONE
 ==============================================================================
 --- head/sys/mips/conf/RSPRO_STANDALONE	Thu Aug 23 21:32:02 2012	(r239624)
 +++ head/sys/mips/conf/RSPRO_STANDALONE	Thu Aug 23 22:23:56 2012	(r239625)
 @@ -18,8 +18,6 @@ device		geom_uzip	# compressed in-memory
  options		GEOM_UZIP
  
  # For DOS
 -options		GEOM_PART_BSD
 -options		GEOM_PART_MBR
  options		MSDOSFS
  
  # .. first DOS-partitioned, BSD sliced flash disk
 
 Modified: head/sys/mips/conf/TP-WN1043ND
 ==============================================================================
 --- head/sys/mips/conf/TP-WN1043ND	Thu Aug 23 21:32:02 2012	(r239624)
 +++ head/sys/mips/conf/TP-WN1043ND	Thu Aug 23 22:23:56 2012	(r239625)
 @@ -29,8 +29,6 @@ device		rtl8366rb
  
  # read MSDOS formatted disks - USB
  options		MSDOSFS
 -options		GEOM_PART_BSD
 -options		GEOM_PART_MBR
  
  # Enable the uboot environment stuff rather then the
  # redboot stuff.
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: ray 
State-Changed-When: Thu Aug 23 22:38:20 UTC 2012 
State-Changed-Why:  
Fixed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170931 
>Unformatted:
 >>> Kernel build for RSPRO started on Thu Aug 23 10:20:46 BRT 2012
 --------------------------------------------------------------
 ===> RSPRO
 mkdir -p /data/rb/rb450g/obj/mips.mips/data/rb/rb450g/src/sys
 
 --------------------------------------------------------------
 >>> stage 1: configuring the kernel
 --------------------------------------------------------------
 cd /data/rb/rb450g/src/sys/mips/conf;  PATH=/data/rb/rb450g/obj/mips.mips/data/rb/rb450g/src/tmp/legacy/usr/sbin:/data/rb/rb450g/obj/mips.mips/data/rb/rb450g/src/tmp/legacy/usr/bin:/data/rb/rb450g/obj/mips.mips/data/rb/rb450g/src/tmp/legacy/usr/games:/da ta/rb/rb450g/obj/mips.mips/data/rb/rb450g/src/tmp/usr/sbin:/data/rb/rb450g/obj/mips.mips/data/rb/rb450g/src/tmp/usr/bin:/data/rb/rb450g/obj/mips.mips/data/rb/rb450g/src/tmp/usr/games:/sbin:/bin:/usr/sbin:/usr/bin  config  -d /data/rb/rb450g/obj/mips.mips /data/rb/rb450g/src/sys/RSPRO  /data/rb/rb450g/src/sys/mips/conf/RSPRO
 WARNING: duplicate option `GEOM_PART_BSD' encountered.
 WARNING: duplicate option `GEOM_PART_MBR' encountered.
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Kernel build directory is /data/rb/rb450g/obj/mips.mips/data/rb/rb450g/src/sys/RSPRO
 Don't forget to do ``make cleandepend && make depend''
 
