Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
add: nasm and ipsec-mb into vpp-ext-deps packaging
[vpp.git]
/
build
/
external
/
patches
/
README
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
95154dc
..
0bead2e
100644
(file)
--- 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:
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
# 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
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
<root dir>
# git checkout -b two_dot_two v2.2.0
# 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/*
+3. Apply all the existing patches to this new branch.
+ # git am <
/path/to/existing/patches/*>
-4. Make your changes and commit your change to your
DPDK
repository.
+4. Make your changes and commit your change to your repository.
# <edit files>
# git commit -s
# <edit files>
# 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
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
+6. Copy, add and commit the new patches into the patches directory.