Re: svn commit: r265917 - in stable/10: share/man/man4 sys/dev/bce sys/dev/bxe sys/modules/bce

2014-05-12 Thread Bruce Evans 

On Mon, 12 May 2014, Glen Barber wrote:


On Mon, May 12, 2014 at 03:52:49PM +, David C Somayajulu wrote:

Log:
  MFC r265703
  Modify Copyright information and other strings to reflect
  Qlogic Corporation's purchase of Broadcom's NetXtreme business.
  Added clean option to Makefile




Modified: stable/10/sys/modules/bce/Makefile
==
--- stable/10/sys/modules/bce/Makefile  Mon May 12 14:46:32 2014
(r265916)
+++ stable/10/sys/modules/bce/Makefile  Mon May 12 15:52:49 2014
(r265917)
@@ -5,4 +5,9 @@ SRCS=   opt_bce.h if_bce.c miibus_if.h mii

 #CFLAGS += -DBCE_DEBUG=0

+clean:
+   rm -f opt_bdg.h device_if.h bus_if.h pci_if.h export_syms
+   rm -f *.o *.kld *.ko
+   rm -f @ machine x86 miibus_if.h miidevs.h opt_bce.h
+
 .include 


Shouldn't these be listed in CLEANFILES ?


Most of them already do.  Most of them are automatically generated, and
a small part of this is to put automatically generated files in CLEANFILES.

The existence of the clean target is a larger bug.  It defeats the default
clean target which handles CLEANFILES and other things, but not all of
the above.  Some of them belong in the cleandir target.  That is not
defeated.

Before this commit, the clean target did:

% rm -f export_syms if_bce.ko if_bce.kld if_bce.o opt_bce.h miibus_if.h 
pci_if.h bus_if.h device_if.h miidevs.h

and the cleandir target did this plus:

% rm -f @ machine x86
% rm -f .depend GPATH GRTAGS GSYMS GTAGS
% if [ -L /usr/src/sys/modules/bce/obj ]; then rm -f 
/usr/src/sys/modules/bce/obj; fi

The new clean target does exactly the same as the old one plus a strict
subset of the cleandir target, except:
- it adds opt_budgerigar.h (sic), which apparently still is neither
  generated nor used by bce.
- it removes *.o, *.kld and *.ko instead of if_bce.ko if_bce.kld if_bce.o.
  The default rule is careful to avoid using wildcards so as to not remove
  anything not generated by the makefile.

Removing @, machine and x86 in clean instead of in cleandir is minor
breakage.  .depend and obj are still not removed in clean.  Handling
obj in a home made rule would be very difficult, since the obj dir
can be almost anywhere (and not named obj) and it might be a directory
instead of a symlink.

Bruce
___
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-unsubscr...@freebsd.org"

Re: svn commit: r265917 - in stable/10: share/man/man4 sys/dev/bce sys/dev/bxe sys/modules/bce

2014-05-12 Thread Glen Barber 
On Mon, May 12, 2014 at 03:52:49PM +, David C Somayajulu wrote:
> Author: davidcs
> Date: Mon May 12 15:52:49 2014
> New Revision: 265917
> URL: http://svnweb.freebsd.org/changeset/base/265917
> 
> Log:
>   MFC r265703
>   Modify Copyright information and other strings to reflect
>   Qlogic Corporation's purchase of Broadcom's NetXtreme business.
>   Added clean option to Makefile
>   

> Modified: stable/10/sys/modules/bce/Makefile
> ==
> --- stable/10/sys/modules/bce/MakefileMon May 12 14:46:32 2014
> (r265916)
> +++ stable/10/sys/modules/bce/MakefileMon May 12 15:52:49 2014
> (r265917)
> @@ -5,4 +5,9 @@ SRCS= opt_bce.h if_bce.c miibus_if.h mii
>  
>  #CFLAGS += -DBCE_DEBUG=0
>  
> +clean:
> + rm -f opt_bdg.h device_if.h bus_if.h pci_if.h export_syms
> + rm -f *.o *.kld *.ko
> + rm -f @ machine x86 miibus_if.h miidevs.h opt_bce.h
> +
>  .include 

Shouldn't these be listed in CLEANFILES ?

Glen



pgpg6JNiWgM1f.pgp
Description: PGP signature

svn commit: r265917 - in stable/10: share/man/man4 sys/dev/bce sys/dev/bxe sys/modules/bce

2014-05-12 Thread David C Somayajulu 
Author: davidcs
Date: Mon May 12 15:52:49 2014
New Revision: 265917
URL: http://svnweb.freebsd.org/changeset/base/265917

