X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build%2Fexternal%2Fpatches%2FREADME;fp=build%2Fexternal%2FREADME;h=0bead2ef6292278e2322fbbd75cb0f6af3138244;hb=561f2730e8b137cd4e7132b05dab49f6e768ae23;hp=95154dc235f390949d9933dc25c290ea9fb4d4f6;hpb=d974cd4262238168db65b9d837066f7c7511a9c5;p=vpp.git diff --git a/build/external/README b/build/external/patches/README similarity index 55% rename from build/external/README rename to build/external/patches/README index 95154dc235f..0bead2ef629 100644 --- a/build/external/README +++ b/build/external/patches/README @@ -6,19 +6,19 @@ accepted upstream and made available in the next DPDK release. The following is the method used to generate these patches: -1. Git clone the DPDK to a new directory: +1. Git clone the package to a new directory: # git clone http://dpdk.org/git/dpdk dpdk -2. Create a branch based on the DPDK release you wish to patch. +2. Create a branch based on the release you wish to patch. Note, “git tag” will show you all the release tags. The following example is -for DPDK release tag “v2.2.0” and will create a branch named “two_dot_two”. - # cd dpdk +for release tag “v2.2.0” and will create a branch named “two_dot_two”. + # cd # git checkout -b two_dot_two v2.2.0 -3. Apply all the existing VPP DPDK patches to this new branch. - # git am /dpdk/dpdk-2.2.0_patches/* +3. Apply all the existing patches to this new branch. + # git am -4. Make your changes and commit your change to your DPDK repository. +4. Make your changes and commit your change to your repository. # # git commit -s @@ -26,9 +26,5 @@ for DPDK release tag “v2.2.0” and will create a branch named “two_dot_two for your branch (two_dot_two), with your latest commits as the last ones. # git format-patch master..two_dot_two -6. Copy, add and commit the new patches into the VPP patches directory. - # cp /dpdk/dpdk-2.2.0_patches - # cd - # git add dpdk/dpdk-2.2.0_patches/ - # git commit -s +6. Copy, add and commit the new patches into the patches directory.