From nobody@FreeBSD.org  Mon Dec  9 12:20:05 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 19C8F1A4
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  9 Dec 2013 12:20:05 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id DF4DA14F4
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  9 Dec 2013 12:20:04 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rB9CK4Me020859
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 9 Dec 2013 12:20:04 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rB9CK4XB020836;
	Mon, 9 Dec 2013 12:20:04 GMT
	(envelope-from nobody)
Message-Id: <201312091220.rB9CK4XB020836@oldred.freebsd.org>
Date: Mon, 9 Dec 2013 12:20:04 GMT
From: Oliver Pinter <oliver.pntr@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] hook-in-iwn2000fw-and-iwn2030fw-to-kernel-build
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         184631
>Category:       kern
>Synopsis:       [iwn] [patch] hook in iwn2000fw and iwn2030fw to kernel build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    brueffer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 09 12:30:00 UTC 2013
>Closed-Date:    Sun Feb 16 11:41:01 CET 2014
>Last-Modified:  Sun Feb 16 11:41:01 CET 2014
>Originator:     Oliver Pinter
>Release:        FreeBSD 11-CURRENT
>Organization:
>Environment:
FreeBSD 11-CURRENT
>Description:
the kernel image does not contained the iwn2030fw 
>How-To-Repeat:
add iwnfw to kernel config, set MODULES_OVERRIDE= , compile the kernel
boot the new kernel, and the kernel image does not contained the iwn2030fw
>Fix:
see the attached patch

Patch attached with submission follows:

From e608dcee38e93db28b15632d9e461dd87f3ab3c7 Mon Sep 17 00:00:00 2001
From: Oliver Pinter <oliver.pntr@gmail.com>
Date: Sun, 8 Dec 2013 01:15:16 +0100
Subject: [PATCH] hook in iwn2000fw and iwn2030fw to kernel build

Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
---
 sys/conf/files | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/sys/conf/files b/sys/conf/files
index 67a65d2..2fba689 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1605,6 +1605,34 @@ iwn1000.fw			optional iwn1000fw | iwnfw		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn1000.fw"
+iwn2000fw.c			optional iwn2000fw | iwnfw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn2000.fw:iwn2000fw -miwn2000fw -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"iwn2000fw.c"
+iwn2000fw.fwo			optional iwn2000fw | iwnfw		\
+	dependency	"iwn2000.fw"					\
+	compile-with	"${NORMAL_FWO}"					\
+	no-implicit-rule						\
+	clean		"iwn2000fw.fwo"
+iwn2000.fw			optional iwn2000fw | iwnfw		\
+	dependency	"$S/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu" \
+	compile-with	"${NORMAL_FW}"					\
+	no-obj no-implicit-rule						\
+	clean		"iwn2000.fw"
+iwn2030fw.c			optional iwn2030fw | iwnfw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn2030.fw:iwn2030fw -miwn2030fw -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"iwn2030fw.c"
+iwn2030fw.fwo			optional iwn2030fw | iwnfw		\
+	dependency	"iwn2030.fw"					\
+	compile-with	"${NORMAL_FWO}"					\
+	no-implicit-rule						\
+	clean		"iwn2030fw.fwo"
+iwn2030.fw			optional iwn2030fw | iwnfw		\
+	dependency	"$S/contrib/dev/iwn/iwnwifi-2030-18.168.6.1.fw.uu" \
+	compile-with	"${NORMAL_FW}"					\
+	no-obj no-implicit-rule						\
+	clean		"iwn2030.fw"
 iwn4965fw.c			optional iwn4965fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn4965.fw:iwn4965fw -miwn4965fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
-- 
1.8.4



>Release-Note:
>Audit-Trail:

