ºìÁªLinuxÃÅ»§
Linux°ïÖú

diffÓëpatch

·¢²¼Ê±¼ä:2011-08-29 14:35:13À´Ô´:ºìÁª×÷Õß:wuquan-1230
ÔÚLinuxϵͳ±à³ÌÖУ¬¾­³£»áÓõ½diffÓëpatchÉú³É²¹¶¡Óë´ò²¹¶¡£¬Ô­À´¶ÔÕâ·½Ãæ²»Á˽⣬Ҳ¾Í¾õµÃÄÑ£¬×ö¹ýÖ®ºó·¢ÏÖ²¢Ã»ÓÐʲô¡£
1¡¢Ê¹ÓÃdiffÉú³É²¹¶¡£»
diffÊÇLinuxϵÄÎļþ±È½ÏÃüÁ²ÎÊýÕâÀï¾Í²»ËµÁË£¬Ö±½ÓmanһϾÍÐÐÁË£¬²»½ö¿ÉÒԱȽÏÎļþ£¬Ò²¿ÉÒԱȽÏÁ½¸öĿ¼£¬²¢ÇÒ¿ÉÒÔ½«²»Í¬Ö®´¦Éú³É²¹¶¡Îļþ£¬Æäʵ¾ÍÊÇÒ»ÖÖ´ò²¹¶¡µÄÃüÁʹÓ÷½·¨ÈçÏ£º
diff -rNu a b > diff.patch
ÆäÖУ¬aÊǾɵÄĿ¼»òÎļþ£¬bΪ×î½üÐ޸ĺóµÄĿ¼»òÎļþ£¬Éú³ÉµÄ²¹¶¡ÎļþΪpatch¡£

2¡¢Ê¹ÓÃpatch´ò²¹¶¡£»
patchÃüÁîµÄ²ÎÊýÏê¼ûmanÊֲᣬʹÓÃpatch¸øÁíÍâÒ»¸öaĿ¼´ò²¹¶¡Ê±ÈçÏ£º
patch -p0 < diff.patch
ÕâÑù¾Í¿ÉÒÔÁË£¬patchÎÞ·¨Íê³ÉµÄ²¹¶¡Ôò±£´æΪ"*.rej"Îļþ¡£
ÎÄÕÂÆÀÂÛ

