<?xml version="1.0" encoding="UTF-8" ?>
<rss version="2.0">
<channel>
<title><![CDATA[向东博客 专注WEB应用 构架之美 --- 构架之美，在于尽态极妍 | 应用之美，在于药到病除]]></title> 
<link>http://jackxiang.com/index.php</link> 
<description><![CDATA[赢在IT，Playin' with IT,Focus on Killer Application,Marketing Meets Technology.]]></description> 
<language>zh-cn</language> 
<copyright><![CDATA[向东博客 专注WEB应用 构架之美 --- 构架之美，在于尽态极妍 | 应用之美，在于药到病除]]></copyright>
<item>
<link>http://jackxiang.com/post//</link>
<title><![CDATA[[实践OK]如何打patch，以及diff和patch的使用]]></title> 
<author>jack &lt;xdy108@126.com&gt;</author>
<category><![CDATA[WEB2.0]]></category>
<pubDate>Sat, 10 Oct 2009 16:18:28 +0000</pubDate> 
<guid>http://jackxiang.com/post//</guid> 
<description>
<![CDATA[ 
	glibc_fwrite_warning.patch<br/><textarea name="code" class="php" rows="15" cols="100">
--- memcached-1.4.20/memcached.c.orig&nbsp;&nbsp;2014-05-11 02:59:58.000000000 -0400
+++ memcached-1.4.20/memcached.c&nbsp;&nbsp;2015-01-13 18:05:43.000000000 -0500
@@ -1274,7 +1274,7 @@
 
&nbsp;&nbsp;&nbsp;&nbsp; if (settings.verbose &gt; 1) &#123;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; fprintf(stderr, &quot;&lt;%d %s &quot;, c-&gt;sfd, should_touch ? &quot;TOUCH&quot; : &quot;GET&quot;);
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;fwrite(key, 1, nkey, stderr);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if (fwrite(key, 1, nkey, stderr)) &#123; /* this is a no-op block */ &#125;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; fputc(&#039;&#92;n&#039;, stderr);
&nbsp;&nbsp;&nbsp;&nbsp; &#125;
 
</textarea><br/> 到memcache目录下：<br/>[root@localhost memcached-1.4.25]# patch -p0 &lt; glibc_fwrite_warning.patch <br/>can&#039;t find file to patch at input line 3<br/>Perhaps you used the wrong -p or --strip option?<br/>The text leading up to this was:<br/>--------------------------<br/>&#124;--- memcached-1.4.20/memcached.c.orig&nbsp;&nbsp;2014-05-11 02:59:58.000000000 -0400<br/>&#124;+++ memcached-1.4.20/memcached.c&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2015-01-13 18:05:43.000000000 -0500<br/>--------------------------<br/>File to patch: memcached.c<br/>patching file memcached.c<br/>Hunk #1 succeeded at 1283 (offset 9 lines).<br/><br/>=====================================================<br/><br/><br/><br/>1) diff/patch这对工具在数学上来说，diff是对2个集合求差，patch是求和<br/><br/>diff A B &gt; C 生成A和B的diff文件C<br/><br/>patch A C 给A打上diff文件得到B<br/><br/>patch -R B C B还原为A<br/><br/>2) 内核补丁<br/><br/>生成<br/><br/>diff -uNr linux-2.6.xxx linux-2.6.xxx.1 &gt; diff.patch<br/><br/>升级<br/><br/>cp diff.patch linux-2.6.xxx/.<br/><br/>cd linux-2.6.xxx<br/><br/>patch -p1 &lt; diff.patch<br/><br/>可以参考$(linux_src)/Documentation/applying_patches.txt<br/><br/>还可以参考这一篇：http://www.hzlitai.com.cn/bbs/dispbbs.asp?boardid=28&amp;id=1215
]]>
</description>
</item><item>
<link>http://jackxiang.com/post//#blogcomment</link>
<title><![CDATA[[评论] [实践OK]如何打patch，以及diff和patch的使用]]></title> 
<author> &lt;user@domain.com&gt;</author>
<category><![CDATA[评论]]></category>
<pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate> 
<guid>http://jackxiang.com/post//#blogcomment</guid> 
<description>
<![CDATA[ 
	
]]>
</description>
</item>
</channel>
</rss>