From: Oliver Pinter <oliver.pntr@gmail.com>
To: freebsd-gnats-submit@freebsd.org
Cc: Adrian Chadd <adrian@freebsd.org>
Subject: Re: kern/184631: [PATCH] hook-in-iwn2000fw-and-iwn2030fw-to-kernel-build
Date: Mon, 9 Dec 2013 19:54:42 +0100

 On 12/9/13, Oliver Pinter <oliver.pntr@gmail.com> wrote:
 >
 >>Number:         184631
 >>Category:       kern
 >>Synopsis:       [PATCH] hook-in-iwn2000fw-and-iwn2030fw-to-kernel-build
 >>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:   Mon Dec 09 12:30:00 UTC 2013
 >>Closed-Date:
 >>Last-Modified:
 >>Originator:     Oliver Pinter
 >>Release:        FreeBSD 11-CURRENT
 >>Organization:
 >>Environment:
 > FreeBSD 11-CURRENT
 >>Description:
 > the kernel image does not contained the iwn2030fw
 >>How-To-Repeat:
 > add iwnfw to kernel config, set MODULES_OVERRIDE= , compile the kernel
 > boot the new kernel, and the kernel image does not contained the iwn2030fw
 >>Fix:
 > see the attached patch
 >
 > Patch attached with submission follows:
 >
 > From e608dcee38e93db28b15632d9e461dd87f3ab3c7 Mon Sep 17 00:00:00 2001
 > From: Oliver Pinter <oliver.pntr@gmail.com>
 > Date: Sun, 8 Dec 2013 01:15:16 +0100
 > Subject: [PATCH] hook in iwn2000fw and iwn2030fw to kernel build
 >
 > Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
 > ---
 >  sys/conf/files | 28 ++++++++++++++++++++++++++++
 >  1 file changed, 28 insertions(+)
 >
 > diff --git a/sys/conf/files b/sys/conf/files
 > index 67a65d2..2fba689 100644
 > --- a/sys/conf/files
 > +++ b/sys/conf/files
 > @@ -1605,6 +1605,34 @@ iwn1000.fw			optional iwn1000fw | iwnfw		\
 >  	compile-with	"${NORMAL_FW}"					\
 >  	no-obj no-implicit-rule						\
 >  	clean		"iwn1000.fw"
 > +iwn2000fw.c			optional iwn2000fw | iwnfw		\
 > +	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn2000.fw:iwn2000fw
 > -miwn2000fw -c${.TARGET}" \
 > +	no-implicit-rule before-depend local				\
 > +	clean		"iwn2000fw.c"
 > +iwn2000fw.fwo			optional iwn2000fw | iwnfw		\
 > +	dependency	"iwn2000.fw"					\
 > +	compile-with	"${NORMAL_FWO}"					\
 > +	no-implicit-rule						\
 > +	clean		"iwn2000fw.fwo"
 > +iwn2000.fw			optional iwn2000fw | iwnfw		\
 > +	dependency	"$S/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu" \
 > +	compile-with	"${NORMAL_FW}"					\
 > +	no-obj no-implicit-rule						\
 > +	clean		"iwn2000.fw"
 > +iwn2030fw.c			optional iwn2030fw | iwnfw		\
 > +	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn2030.fw:iwn2030fw
 > -miwn2030fw -c${.TARGET}" \
 > +	no-implicit-rule before-depend local				\
 > +	clean		"iwn2030fw.c"
 > +iwn2030fw.fwo			optional iwn2030fw | iwnfw		\
 > +	dependency	"iwn2030.fw"					\
 > +	compile-with	"${NORMAL_FWO}"					\
 > +	no-implicit-rule						\
 > +	clean		"iwn2030fw.fwo"
 > +iwn2030.fw			optional iwn2030fw | iwnfw		\
 > +	dependency	"$S/contrib/dev/iwn/iwnwifi-2030-18.168.6.1.fw.uu" \
 > +	compile-with	"${NORMAL_FW}"					\
 > +	no-obj no-implicit-rule						\
 > +	clean		"iwn2030.fw"
 >  iwn4965fw.c			optional iwn4965fw | iwnfw		\
 >  	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn4965.fw:iwn4965fw
 > -miwn4965fw -c${.TARGET}" \
 >  	no-implicit-rule before-depend local				\
 > --
 > 1.8.4
 >
 >
 
 CC Adrian
 
 >
 >>Release-Note:
 >>Audit-Trail:
 >>Unformatted:
 > _______________________________________________
 > freebsd-bugs@freebsd.org mailing list
 > http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
 > To unsubscribe, send any mail to "freebsd-bugs-unsubscribe@freebsd.org"
 >
Responsible-Changed-From-To: freebsd-bugs->freebsd-wireless 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sun Dec 15 18:25:19 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184631 
State-Changed-From-To: open->patched 
State-Changed-By: brueffer 
State-Changed-When: Sun Feb 9 23:44:09 CET 2014 
State-Changed-Why:  
Patch committed to HEAD.  Thanks a lot! 


