Module Name: src
Committed By: snj
Date: Fri May 1 01:48:41 UTC 2009
Modified Files:
src/distrib/sets/lists/base [netbsd-5]: mi
src/sys/dev/microcode/zyd [netbsd-5]: Makefile
Added Files:
src/sys/dev/microcode/zyd [netbsd-5]: zd1211-license
Removed Files:
src/sys/dev/microcode/zyd [netbsd-5]: zd1211-licence
Log Message:
Pull up following revision(s) (requested by hira in ticket #538):
distrib/sets/lists/base/mi: revision 1.797 via patch
sys/dev/microcode/zyd/Makefile: revision 1.2
sys/dev/microcode/zyd/zd1211-license: revision 1.1
sys/dev/microcode/zyd/zd1211-licence: file removal
- Rename filename of license.
- Correct filename in license (add missing prefix).
To generate a diff of this commit:
cvs rdiff -u -r1.780.2.6 -r1.780.2.7 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1 -r1.1.48.1 src/sys/dev/microcode/zyd/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/dev/microcode/zyd/zd1211-licence
cvs rdiff -u -r0 -r1.1.6.2 src/sys/dev/microcode/zyd/zd1211-license
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.780.2.6 src/distrib/sets/lists/base/mi:1.780.2.7
--- src/distrib/sets/lists/base/mi:1.780.2.6 Thu Mar 12 23:44:48 2009
+++ src/distrib/sets/lists/base/mi Fri May 1 01:48:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.780.2.6 2009/03/12 23:44:48 snj Exp $
+# $NetBSD: mi,v 1.780.2.7 2009/05/01 01:48:41 snj Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -150,7 +150,8 @@
./libdata/firmware/rum/rum-license base-sys-root
./libdata/firmware/rum/rum-rt2573 base-sys-root
./libdata/firmware/zyd base-sys-root
-./libdata/firmware/zyd/zd1211-licence base-sys-root
+./libdata/firmware/zyd/zd1211-licence base-sys-root obsolete
+./libdata/firmware/zyd/zd1211-license base-sys-root
./libdata/firmware/zyd/zyd-zd1211 base-sys-root
./libdata/firmware/zyd/zyd-zd1211b base-sys-root
./libexec base-sys-root
Index: src/sys/dev/microcode/zyd/Makefile
diff -u src/sys/dev/microcode/zyd/Makefile:1.1 src/sys/dev/microcode/zyd/Makefile:1.1.48.1
--- src/sys/dev/microcode/zyd/Makefile:1.1 Sat Jun 9 11:20:54 2007
+++ src/sys/dev/microcode/zyd/Makefile Fri May 1 01:48:41 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2007/06/09 11:20:54 kiyohara Exp $
+# $NetBSD: Makefile,v 1.1.48.1 2009/05/01 01:48:41 snj Exp $
NOMAN= # defined
-FILES= zyd-zd1211 zyd-zd1211b zd1211-licence
+FILES= zyd-zd1211 zyd-zd1211b zd1211-license
# XXX
includes:
Added files:
Index: src/sys/dev/microcode/zyd/zd1211-license
diff -u /dev/null src/sys/dev/microcode/zyd/zd1211-license:1.1.6.2
--- /dev/null Fri May 1 01:48:41 2009
+++ src/sys/dev/microcode/zyd/zd1211-license Fri May 1 01:48:41 2009
@@ -0,0 +1,26 @@
+ * Copyright (C) 2001, 2002, 2003,2004 ZyDAS Technology Corporation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted provided
+ * that the following conditions are met:
+ * 1. Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistribution 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. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The following files are under the above license:
+ zyd-zd1211 zyd-zd1211b