¹²ÓÐ 15 ÌõÆÀÂÛ

  1. Ò»ÓïÌìÈ» ÓÚ 2014-07-06 15:18:22·¢±í:

    ²»Ì«Àí½â

  2. gky2009514 ÓÚ 2012-12-07 13:06:12·¢±í:

    ÐÂÊÖÍê³ÉÈÎÎñ£¬ÇóÏÂÊé¼®~

  3. ÓÚ 2012-12-05 00:05:00·¢±í:

    Ç°ÆÚ

  4. tomybaby17 ÓÚ 2012-07-26 08:02:36·¢±í:

    ÌØɫר¿Æ£º
    ¡¢¡¢¡¢¡¢¡¢¡¢
    Ïêϸ½éÉÜ£º
    Ê׶¼Ò½¿Æ´óѧ¸½Êô±±¾©¶ùͯҽԺ×øÂäÓÚ±±¾©Êи´ÐËÃÅÍâ¶þ»·Â·Î÷²à£¬Õ¼µØ70003.26ƽ·½Ã×£¬½¨ÖþÃæ»ý120000ƽ·½Ã×£¬ÊÇÎÒ¹úÄ¿Ç°¹æÄ£×î´óµÄ×ÛºÏÐÔ¶ù¿ÆÒ½Ôº¡£Í¬Ê±Ò²ÊǼ¯Ò½ÁÆ¡¢¿ÆÑС¢½Ìѧ¡¢±£½¡ÓÚÒ»ÌåµÄ¶ù¿Æҽѧ»ùµØ¡£
    ±±¾©¶ùͯҽԺµÄÇ°ÉíÊÇÎÒ¹úÏÖ´ú¶ù¿Æҽѧµì»ùÈËÖÌÄԺʿÓÚ1942Äê´´½¨µÄ±±Æ½Ë½Á¢¶ùͯҽԺ£¬ÖÁ½ñÒÑÓÐ60ÓàÄêµÄÀúÊ·¡£1979ÄêÒ½Ôº³ÉÁ¢Á˱±¾©Êжù¿ÆÑо¿Ëù¡£1994ÄêÒ½Ôº¸üÃûΪÊ׶¼Ò½¿Æ´óѧ¸½Êô±±¾©¶ùͯҽԺ£¬1996Äê±»ÆÀΪÈý¼¶¼×µÈÒ½Ôº¡£
    ±±¾©¶ùͯҽԺµÄÇ°ÉíÊÇÎÒ¹úÏÖ´ú¶ù¿Æҽѧµì»ùÈËÖÌÄԺʿÓÚ1942Äê´´½¨µÄ±±Æ½Ë½Á¢¶ùͯҽԺ£¬ÖÁ½ñÒÑÓÐ69ÄêÀúÊ·¡£Ò½ÔºÉèÓÐרҵ²¡·¿30¸ö£¬²¡´²970ÕÅ£¬ÄêÃÅÕïÁ¿240ÍòÈ˴Σ¬×¡Ôº²¡ÈË4ÍòÓàÈ˴Σ¬ÊÖÊõ1.8ÍòÀý¡£Ò½ÔºÎªÂú×㲻ͬ½×²ãÈËȺµÄÒ½ÁƾÍÕïÐèÇó2006Äê³ÉÁ¢±±¾©ÐÂÊÀ¼Í¶ùͯҽÁƱ£½¡ÖÐÐÄ£¬2008Äê¼±¾ÈÖÐÐÄ´óÂ¥¸ÄÀ©½¨Íê³ÉͶÈëʹÓã¬ÔÚ½øÒ»²½»º½â¿´²¡ÄѵÄͬʱʹ»¼Õß¼°¼ÒÈËÏíÊܵ½¸ßÖÊÁ¿Ò½ÁÆ·þÎñ¡£
    2006Äê3ÔÂ18ÈÕ±±¾©¶ùͯҽԺ³ÉÁ¢Á˱±¾©ÐÂÊÀ¼Í¶ùͯҽÁƱ£½¡ÖÐÐÄ¡£ÖÐÐĽôÁÙÃÅÕïÂ¥£¬×ÜÃæ»ý´ï8500ƽ·½Ãס£ÖÐÐÄ°´ÕÕ¹ú¼Ê±ê×¼£¬ÓÉÎ÷·½Ò½Ôº¹ÜÀí¼¯ÍŹÜÀí£¬»ñµÃÃÀ¹úÒ½ÁƱ£½¡ÖÊÁ¿±ê×¼(jcaho)ÈÏÖ¤¡£ÓµÓÐ108¸ö˽È˲¡·¿ºÍÒ»Ì×ÍêÕûµÄÕïÁÆ·þÎñϵͳ£¬Í¬Ê±ÓµÓб±¾©¶ùͯҽԺºÍÅ·ÃÀר¼ÒÍŶÓÌṩ¼¼ÊõÖ§³Ö£¬²¢Óɹú¼Ê½¨ÖþʦÉè¼ÆµÄÒ»¼Ò¼«¾ß·ç¸ñµÄÒ½Ôº£¬ÓªÔì³öÎÂůµÄ¡¢¼ÒͥʽÕïÁÆ»·¾³£¬Ê¹»¼Õß¼°¼ÒÈËÏíÊܵ½¸ßÖÊÁ¿µÄÒ½ÁÆ·þÎñ¡£
    ±±¾©¶ùͯҽԺ²»½ö¾ß±¸ÏȽøµÄÒ½ÁÆÉ豸¡¢ÍêÉƵĻù´¡ÉèÊ©¡¢ÐÛºñµÄ¼¼ÊõÁ¦Á¿£¬¶øÇÒÓµÓйúÄÚ¶ù¿Æ½ç½öÓеÄÈýλԺʿ£¬Í¬Ê±»¹ÓÐÖÚ¶àµÄ¹úÄÚÍâÖøÃûר¼Ò¡¢½ÌÊÚ£¬ËûÃÇ·Ö±ðµ£Èιú¼Ê¶ù¿Æѧ»áÖ´ÐÐίԱºÍ³£ÎñίԱ;̫ƽÑóµØÇøС¶ùÍâ¿Æѧ»áµØÇøÖ÷ϯ;ÑÇÖÞС¶ùÍâ¿Æѧ»áÀíÊÂ;ÑÇÖÞ¶ù¿Æѧ»áÖ´ÐÐίԱ;ÖлªÒ½Ôº¹ÜÀíѧ»á¶ùͯҽԺ¹ÜÀí·Ö»áÖ÷ÈÎίԱ;ÖлªÒ½Ñ§»á¸±»á³¤;ÖлªÒ½Ñ§»á¶ù¿Æѧ»á¡¢ÖлªÒ½Ñ§»áС¶ùÍâ¿Æѧ»á¡¢ÖлªÒ½Ñ§»á¼±Õïר¿ÆίԱ»áÖ÷ÈÎίԱµÈÖ°Îñ¡£
    ±±¾©¶ùͯҽԺӵÓÐС¶ùѪҺרҵ¡¢¼±¾Èרҵ¡¢ÆÕÍâרҵºÍÖÐҽרҵ4¸ö±±¾©ÊÐÖصãѧ¿Æ¼°Ð¡¶ùÏÈÌìÐÔÐÄÔಡÖÎÁÆÖÐÐÄ¡¢Ð¡¶ù¼¹ÖùÍâ¿ÆÖÐÐÄ¡¢¶ùͯ¼°ÇàÉÙÄêÌÇÄò²¡ÖÐÐĵÈ14¸öÊм¶Ò½ÁÆÖÐÐÄ£¬ÔÚС¶ù¸´ÔÓÏÈÐIJ¡µÄÊÖÊõÖÎÁÆ¡¢¸ÎÉöÒÆÖ²¡¢¸÷À༹Öù»ûÐεĽÃÕý¡¢¸¹ÐØÇ»¾µÖÎÁÆ¡¢¼±¸¹Ö¢¼°´´ÉËÖÎÁÆÒÔ¼°Éñ¾­¡¢ºôÎü¡¢ÄÚ·ÖÃÚ¡¢Éö²¡¡¢ÑªÒºÍ¸Îö¡¢ÃÚÄò¡¢¶ú±Çºí¡¢ÏËά֧Æø¹Ü¾µ¡¢Ó°Ïñ¼¼ÊõµÈרҵ¼²²¡µÄÕï¶ÏÖÎÁƼ°ÕïÁÆÉ豸¾Ó¹úÄÚÁìÏȵØ룬²¢ÂÊÏÈÔÚ¹úÄÚ½«¶ù¿Æ¾ÍÕïÄêÁäÀ©´óµ½18Ëê¡£
    ±±¾©¶ùͯҽԺ³Ðµ£×ű±¾©»¤Ð£ÖÐר¡¢Ê׶¼Ò½¿Æ´óѧ±¾¿ÆÉú¡¢Ë¶Ê¿Éú¡¢²©Ê¿ÉúµÄÅàÑøÈÎÎñ£¬²¢ÉèÓв©Ê¿ºóÁ÷¶¯Õ¾£¬ÊÜÎÀÉú²¿Î¯Íге£×ÅÈ«¹ú¶ù¿Æ½øÐÞÒ½ÉúÅàѵ¹¤×÷¡£Í¬Ê±£¬±±¾©¶ùͯҽԺ»¹ÊÇÈ«¹úÎÀÉúרҵ¼¼ÊõÈËÔ±¶ù¿ÆÖ÷ÖÎҽʦÖ÷ÈÎίԱµ¥Î»ºÍ¶ù¿Æ¸±Ö÷ÈÎҽʦÃüÌâ×é×鳤µ¥Î»¡£½ü3ÄêÒ½Ôº³Ðµ£×Å°üÀ¨¡°Ê®Î塱¹¥¹ØºÍ¹ú¼Ò×ÔÈ»»ù½ðÔÚÄÚµÄ65Ïî¿ÆÑпÎÌ⣬²¢¶à´Î»ñ¹ú¼Ò¼¶¡¢Ê¡²¿¼¶¿ÆÑн±¡£
    ±±¾©¶ùͯҽԺ²»½öÔÚ¹úÄÚÏíÓкܸߵÄÉùÓþ£¬¶øÇÒÔÚ¹ú¼Ê¶ù¿Æ½çÒ²Óй㷺ӰÏì¡£ÕŽðÕÜԺʿ»ñÓ¢¹ú»Ê¼Òҽѧ¶ùÍâ¿Æѧ»á ¡°µ¤Äá˹-²¼ÀÊ¡±½±ºÍÓ¡¶È¡°¸ÊµØ¡±½ð¶Ü½±Õ¡¢ºúÑÇÃÀԺʿ»ñÑÇÖÞÍ»³ö¹±Ï׶ù¿Æҽʦ½±¡¢½­ÔØ·¼½ÌÊÚ»ñÑÇÖÞÍ»³ö¹±Ï׶ù¿Æҽʦ½±ºÍµÀ¸ñÀ­ÂíÆæ½±¡¢ÑîÓÀºë½ÌÊÚ»ñ¹ú¼Ê´«È¾²¡Ñ§»áaventis pasteur½±¼°¶íÂÞ˹ҽѧ¿ÆѧԺÍ⼮Ժʿ³ÆºÅ¡£
    ±±¾©¶ùͯҽԺÓëÃÀ¹ú¡¢¶íÂÞ˹¡¢¼ÓÄôó¡¢Òâ´óÀû¡¢°Ä´óÀûÑÇ¡¢Èðµä¡¢µÂ¹ú¡¢·¨¹ú¡¢ÈÕ±¾¡¢Ð¼ÓƼ°Ïã¸ÛµÈ¹ú¼ÒºÍµØÇøµÄ¶ùͯҽÁÆ»ú¹¹½¨Á¢ÁËÁ¼ºÃµÄ¹ØϵºÍ¹ã·ºµÄºÏ×÷¡£
    Ëù»ñÈÙÓþ£º
    ±±¾©¶ùͯҽԺÏȺó±»ÆÀΪ¡°±±¾©°ÂÔ˻ᡢ²Ð°Â»áÖ¾Ô¸Õß¹¤×÷Í»³ö¹±Ï×µ¥Î»¡±£¬»ñµÃ¡°Ê׶¼ÎÄÃ÷·þÎñʾ·¶´°¿Ú¡±¡¢¡°×îÊÜ»¶Ó­×¨¿ÆÒ½Ôº¡±¡¢¡°Ë«Ê®¼ÑÈËÃñÂúÒâÒ½Ôº¡±ÈÙÓþ³ÆºÅ¼°¡°Ê׶¼ÀͶ¯½±×´¡±¡¢¡°È«¹úÎåÒ»ÀͶ¯½±×´¡±¡£
    ÏȽøÉ豸£º
    ÂÝÐýct¡¢dr¡¢cr¡¢´Å¹²Õñ¡¢Êý×ÖÃÚÄòÔìÓ°xÏß»ú¡¢¸ßѹÑõ²Ö¡¢²ÊÉ«¶àÆÕÀÕ³¬ÉùÕï¶ÏÒÇ¡¢ÉäƵÏûÈÚ¡¢ÊÓƵÄÔµç
    ³Ë³µÂ·Ïߣº
    ÐгµÂ·Ïß(ÍâµØ»¼Õß)£º
    »ð³µÕ¾Â·Ïߣº´Ó±±¾©Õ¾³ö·¢£¬³Ë×øµØÌú2ºÅÏßÔÚ¸´ÐËÃÅϳµ£¬²½ÐÐÖÁÒ½Ôº£»
    ´Ó±±¾©Î÷Õ¾³ö·¢£¬³Ë×ø387·£¬ÔÚ±±¾©¶ùͯҽԺϳµ£»
    ÐгµÂ·Ïß(±¾µØ»¼Õß)£º
    ±±¾©¶ùͯҽԺ¶«ÃÅ£º44¡¢50¡¢84¡¢90¡¢209(Ò¹°à³µ)¡¢387¡¢423¡¢456¡¢691¡¢694¡¢939¡¢ÌØ4¡¢ÌØ12·¹«½»³µ£¬µØÌú¸´ÐËÃÅÕ¾£»
    ±±¾©¶ùͯҽԺÎ÷ÃÅ£º13¡¢15¡¢19¡¢21¡¢42¡¢46¡¢56¡¢68¡¢623¡¢697·¹«½»³µ£¬µØÌúÄÏÀñʿ·վ¡£

  5. fcyyy ÓÚ 2012-06-04 12:33:35·¢±í:

    wee

  6. fcyyy ÓÚ 2012-06-04 12:32:52·¢±í:

    qw

  7. fcyyy ÓÚ 2012-06-04 12:32:21·¢±í:

    wq

  8. tengyue1023 ÓÚ 2012-03-25 23:16:02·¢±í:

    Ô­À´Èç²Þ

  9. abkxswuei ÓÚ 2012-01-02 21:09:33·¢±í:

    Õâ¸öдµÄ»¹²»´í£¬¼ÓÓÍŶ

  10. weiget ÓÚ 2011-11-06 14:11:53·¢±í:

    ѧϰ

  11. С¹ÂÒײ ÓÚ 2011-09-23 17:15:51·¢±í:

    ѧϰÖС­¡­

  12. lonpo ÓÚ 2011-09-02 14:37:55·¢±í:

    ²»Ì«Ã÷°×£¬ÊµÔÚ±§Ç¸

  13. ÎijÉÄ«¿Í ÓÚ 2011-09-01 10:19:35·¢±í:

    ²»Ì«Àí½â£¬Ñ§Ï°ÖС£¡£¡£

  14. GrowthÕ× ÓÚ 2011-08-30 09:33:18·¢±í:

    ¸Ðлwuquan-1230µÄ·ÖÏí£¬±¾Ìù¼ÓÈëµ½ÂÛ̳¶¥ÖõÄLinuxÓ¦ÓÃÌùÖÐ

  15. eruios ÓÚ 2011-08-29 15:25:11·¢±í:

    ºÃÓÐÉî°Â¹þ