Responsible-Changed-From-To: freebsd-wireless->brueffer 
Responsible-Changed-By: brueffer 
Responsible-Changed-When: Sun Feb 9 23:44:09 CET 2014 
Responsible-Changed-Why:  
MFC reminder. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/184631: commit references a PR
Date: Sun,  9 Feb 2014 22:42:21 +0000 (UTC)

 Author: brueffer
 Date: Sun Feb  9 22:42:14 2014
 New Revision: 261701
 URL: http://svnweb.freebsd.org/changeset/base/261701
 
 Log:
   Allow iwn2000 and iwn2030 firmware to be linked into the kernel.
   
   PR:		184631
   Submitted by:	Oliver Pinter
   MFC after:	1 week
 
 Modified:
   head/sys/conf/files
 
 Modified: head/sys/conf/files
 ==============================================================================
 --- head/sys/conf/files	Sun Feb  9 22:13:53 2014	(r261700)
 +++ head/sys/conf/files	Sun Feb  9 22:42:14 2014	(r261701)
 @@ -1569,6 +1569,34 @@ iwn1000.fw			optional iwn1000fw | iwnfw	
  	compile-with	"${NORMAL_FW}"					\
  	no-obj no-implicit-rule						\
  	clean		"iwn1000.fw"
 +iwn2000fw.c			optional iwn2000fw | iwnfw		\
 +	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn2000.fw:iwn2000fw -miwn2000fw -c${.TARGET}" \
 +	no-implicit-rule before-depend local				\
 +	clean		"iwn2000fw.c"
 +iwn2000fw.fwo			optional iwn2000fw | iwnfw		\
 +	dependency	"iwn2000.fw"					\
 +	compile-with	"${NORMAL_FWO}"					\
 +	no-implicit-rule						\
 +	clean		"iwn2000fw.fwo"
 +iwn2000.fw			optional iwn2000fw | iwnfw		\
 +	dependency	"$S/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu" \
 +	compile-with	"${NORMAL_FW}"					\
 +	no-obj no-implicit-rule						\
 +	clean		"iwn2000.fw"
 +iwn2030fw.c			optional iwn2030fw | iwnfw		\
 +	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn2030.fw:iwn2030fw -miwn2030fw -c${.TARGET}" \
 +	no-implicit-rule before-depend local				\
 +	clean		"iwn2030fw.c"
 +iwn2030fw.fwo			optional iwn2030fw | iwnfw		\
 +	dependency	"iwn2030.fw"					\
 +	compile-with	"${NORMAL_FWO}"					\
 +	no-implicit-rule						\
 +	clean		"iwn2030fw.fwo"
 +iwn2030.fw			optional iwn2030fw | iwnfw		\
 +	dependency	"$S/contrib/dev/iwn/iwnwifi-2030-18.168.6.1.fw.uu" \
 +	compile-with	"${NORMAL_FW}"					\
 +	no-obj no-implicit-rule						\
 +	clean		"iwn2030.fw"
  iwn4965fw.c			optional iwn4965fw | iwnfw		\
  	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn4965.fw:iwn4965fw -miwn4965fw -c${.TARGET}" \
  	no-implicit-rule before-depend local				\
 _______________________________________________
 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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/184631: commit references a PR
Date: Sun, 16 Feb 2014 10:39:38 +0000 (UTC)

 Author: brueffer
 Date: Sun Feb 16 10:39:29 2014
 New Revision: 261965
 URL: http://svnweb.freebsd.org/changeset/base/261965
 
 Log:
   MFC: r261701
   
   Allow iwn2000 and iwn2030 firmware to be linked into the kernel.
   
   PR:		184631
   Submitted by:	Oliver Pinter
 
 Modified:
   stable/10/sys/conf/files
 Directory Properties:
   stable/10/   (props changed)
 
 Modified: stable/10/sys/conf/files
 ==============================================================================
 --- stable/10/sys/conf/files	Sun Feb 16 10:28:18 2014	(r261964)
 +++ stable/10/sys/conf/files	Sun Feb 16 10:39:29 2014	(r261965)
 @@ -1605,6 +1605,34 @@ iwn1000.fw			optional iwn1000fw | iwnfw	
  	compile-with	"${NORMAL_FW}"					\
  	no-obj no-implicit-rule						\
  	clean		"iwn1000.fw"
 +iwn2000fw.c			optional iwn2000fw | iwnfw		\
 +	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn2000.fw:iwn2000fw -miwn2000fw -c${.TARGET}" \
 +	no-implicit-rule before-depend local				\
 +	clean		"iwn2000fw.c"
 +iwn2000fw.fwo			optional iwn2000fw | iwnfw		\
 +	dependency	"iwn2000.fw"					\
 +	compile-with	"${NORMAL_FWO}"					\
 +	no-implicit-rule						\
 +	clean		"iwn2000fw.fwo"
 +iwn2000.fw			optional iwn2000fw | iwnfw		\
 +	dependency	"$S/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu" \
 +	compile-with	"${NORMAL_FW}"					\
 +	no-obj no-implicit-rule						\
 +	clean		"iwn2000.fw"
 +iwn2030fw.c			optional iwn2030fw | iwnfw		\
 +	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn2030.fw:iwn2030fw -miwn2030fw -c${.TARGET}" \
 +	no-implicit-rule before-depend local				\
 +	clean		"iwn2030fw.c"
 +iwn2030fw.fwo			optional iwn2030fw | iwnfw		\
 +	dependency	"iwn2030.fw"					\
 +	compile-with	"${NORMAL_FWO}"					\
 +	no-implicit-rule						\
 +	clean		"iwn2030fw.fwo"
 +iwn2030.fw			optional iwn2030fw | iwnfw		\
 +	dependency	"$S/contrib/dev/iwn/iwnwifi-2030-18.168.6.1.fw.uu" \
 +	compile-with	"${NORMAL_FW}"					\
 +	no-obj no-implicit-rule						\
 +	clean		"iwn2030.fw"
  iwn4965fw.c			optional iwn4965fw | iwnfw		\
  	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn4965.fw:iwn4965fw -miwn4965fw -c${.TARGET}" \
  	no-implicit-rule before-depend local				\
 _______________________________________________
 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: patched->closed 
State-Changed-By: brueffer 
State-Changed-When: Sun Feb 16 11:40:39 CET 2014 
State-Changed-Why:  
Merge to stable/10 done.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184631 
>Unformatted:
