{"id":294610,"date":"2024-11-28T20:05:50","date_gmt":"2024-11-28T12:05:50","guid":{"rendered":"https:\/\/lrxjmw.cn\/xxrhzlymzsch.html"},"modified":"2024-11-28T20:05:50","modified_gmt":"2024-11-28T12:05:50","slug":"xxrhzlymzsch","status":"publish","type":"post","link":"https:\/\/lrxjmw.cn\/xxrhzlymzsch.html","title":{"rendered":"\u5b66\u4e60\u5982\u4f55\u5728Linux\u6e90\u7801\u4e2d\u751f\u6210\u548c\u5e94\u7528\u8865\u4e01\u7684\u8be6\u7ec6\u6307\u5357"},"content":{"rendered":"

\u5e8f\u8a00<\/p>\n

\u6211\u4eec\u5728\u53c2\u4e0e\u4e2a\u522b\u5f00\u6e90\u9879\u76ee\u7684\u8fc7\u7a0b\u5f53\u4e2d\uff0c\u5e38\u5e38\u4f1a\u78b0\u5230\u6f0f\u6d1e\u4e4b\u7c7b\u7684\u95ee\u9898\uff0c\u987b\u8981\u6211\u4eec\u6253\u8865\u4e01\u89e3\u51b3\u3002\u5c24\u5176\u662fLinux<\/a>\u6e90\u7801\uff0c\u6e90\u7801\u4ee3\u7801\u91cf\u8f83\u591a\uff0c\u5728\u66f4\u6539\u5b8c\u5185\u6838\u5e76\u53d1\u5e03\u65b0\u5185\u6838\u7684\u65f6\u4faf\uff0c\u57fa\u672c\u91c7\u7528\u8865\u4e01\u7684\u5f62\u5f0f\u8fdb\u884c\u53d1\u5e03\uff0c\u800c\u4e0d\u662f\u5c06\u6574\u4e2a\u5185\u6838\u6253\u5305\u53d1\u5e03<\/p>\n

\u6211\u4eec\u4f7f\u7528\u8865\u4e01\u53d1\u5e03\u6709\u597d\u591a\u7528\u5904<\/p>\n

\u6ce8\uff1a\u535a\u4e3b\u672c\u4eba\u5e76\u6ca1\u6709\u7ed9linux\u63d0\u8fc7\u8865\u4e01linux \u5e94\u7528patch<\/strong>\uff0c\u672c\u6587\u4ec5\u4e3a\u5b66\u4e60\u9012\u4ea4\u8865\u4e01\u7684\u8bb0\u5f55\uff0c\u5e0c\u671b\u5bf9\u4f60\u4eec\u6709\u5e2e\u52a9\uff0c\u52ff\u55b7<\/p>\n

\u5047\u5982\u4e86\u89e3\u8fd9\u65b9\u9762\u7684\u4f6c\uff0c\u4e5f\u6b22\u8fce\u8bc4\u8bba\u533a\u4ea4\u6d41<\/p>\n

StatCounter: \u0434\u043e\u043b\u044f \u041e\u0421 Linux \u043d\u0430 \u0434\u0435\u0441\u043a\u0442\u043e\u043f\u0430\u0445 \u0432\u043f\u0435\u0440\u0432\u044b\u0435 \u043f\u0440\u0435\u0432\u044b\u0441\u0438\u043b\u0430 \u043e\u0442\u043c\u0435\u0442\u043a\u0443 3% -  \u041d\u043e\u0432\u043e\u0441\u0442\u0438 Timeweb Community<\/p>\n

diff\/patch\u751f\u6210\u8865\u4e01<\/p>\n

\u6211\u4eec\u4ee5\u7cbe\u5178\u7684linux0.11\u7248\u672c\u6e90\u7801\u4e3a\u4f8b\uff0c\u5982\u679c\u8bf4\u6211\u4eec\u5f53\u524d\u76ee\u5f55\u4e0b\u6709\u4e24\u4e2a\u6e90\u7801\u6587\u4ef6\u5939linux\u9a71\u52a8\u4e0b\u8f7d\uff0c\u672a\u7ecf\u66f4\u6539\u7684\u6e90\u7801\u6587\u4ef6\u5939\u4e3alinux-0.11\uff0c\u4ee5\u53ca\u66f4\u6539\u5b8c\u6bd5\u7684\u8865\u4e01\u6e90\u7801linux-0.11-new<\/p>\n

\u6ce8\uff1alinux0.11\u662f\u521d\u671f\u7684Linux\u5185\u6838\u7248\u672c\uff0c\u53d1\u5e03\u4e8e1991\u5e74\uff0c\u76f8\u5f53\u53e4\u8001\uff0c\u4ec5\u4f9b\u5b66\u4e60\u4f7f\u7528\uff0c\u800c\u4e14\u5de5\u7a0b\u4e0a\u65e9\u5df2\u6ca1\u6709\u4f7f\u7528\u4ef7\u503c\uff0c\u6700\u65b0\u7248\u5185\u6838\u53ef\u4ee5\u5230\u4e0b\u65b9\u7684\u6e90\u7801\u5e93\u627e\u5bfb<\/p>\n

linux\u6e90\u7801\u5e93\uff1atorvalds\/linux:Linuxkernelsourcetree()<\/p>\n

linux0.11\u6e90\u7801\u5e93\uff1akarottc\/linux-0.11:thesourcecodeoflinux-0.11forstudylinuxkernel()<\/p>\n

\u6211\u4eec\u53ef\u4ee5\u62c9\u53d6\u4e24\u4efdlinux0.11\u6e90\u7801\uff0c\u5176\u4e2d\u4e00\u4efd\u4fdd\u6301\u539f\u8c8c\uff0c\u53e6\u5916\u4e00\u4efd\u4f5c\u51fa\u76f8\u5e94\u66f4\u6539\uff0c\u4f46\u662f\u91cd\u547d\u540d\u6587\u4ef6\u5939\u4e3alinux-0.11-new<\/p>\n

\u6ce8\uff1a\u6211\u8fd9\u91cc\u62c9\u53d6\u6e90\u7801\u65f6\u4f7f\u7528\u53c2\u6570--exclude=.git\u6392\u9664.git\u6587\u4ef6\u5939\uff0c\u907f\u514d\u540e\u7eed\u6253\u8865\u4e01\u5e72\u6270\u3002\u5047\u5982git\u7248\u672c\u504f\u4f4e\uff0c\u6ca1\u6709\u8be5\u529f\u80fd\uff0c\u53ef\u4ee5\u5148\u514b\u9686\uff0c\u518d\u5220\u6389\u6587\u4ef6\u5939<\/p>\n

\n

scss\n\u590d\u5236\u4ee3\u7801\ngit clone --exclude=.git git@github.com:karottc\/linux-0.11.git\n<\/code><\/pre>\n<\/p>\n

\u6216\u5219\u662f<\/p>\n

\n

bash\n\u590d\u5236\u4ee3\u7801\ngit clone git@github.com:karottc\/linux-0.11.git\ngit clone git@github.com:karottc\/linux-0.11.git .\/linux-0.11-new\nrm -rf linux-0.11\/.git\nrm -rf linux-0.11-new\/.git\n<\/code><\/pre>\n<\/p>\n

\u4e4b\u540e\u4f7f\u7528\u4e0b\u8fb9\u7684diff\u547d\u4ee4<\/a>\uff0c\u8f93\u51fa\u539f\u59cb\u6e90\u7801\u548c\u66f4\u6539\u4ee5\u540e\u7684\u6e90\u7801\u7684\u6587\u4ef6\u533a\u522b\uff0c\u5e76\u91cd\u5b9a\u5411\u8f93\u51fa\u5230linux.patch\u8865\u4e01\u6587\u4ef6\u4e2d<\/p>\n

\n

arduino\n\u590d\u5236\u4ee3\u7801\nsudo diff -uprN linux-0.11\/ linux-0.11-new\/ > linux.patch\n<\/code><\/pre>\n<\/p>\n

\u6ce8\uff1a.patch\u4e3a\u7ea6\u5b9a\u4e5f\u79f0\u7684\u8865\u4e01\u6587\u4ef6\u6269\u5145\u540d\uff0c\u5c3d\u91cf\u9075\u5faa\u89c4\u8303\uff0c\u9664\u6b64\u4e4b\u5916\u540d\u5b50\u53ef\u4ee5\u968f\u610f\u8d77<\/p>\n

\u53c2\u6570\u89e3\u91ca\uff1a<\/p>\n

\u4f7f\u7528\u8865\u4e01<\/p>\n

\u6211\u4eec\u53ef\u4ee5\u76f4\u63a5\u5728\u5f53\u524d\u76ee\u5f55\u4e0b\u6267\u884c\u5982\u4e0b\u6253\u8865\u4e01\u547d\u4ee4<\/p>\n

\n

\u590d\u5236\u4ee3\u7801\npatch -p0 < linux.patch\n<\/code><\/pre>\n<\/p>\n

\u5e94\u7528\u5b9d\u4e0b\u8f7d_linux \u5e94\u7528patch_\u5e94\u7528\u5b9d<\/p>\n

\u6ce8\uff1a-p\u53c2\u6570\u4ee3\u8868\u5ffd\u89c6\u54ea\u7ea7\u6587\u4ef6\u8def\u5f84\uff0c0\u6807\u793a\u53bb\u9664\u5168\u8def\u5f84\uff0c1\u6807\u793a\u9664\u53bb\u7b2c\u4e00\u5c42\u8def\u5f84<\/p>\n

\u6216\u5219\u662f\u6b65\u5165\u672a\u7ecf\u66f4\u6539\u7684linux\u6e90\u7801\u6839\u76ee\u5f55\u4e0b\u6267\u884c\u5982\u4e0b\u6253\u8865\u4e01\u547d\u4ee4<\/p>\n

\n

bash\n\u590d\u5236\u4ee3\u7801\npatch -p1 < ..\/linux.patch\n<\/code><\/pre>\n<\/p>\n

\u6ce8\uff1a\u8fd9\u513f\u7684\u91cd\u5b9a\u5411\u7b26\u53f7\u4f60\u4eec\u6ce8\u610f\u4e0d\u8981\u5199\u53cd\uff0c\u6211\u5f00\u59cb\u5c31\u5199\u53cd\u4e86\uff0c\u4e4b\u540e\u6267\u884c\u547d\u4ee4\u540e\u7cfb\u7edf\u624d\u4f1a\u5361\u6b7b\uff0c\u4e0d\u4f1a\u62a5\u9519\uff0c\u800c\u4e14\u4e5f\u4e0d\u4f1a\u4e2d\u6b62<\/p>\n

\u6211\u8fd9\u513f\u7b80\u5355\u4f5c\u4e3a\u793a\u4f8b\uff0c\u4ec5\u66f4\u6539\u4e86README.md\u6587\u4ef6<\/p>\n

\u4e3e\u4f8b\u89e3\u91ca-p\u53c2\u6570\uff0c\u4f8b\u5982\u8bf4patch\u6587\u4ef6\u7247\u65ad\u5982\u4e0b<\/p>\n

\n

sql\n\u590d\u5236\u4ee3\u7801\n--- old\/modules\/pcitable      Mon Sep 27 11:03:56 1999\n\u200b\n+++ new\/modules\/pcitable      Tue Dec 19 20:05:41 2000\n<\/code><\/pre>\n<\/p>\n

\u5047\u5982\u4f7f\u7528\u53c2\u6570-p0\uff0c\u90a3\u5c31\u8868\u793a\u4ece\u5f53\u524d\u76ee\u5f55\u627e\u4e00\u4e2a\u79f0\u4f5cold\u7684\u6587\u4ef6\u5939\uff0c\u518d\u5728\u5b83\u4e0b\u8fb9\u627e\u5bfbmodules\/pcitable\u6587\u4ef6\u6765\u6267\u884cpatch\u64cd\u4f5c<\/p>\n

\u800c\u5047\u5982\u4f7f\u7528\u53c2\u6570-p1\uff0c\u90a3\u5c31\u8868\u793a\u5ffd\u89c6\u7b2c\u4e00\u5c42\u76ee\u5f55\uff08\u5373\u4e0d\u7ba1old\uff09\uff0c\u4ece\u5f53\u524d\u76ee\u5f55\u627e\u5bfbmodules\u7684\u6587\u4ef6\u5939\uff0c\u518d\u5728\u5b83\u4e0b\u8fb9\u627epcitable<\/p>\n

\u6700\u540e\u6211\u4eec\u53ef\u80fd\u51fa\u73b0\u51b2\u7a81\uff0c\u4e00\u822c\u662f\u7531\u4e8e\u539f\u59cb\u6587\u4ef6\u65e9\u5df2\u88ab\u66f4\u6539\u8fc7\uff0c\u8fd9\u65f6\u6211\u4eec\u53ea\u987b\u8981\u81ea\u52a8\u89e3\u51b3\u8fd9\u79cd\u51b2\u7a81\uff0c\u4e4b\u540e\u91cd\u65b0\u6267\u884c\u8865\u4e01\u5373\u53ef<\/p>\n

\u6ce8\uff1a\u5e76\u4e14\u5efa\u8bae\u6700\u597d\u4e0d\u8981\u81ea\u52a8\u66f4\u6539\u539f\u7248\u4ee3\u7801\uff0c\u4e0d\u7136\u540e\u7eed\u6539\u6bd4\u8f83\u9ebb\u70e6<\/p>\n

\u64a4\u6d88\u8865\u4e01<\/p>\n

\u6211\u4eec\u53ef\u4ee5\u6267\u884c\u5982\u4e0b\u547d\u4ee4\u64a4\u6d88\u8865\u4e01<\/p>\n

\n

\u590d\u5236\u4ee3\u7801\npatch -Rp0 < linux.patch\n<\/code><\/pre>\n<\/p>\n

\u6216\u5219\u662f\u6b65\u5165\u672a\u66f4\u6539\u6e90\u7801\u6839\u76ee\u5f55\uff0c\u4e4b\u540e\u6267\u884c\u5982\u4e0b\u547d\u4ee4<\/p>\n

\n

bash\n\u590d\u5236\u4ee3\u7801\npatch -Rp1 < ..\/linux.patch\n<\/code><\/pre>\n<\/p>\n

\u5355\u6587\u4ef6\u8865\u4e01<\/p>\n

\u91cc\u9762\u662f\u5bf9\u4e8e\u6574\u4e2a\u6587\u4ef6\u5939\u6253\u8865\u4e01\uff0c\u4e0b\u8fb9\u5c06\u4f1a\u8bb2\u89e3\u600e\u6837\u5bf9\u5355\u4e2a\u6587\u4ef6\u6253\u8865\u4e01<\/p>\n

\u4f7f\u7528\u5355\u72ec\u6587\u4ef6\u4f9d\u6b21\u6253\u8865\u4e01\uff0c\u53ef\u4ee5\u6108\u53d1\u6709\u6548\u7684\u9a8c\u8bc1\u8865\u4e01\u6b63\u786e\u6027\uff0c\u4fbf\u6377\u540e\u7eed\u8fdb\u884c\u529f\u80fd\u6d4b\u8bd5<\/p>\n

\u4f8b\u5982\u8bf4\u6211\u4eec\u5f53\u524d\u76ee\u5f55\u6709\u539f\u6587\u4ef6a.c\uff0c\u66f4\u6539\u4ee5\u540e\u7684\u6587\u4ef6b.c\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\u751f\u6210\u8865\u4e01\u6587\u4ef6<\/p>\n

\n

css\n\u590d\u5236\u4ee3\u7801\ndiff -u a.c b.c > test.patch\n<\/code><\/pre>\n<\/p>\n

\u5e94\u7528\u5b9d_\u5e94\u7528\u5b9d\u4e0b\u8f7d_linux \u5e94\u7528patch<\/p>\n

\n

bash\n\u590d\u5236\u4ee3\u7801\n# \u4f7f\u7528\u8865\u4e01\npatch a.c < test.patch\n# \u64a4\u9500\u8865\u4e01\npatch -RE < test.patch\n<\/code><\/pre>\n<\/p>\n

quilt<\/p>\n

64d263b21786a039e313d86f_SecOps Solution (31)<\/p>\n

\u7b80\u4ecb<\/p>\n

\u5f53\u6211\u4eec\u5728\u5f00\u53d1\u81ea\u5df1\u9879\u76ee\u7684\u8fc7\u7a0b\u4e2d\u67e5\u770blinux\u662f\u4ec0\u4e48\u7cfb\u7edf\uff0c\u53ef\u80fd\u4f1a\u53ea\u5236\u505a\u5927\u91cf\u8865\u4e01\uff0c\u7ba1\u7406\u8fd9\u79cd\u6570\u76ee\u5e9e\u5927\u7684\u8865\u4e01\u4f1a\u7279\u522b\u82b1\u8d39\u65f6\u95f4<\/p>\n

\u6240\u4ee5linux\u5185\u6838\u5f00\u53d1\u8005AndrewMorton\u5f00\u53d1\u51faquilt\u8865\u4e01\u7ba1\u7406\u5de5\u5177\uff0c\u4ee5\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u7684\u7ba1\u7406\u8865\u4e01<\/p>\n

\u5b98\u65b9\u76f8\u5173\u6587\u6863<\/p>\n

\u672c\u7ae0\u5c06\u4f1a\u7b80\u5355\u8bb2\u89e3quilt\u4f7f\u7528\u6d41\u7a0b\uff0c\u66f4\u591a\u8be6\u5c3d\u4fe1\u606f\u53ef\u4ee5\u67e5\u770b\u4e0a\u65b9\u5b98\u65b9\u6587\u6863<\/p>\n

\u4f7f\u7528<\/p>\n

\u53ea\u8981\u6211\u4eec\u5728\u6e90\u4ee3\u7801\u6811\u91cc\u4f7f\u7528\u4e86quilt\u547d\u4ee4\uff0cquilt\u90fd\u4f1a\u5728\u6e90\u4ee3\u7801\u6811\u7684\u6839\u76ee\u5f55\u6784\u5efa\u4e24\u4e2a\u7279\u6b8a\u76ee\u5f55\uff1apatches\u548c.pc<\/p>\n

patches\u6587\u4ef6\u5939\u4e0b\u4e3a\u7ba1\u7406\u7684\u8865\u4e01\u6587\u4ef6<\/p>\n

.pc\u6587\u4ef6\u5939\u4e0b\u4fdd\u5b58\u7740\u5176\u5185\u90e8\u5de5\u4f5c\u72b6\u6001<\/p>\n

\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\u5b89\u88c5<\/p>\n

\n

arduino\n\u590d\u5236\u4ee3\u7801\nsudo apt-get install quilt\n<\/code><\/pre>\n<\/p>\n

\u65b0\u5efa\u8865\u4e01\u6587\u4ef6<\/p>\n

\n

arduino\n\u590d\u5236\u4ee3\u7801\nquilt new xxx.patch\n<\/code><\/pre>\n<\/p>\n

\u8865\u4e01\u6587\u4ef6\u5173\u8054\u66f4\u6539\u6587\u4ef6\uff0c\u5173\u8054\u540e\u5373\u53ef\u5bf9\u6587\u4ef6\u8fdb\u884c\u66f4\u6539\uff0c\u5982\u8981\u5173\u8054\u591a\u4e2a\u6587\u4ef6\uff0c\u91cd\u590d\u6dfb\u52a0\u4e4b\u540e\u66f4\u6539\u5373\u53ef<\/p>\n

\n

csharp\n\u590d\u5236\u4ee3\u7801\nquilt add file\n<\/code><\/pre>\n<\/p>\n

\u67e5\u770b\u8865\u4e01\u662f\u5426\u6b63\u786e<\/p>\n

\n

\u590d\u5236\u4ee3\u7801\nquilt diff\n<\/code><\/pre>\n<\/p>\n

\u4fdd\u5b58\u8865\u4e01\uff0c\u7136\u540e\u8865\u4e01\u6587\u4ef6\u4f1a\u4fdd\u5b58\u5728patches<\/p>\n

\n

\u590d\u5236\u4ee3\u7801\nquilt refresh\n<\/code><\/pre>\n<\/p>\n

git<\/p>\n

image2<\/p>\n

git\u63d0\u4f9b\u4e86\u4e24\u79cd\u8865\u4e01\u65b9\u6848<\/p>\n

gitdiff\u751f\u6210\u7684\u6587\u4ef6\u4e0d\u5bcc\u542bcommit\u4fe1\u606flinux \u5e94\u7528patch<\/strong>\uff0c\u53ef\u4ee5\u6307\u5b9a\u6587\u4ef6\u751f\u6210diff\uff0c\u4e5f\u53ef\u4ee5\u6307\u5b9a\u5355\u4e2acommit\uff0c\u591a\u4e2acommit\u751f\u6210<\/p>\n

gitformat-patch\u751f\u6210\u7684.patch\u6587\u4ef6\u5bcc\u542bcommmit\u4fe1\u606f\uff0c\u4e00\u4e2acommit\u5bf9\u5e94\u4e00\u4e2apatch\u6587\u4ef6<\/p>\n

\u6ce8\uff1a\u672c\u7ae0\u5c06\u4f1a\u7b80\u5355\u8bb2\u89e3git\u8865\u4e01\u6d41\u7a0b\uff0c\u5018\u82e5\u60a8\u987b\u8981\u66f4\u8be6\u5c3d\u7684\u6587\u6863\u8bf4\u660e\uff0c\u535a\u4e3b\u4f1a\u5c06\u5728\u6bcf\u5c0f\u7ae0\u5f00\u5934\u9644\u4e0agit\u5b98\u7f51\u6587\u6863\u94fe\u63a5\uff0c\u4f9b\u60a8\u53c2\u8003<\/p>\n

gitdiff<\/p>\n

\u5b98\u65b9\u6587\u6863\uff1aGit-git-diffDocumentation()<\/p>\n

\u5236\u505a\u8865\u4e01\u547d\u4ee4\u5982\u4e0b<\/p>\n

\n

bash\n\u590d\u5236\u4ee3\u7801\n# \u5355\u72ec\u6587\u4ef6\u8865\u4e01\ngit diff Test.java > test.patch\n# \u6240\u6709\u6587\u4ef6\u8865\u4e01\ngit diff  > test.patch\n<\/code><\/pre>\n<\/p>\n

\u6307\u5b9acommitid\u5236\u505a\u8865\u4e01<\/p>\n

\n

bash\n\u590d\u5236\u4ee3\u7801\ngit diff [commit sha1 id] [commit sha1 id]> test.patch\n<\/code><\/pre>\n<\/p>\n

gitformat-patch<\/p>\n

\u5b98\u65b9\u6587\u6863\uff1aGit-git-format-patchDocumentation()<\/p>\n

\u5236\u505a\u5f53\u524d\u5206\u652f\u8d85\u524d\u4e8e\u6307\u5b9a\u5206\u652f\u9012\u4ea4\u7684\u8865\u4e01<\/p>\n

\u6ce8\uff1a\u547d\u4ee4\u793a\u4f8b\u5373\u4e3a\u5236\u505a\u8d85\u524d\u4e8emaster\u5206\u652f\u7684\u8865\u4e01<\/p>\n

\n

lua\n\u590d\u5236\u4ee3\u7801\ngit format-patch -M master\n<\/code><\/pre>\n<\/p>\n

\u5236\u505a\u67d0\u6b21\u9012\u4ea4\u4e4b\u540e\u7684\u8865\u4e01<\/p>\n

\n

python\n\u590d\u5236\u4ee3\u7801\ngit format-patch [commit id]\n

\u5e94\u7528\u5b9d_\u5e94\u7528\u5b9d\u4e0b\u8f7d_linux \u5e94\u7528patch<\/p>\n<\/code><\/pre>\n<\/p>\n

\u67d0\u4e24\u6b21\u9012\u4ea4\u4e4b\u95f4\u8865\u4e01<\/p>\n

\n

python\n\u590d\u5236\u4ee3\u7801\ngit format-patch [commit sha1 id]..[commit sha1 id]\n<\/code><\/pre>\n<\/p>\n

\u5e94\u7528\u8865\u4e01<\/p>\n

\u68c0\u6d4b\u8865\u4e01\u6587\u4ef6<\/p>\n

\n

bash\n\u590d\u5236\u4ee3\u7801\ngit apply --stat   xxx.patch\n<\/code><\/pre>\n<\/p>\n

\u68c0\u6d4b\u80fd\u591f\u5e94\u7528\u6210\u529f<\/p>\n

\n

css\n\u590d\u5236\u4ee3\u7801\ngit apply --check xxx.patch\n<\/code><\/pre>\n<\/p>\n

\u4f7f\u7528\u8865\u4e01<\/p>\n

\n

css\n\u590d\u5236\u4ee3\u7801\ngit am --signoff < xxx.patch\n<\/code><\/pre>\n<\/p>\n

\u5e76\u4e14\u53ef\u80fd\u4f1a\u51fa\u73b0\u6211\u4eec\u524d\u9762\u63d0\u53ca\u7684\u51b2\u7a81\uff0c\u9020\u6210\u4f7f\u7528\u8865\u4e01\u5931\u8d25\uff0c\u51fa\u73b0\u5982\u4e0b\u9519\u8bef<\/p>\n

\n

vbnet\n\u590d\u5236\u4ee3\u7801\n$ git am PATCH\nApplying: PACTH DESCRIPTION\nerror: patch failed: file.c:137\nerror: file.c: patch does not apply\nerror: patch failed: Makefile:24\nerror: libavfilter\/Makefile: patch does not apply\nPatch failed at 0001 PATCH DESCRIPTION\nWhen you have resolved this problem run \"git am --resolved\".\nIf you would prefer to skip this patch, instead run \"git am --skip\".\nTo restore the original branch and stop patching run \"git am --abort\".\n<\/code><\/pre>\n<\/p>\n

\u89e3\u51b3\u51b2\u7a81<\/p>\n

linux \u5e94\u7528patch_\u5e94\u7528\u5b9d_\u5e94\u7528\u5b9d\u4e0b\u8f7d<\/p>\n

\u4f7f\u7528\u4e0b\u8fb9\u547d\u4ee4\u624b\u52a8\u5408\u5e76\u4e0d\u51b2\u7a81\u4ee3\u7801\uff0c\u4fdd\u7559\u51b2\u7a81\u90e8\u4efd<\/p>\n

\u6267\u884c\u540e\u4f1a\u751f\u6210\u540e\u7f00\u4e3a.rej\u7684\u6587\u4ef6\uff0c\u4fdd\u5b58\u6ca1\u6709\u5408\u5e76\u8fdb\u53bb\u7684\u90e8\u4efd\u7684\u5185\u5bb9\uff0c\u53ef\u4ee5\u53c2\u8003\u8fd9\u4e2a\u8fdb\u884c\u51b2\u7a81\u89e3\u51b3<\/p>\n

\u89e3\u51b3\u5b8c\u51b2\u7a81\u540e\u5220\u6389\u540e\u7f00\u4e3a.rej\u7684\u6587\u4ef6\uff0c\u4e4b\u540e\u9012\u4ea4\u4ee3\u7801\u5230\u6e90\u7801\u5e93\u5373\u53ef<\/p>\n

\u200b\u6700\u540e<\/p>\n

\u4e3a\u4e86\u5e2e\u52a9\u4f60\u4eec\u66f4\u597d\u7684\u5b66\u4e60\u7f51\u8def\u5b89\u5168\uff0c\u5c0f\u7f16\u7ed9\u4f60\u4eec\u6253\u7b97\u4e86\u4e00\u4efd\u7f51\u8def\u5b89\u5168\u5165\u95e8\/\u8fdb\u9636\u5b66\u4e60\u8d44\u6599\uff0c\u4e0a\u9762\u7684\u5185\u5bb9\u90fd\u662f\u9002\u5b9c\u96f6\u57fa\u7840\u5c0f\u767d\u7684\u7b14\u8bb0\u548c\u8d44\u6599\uff0c\u4e0d\u61c2\u7f16\u7a0b\u4e5f\u80fd\u542c\u61c2\u3001\u770b\u61c2\uff0c\u6240\u6709\u8d44\u6599\u5171282G\uff0c\u540c\u5b66\u4eec\u5047\u5982\u6709\u987b\u8981\u5168\u5957\u7f51\u8def\u5b89\u5168\u5165\u95e8+\u8fdb\u9636\u5b66\u4e60\u8d44\u6e90\u5305\uff0c\u53ef\u4ee5\u70b9\u51fb\u514d\u8d39\u53d1\u653e\uff08\u5982\u9047\u626b\u7801\u95ee\u9898\uff0c\u53ef\u4ee5\u5728\u8bc4\u8bba\u533a\u7559\u8a00\u53d1\u653e\u54e6\uff09~<\/p>\n

\u6709\u987b\u8981\u7684\u7537\u5b50\u4f34\uff0c\u53ef\u4ee5\u70b9\u51fb\u4e0b\u65b9\u94fe\u63a5\u514d\u8d39\u53d1\u653e\u6216\u5219V\u626b\u63cf\u4e0b\u65b9\u4e8c\u7ef4\u7801\u514d\u8d39\u53d1\u653e<\/p>\n

CSDN\u5927\u793c\u5305\uff1a\u5168\u7f51\u6700\u5168\u300a\u7f51\u7edc\u5b89\u5168\u5165\u95e8&\u8fdb\u9636\u5b66\u4e60\u8d44\u6e90\u5305\u300b\u514d\u8d39\u5206\u4eab\uff08\u5b89\u5168\u94fe\u63a5\uff0c\u653e\u5fc3\u70b9\u51fb\uff09<\/p>\n

\u200b<\/p>\n

1\ufe0f\u20e3\u96f6\u57fa\u7840\u5165\u95e8\u2460\u5b66\u4e60\u8def\u7ebf<\/p>\n

\u5bf9\u4e8e\u4ece\u6765\u6ca1\u6709\u63a5\u89e6\u8fc7\u7f51\u8def\u5b89\u5168\u7684\u670b\u53cb\uff0c\u6211\u4eec\u5e2e\u4f60\u6253\u7b97\u4e86\u8be6\u5c3d\u7684\u5b66\u4e60\u6210\u957f\u8def\u7ebf\u56fe\u3002\u53ef\u4ee5\u8bf4\u662f\u6700\u79d1\u5b66\u6700\u7cfb\u7edf\u7684\u5b66\u4e60\u8def\u7ebf\uff0c\u4f60\u4eec\u8ddf\u968f\u8fd9\u4e2a\u5927\u7684\u65b9\u5411\u5b66\u4e60\u51c6\u6ca1\u95ee\u9898\u3002<\/p>\n

\u2461\u8def\u7ebf\u5bf9\u5e94\u5b66\u4e60\u89c6\u9891<\/p>\n

\u540c\u65f6\u6bcf\u4f4d\u6210\u957f\u8def\u7ebf\u5bf9\u5e94\u7684\u84dd\u7b79\u80a1\u90fd\u6709\u914d\u5957\u7684\u89c6\u9891\u63d0\u4f9b\uff1a<\/p>\n

\u5e94\u7528\u5b9d\u4e0b\u8f7d_linux \u5e94\u7528patch_\u5e94\u7528\u5b9d<\/p>\n

\u56e0\u7bc7\u5e45\u6709\u9650\uff0c\u4ec5\u5c55\u793a\u90e8\u4efd\u8d44\u6599<\/p>\n

2\ufe0f\u20e3\u89c6\u9891\u914d\u5957\u8d44\u6599&\u56fd\u5916\u5185\u7f51\u5b89\u4e66\u7c4d\u3001\u6587\u6863\u2460\u6587\u6863\u548c\u4e66\u7c4d\u8d44\u6599<\/p>\n

\u5e94\u7528\u5b9d_linux \u5e94\u7528patch_\u5e94\u7528\u5b9d\u4e0b\u8f7d<\/p>\n

\u2461\u9ed1\u5ba2\u6280\u672f<\/p>\n

\u5e94\u7528\u5b9d\u4e0b\u8f7d_linux \u5e94\u7528patch_\u5e94\u7528\u5b9d<\/p>\n

linux \u5e94\u7528patch_\u5e94\u7528\u5b9d\u4e0b\u8f7d_\u5e94\u7528\u5b9d<\/p>\n

\u56e0\u7bc7\u5e45\u6709\u9650\uff0c\u4ec5\u5c55\u793a\u90e8\u4efd\u8d44\u6599<\/p>\n

CSDN\u5927\u793c\u5305\uff1a\u5168\u7f51\u6700\u5168\u300a\u7f51\u7edc\u5b89\u5168\u5165\u95e8&\u8fdb\u9636\u5b66\u4e60\u8d44\u6e90\u5305\u300b\u514d\u8d39\u5206\u4eab\uff08\u5b89\u5168\u94fe\u63a5\uff0c\u653e\u5fc3\u70b9\u51fb\uff09<\/p>\n

\u200b<\/p>\n

3\ufe0f\u20e3\u7f51\u8def\u5b89\u5168\u6e90\u7801\u5408\u8f91+\u5de5\u5177\u5305<\/p>\n

linux \u5e94\u7528patch_\u5e94\u7528\u5b9d\u4e0b\u8f7d_\u5e94\u7528\u5b9d<\/p>\n

4\ufe0f\u20e3\u7f51\u8def\u5b89\u5168\u7b14\u8bd5\u9898<\/p>\n

\u5e94\u7528\u5b9d\u4e0b\u8f7d_\u5e94\u7528\u5b9d_linux \u5e94\u7528patch<\/p>\n

5\ufe0f\u20e3\u6c47\u603b<\/p>\n

\u5e94\u7528\u5b9d\u4e0b\u8f7d_\u5e94\u7528\u5b9d_linux \u5e94\u7528patch<\/p>\n

\u5e94\u7528\u5b9d_linux \u5e94\u7528patch_\u5e94\u7528\u5b9d\u4e0b\u8f7d<\/p>\n

\u6240\u6709\u8d44\u6599\u26a1\ufe0f\uff0c\u540c\u5b66\u4eec\u5047\u5982\u6709\u987b\u8981\u5168\u5957\u300a\u7f51\u7edc\u5b89\u5168\u5165\u95e8+\u8fdb\u9636\u5b66\u4e60\u8d44\u6e90\u5305\u300b\uff0c\u626b\u7801\u83b7\u53d6~<\/p>\n

CSDN\u5927\u793c\u5305\uff1a\u5168\u7f51\u6700\u5168\u300a\u7f51\u7edc\u5b89\u5168\u5165\u95e8&\u8fdb\u9636\u5b66\u4e60\u8d44\u6e90\u5305\u300b\u514d\u8d39\u5206\u4eab\uff08\u5b89\u5168\u94fe\u63a5\uff0c\u653e\u5fc3\u70b9\u51fb\uff09<\/p>\n

\u200b<\/p>\n","protected":false},"excerpt":{"rendered":"

\u6587\u4ef6\u5939\uff0c\u9632\u6b62\u540e\u7eed\u6253\u8865\u4e01\u5e72\u6270\u3002\u6e90\u7801\u6839\u76ee\u5f55\u4e0b\u6267\u884c\u5982\u4e0b\u6253\u8865\u4e01\u547d\u4ee4\u6700\u540e\u6211\u4eec\u53ef\u80fd\u51fa\u73b0\u51b2\u7a81\uff0c\u901a\u5e38\u662f\u56e0\u4e3a\u539f\u59cb\u6587\u4ef6\u5df2\u7ecf\u88ab\u4fee\u6539\u8fc7\uff0c\u8fd9\u65f6\u6211\u4eec\u53ea\u9700\u8981\u624b\u52a8\u89e3\u51b3\u8fd9\u4e9b\u51b2\u7a81\uff0c\u7136\u540e\u91cd\u65b0\u6267\u884c\u8865\u4e01\u5373\u53ef\u4e0a\u9762\u662f\u5bf9\u4e8e\u6574\u4e2a\u6587\u4ef6\u5939\u6253\u8865\u4e01\uff0c\u4e0b\u9762\u5c06\u4f1a\u8bb2\u89e3\u5982\u4f55\u5bf9\u5355\u4e2a\u6587\u4ef6\u6253\u8865\u4e01\u6587\u4ef6\u5939\u4e0b\u4e3a\u7ba1\u7406\u7684\u8865\u4e01\u6587\u4ef6\u5e94\u7528\u8865\u4e01<\/p>\n","protected":false},"author":1,"featured_media":294611,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[988],"tags":[4518,4520,4522,4521,4519],"class_list":["post-294610","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-tougao","tag-lym","tag-nhfb","tag-ctjj","tag-ymk","tag-bdscyy"],"acf":[],"_links":{"self":[{"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/posts\/294610","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/comments?post=294610"}],"version-history":[{"count":0,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/posts\/294610\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/media\/294611"}],"wp:attachment":[{"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/media?parent=294610"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/categories?post=294610"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/lrxjmw.cn\/wp-json\/wp\/v2\/tags?post=294610"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}