aboutsummaryrefslogtreecommitdiffstats
path: root/dpdk/README
diff options
context:
space:
mode:
authorTodd Foggoa <tfoggoa@cisco.com>2016-04-06 09:57:01 -0400
committerTodd Foggoa <tfoggoa@cisco.com>2016-04-06 09:57:01 -0400
commita292c8c35794531d27a068310a76d067f2ccf56a (patch)
tree7b3ed299ee3f1c4d5e9b91f7da186ea3d65f596d /dpdk/README
parent83cc4e140d4fdf915ae027851b442b2ff0a682e8 (diff)
Fix DPDK patch files so git am works smoothly
Change-Id: Ic2a6e6f1ceea81f2e34f3db370682569327b44ad Signed-off-by: Todd Foggoa <tfoggoa@cisco.com>
Diffstat (limited to 'dpdk/README')
-rw-r--r--dpdk/README34
1 files changed, 34 insertions, 0 deletions
diff --git a/dpdk/README b/dpdk/README
new file mode 100644
index 00000000000..95154dc235f
--- /dev/null
+++ b/dpdk/README
@@ -0,0 +1,34 @@
+
+Changes needed to DPDK are stored here as git patch files. Maintaining these
+files using “git format-patch” and “git am” will make it simpler to manage
+these changes. Patches made to DPDK should only be temporary until they are
+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:
+ # git clone http://dpdk.org/git/dpdk dpdk
+
+2. Create a branch based on the DPDK 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
+ # git checkout -b two_dot_two v2.2.0
+
+3. Apply all the existing VPP DPDK patches to this new branch.
+ # git am <VPP directory>/dpdk/dpdk-2.2.0_patches/*
+
+4. Make your changes and commit your change to your DPDK repository.
+ # <edit files>
+ # git commit -s
+
+5. Create the patch files with format-patch. This creates all the patch files
+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 <new patch files> <VPP directory>/dpdk/dpdk-2.2.0_patches
+ # cd <VPP directory>
+ # git add dpdk/dpdk-2.2.0_patches/<new patch files>
+ # git commit -s
+