Log:
  MFC r265703
  Modify Copyright information and other strings to reflect
  Qlogic Corporation's purchase of Broadcom's NetXtreme business.
  Added clean option to Makefile
  
  Submitted by:David C Somayajulu (davi...@freebsd.org) QLogic Corporation

Modified:
  stable/10/share/man/man4/bce.4
  stable/10/share/man/man4/bxe.4
  stable/10/sys/dev/bce/if_bce.c
  stable/10/sys/dev/bce/if_bcefw.h
  stable/10/sys/dev/bce/if_bcereg.h
  stable/10/sys/dev/bxe/bxe.c
  stable/10/sys/modules/bce/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man4/bce.4
==
--- stable/10/share/man/man4/bce.4  Mon May 12 14:46:32 2014
(r265916)
+++ stable/10/share/man/man4/bce.4  Mon May 12 15:52:49 2014
(r265917)
@@ -1,5 +1,4 @@
-.\" Copyright (c) 2006 Broadcom Corporation
-.\"  David Christensen .  All rights reserved.
+.\" Copyright (c) 2006-2014 QLogic Corporation
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -10,9 +9,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"notice, this list of conditions and the following disclaimer in the
 .\"documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of Broadcom Corporation nor the name of its 
contributors
-.\"may be used to endorse or promote products derived from this software
-.\"without specific prior written consent.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS'
 .\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -33,7 +29,7 @@
 .Os
 .Sh NAME
 .Nm bce
-.Nd "Broadcom NetXtreme II (BCM5706/5708/5709/5716) PCI/PCIe Gigabit Ethernet 
adapter driver"
+.Nd "QLogic NetXtreme II (BCM5706/5708/5709/5716) PCI/PCIe Gigabit Ethernet 
adapter driver"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
@@ -52,7 +48,7 @@ if_bce_load="YES"
 .Sh DESCRIPTION
 The
 .Nm
-driver supports Broadcom's NetXtreme II product family, including the
+driver supports QLogic's NetXtreme II product family, including the
 BCM5706, BCM5708, BCM5709 and BCM5716 Ethernet controllers.
 .Pp
 The NetXtreme II product family is composed of various Converged NIC (or CNIC)
@@ -141,25 +137,25 @@ For more information on configuring this
 .Sh HARDWARE
 The
 .Nm
-driver provides support for various NICs based on the Broadcom NetXtreme II
+driver provides support for various NICs based on the QLogic NetXtreme II
 family of Gigabit Ethernet controllers, including the
 following:
 .Pp
 .Bl -bullet -compact
 .It
-Broadcom NetXtreme II BCM5706 1000Base-SX
+QLogic NetXtreme II BCM5706 1000Base-SX
 .It
-Broadcom NetXtreme II BCM5706 1000Base-T
+QLogic NetXtreme II BCM5706 1000Base-T
 .It
-Broadcom NetXtreme II BCM5708 1000Base-SX
+QLogic NetXtreme II BCM5708 1000Base-SX
 .It
-Broadcom NetXtreme II BCM5708 1000Base-T
+QLogic NetXtreme II BCM5708 1000Base-T
 .It
-Broadcom NetXtreme II BCM5709 1000Base-SX
+QLogic NetXtreme II BCM5709 1000Base-SX
 .It
-Broadcom NetXtreme II BCM5709 1000Base-T
+QLogic NetXtreme II BCM5709 1000Base-T
 .It
-Broadcom NetXtreme II BCM5716 1000Base-T
+QLogic NetXtreme II BCM5716 1000Base-T
 .It
 Dell PowerEdge 1950 integrated BCM5708 NIC
 .It
@@ -411,9 +407,11 @@ A controller hardware failure has occurr
 If the problem continues replace the controller.
 .El
 .Sh SUPPORT
-For general information and support,
-go to the Broadcom NIC Open Source Developer Resource Site:
-.Pa http://www.broadcom.com/support/ethernet_nic/open_source.php .
+For support questions please contact your QLogic approved reseller or
+QLogic Technical Support at
+.Pa http://support.qlogic.com ,
+or by E-mail at
+.Aq supp...@qlogic.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,

Modified: stable/10/share/man/man4/bxe.4
==
--- stable/10/share/man/man4/bxe.4  Mon May 12 14:46:32 2014
(r265916)
+++ stable/10/share/man/man4/bxe.4  Mon May 12 15:52:49 2014
(r265917)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2013 Broadcom Corporation. All rights reserved.
+.\" Copyright (c) 2014 Qlogic Corporation. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -9,9 +9,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"notice, this list of conditions and the following disclaimer in the
 .\"documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of Broadcom Corporation nor the name of its 
contributors
-.\"may