[PATCH 1/3]siliconmotion new driver initial patch 1

[Aaron.Chen 陈俊杰]

Hi,

We have updated the copyrights and repatched the whole new driver into 3 parts. Here is the first one.

man/Makefile.am |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/man/Makefile.am b/man/Makefile.am
index e1182ee..c6c85ab 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,10 +31,25 @@ EXTRA_DIST = @DRIVER_NAME at .man
 
 CLEANFILES = $(driverman_DATA)
 
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+  XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xservername__|Xorg|g' \
+	-e 's|__xconfigfile__|xorg.conf|g' \
+	-e 's|__projectroot__|$(prefix)|g' \
+	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 
 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 
 .man.$(DRIVER_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+	sed $(MAN_SUBSTS) < $< > $@
-- 
1.7.5.4

Aaron

-----邮件原件-----
发件人: Alan Coopersmith [mailto:alan.coopersmith at oracle.com] 
发送时间: 2012年7月21日 1:35
收件人: Aaron.Chen 陈俊杰
抄送: Michal Suchanek; Matt Turner; caesar.qiu 裘赛海; mill.chen 陈军; xorg-devel at lists.x.org; Paul.Chen 陈波; Ilena.Zhou周菁华
主题: Re: 答复: 答复: [PATCH]new driver for siliconmotion

On 07/20/12 02:56 AM, Aaron.Chen  陈俊杰 wrote:
> 2. > man/Makefile.am                 |   64 +-
>> You replaced the Oracle copyright notice with the old Sun copyright notice. Clearly wrong, and it makes it clear that this wasn't well reviewed or rebased.
> 
> We've replaced old Sun copyright notice with the Oracle copyright notice. Is it OK?

For this and several other points the correct answer is not to change things that aren't part of your changes, but to use the latest code base and only submit patches for things you are intentionally changing as part of your submission - your patches should not show any change to Sun or Oracle copyrights, as they're not part of what you should be changing.

This should involve rebasing your git trees to the current head of the master branch - if you're not using git to manage these changes, you'll find it incredibly difficult to integrate upstream on a regular basis.

> 5. 
> +*         Copyright (c) 2007 by Silicon Motion, Inc. (SMI)
> +*
> +*  All rights are reserved. Reproduction or in part is prohibited
> +*  without the written consent of the copyright owner.
>> That doesn't look good.
> 
> We will use the same old format:    Copyright (C) YYYY Silicon Motion, Inc.  All Rights Reserved. 
> Is this OK?

No.   It's not the copyright notice that matters but the license terms
afterwards, which must be an open source license notice.   "Reproduction or in
part is prohibited" is completely unacceptable - why would we accept code your
notice clearly says we cannot use?   Your company's lawyers need to provide you
with the license statement your company is willing to provide the code under - X.Org prefers the MIT/X11 license, as you can see in lots of our existing code
- the current preferred form is:

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice (including the next
paragraph) shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


but we will accept certain variations on that form as long as they allow others to reuse the code without further complications.

-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-siliconmotion-new-driver-initial-patch-1.patch
Type: application/octet-stream
Size: 1510 bytes
Desc: 0001-siliconmotion-new-driver-initial-patch-1.patch
URL: <http://lists.x.org/archives/xorg-devel/attachments/20120806/bd2c226c/attachment-0001.obj>