aboutsummaryrefslogtreecommitdiff
path: root/platform/linux-dpdk/README
diff options
context:
space:
mode:
authorZoltan Kiss <zoltan.kiss@linaro.org>2016-07-06 16:17:04 +0100
committerZoltan Kiss <zoltan.kiss@linaro.org>2016-07-07 14:41:12 +0100
commite884f5f70f745770083e5b57d8a6e982bb2ea1a5 (patch)
treee204b05d4cbf120b0e8a3c8e7686001c3974d194 /platform/linux-dpdk/README
parentbfdc4b98885bbe429db5589ed77da869620df6a8 (diff)
linux-dpdk: scripts: add git-transplant script
This script helps pulling new commit from odp.git by building a list of patches (probably) needed to be ported. There is also a short howto about the usage. Signed-off-by: Zoltan Kiss <zoltan.kiss@linaro.org>
Diffstat (limited to 'platform/linux-dpdk/README')
-rw-r--r--platform/linux-dpdk/README26
1 files changed, 26 insertions, 0 deletions
diff --git a/platform/linux-dpdk/README b/platform/linux-dpdk/README
index d8b790345..5a4215139 100644
--- a/platform/linux-dpdk/README
+++ b/platform/linux-dpdk/README
@@ -296,3 +296,29 @@ If you have build problems, try to run it and see if it works. An example:
odp-dpdk/scripts/devbuild.sh dpdk
odp-dpdk/scripts/devbuild.sh odp
odp-dpdk/scripts/devbuild.sh odp-check
+
+
+8. Upgrading ODP-DPDK to newer ODP API level
+=================================================
+
+This repository is based on odp.git, it also retains the history of that. There
+are some modifications in configure.ac plus a few other files, but most of the
+changes are in platform/linux-dpdk. That directory's Makefile.am builds our
+code and the required parts from platform/linux-generic.
+This allows us to easily pull the necessary changes from odp.git with git:
+
+git remote add odp_base https://git.linaro.org/lng/odp.git
+git pull odp_base master
+
+This will result in a merge commit, and possibly some conflict resolving if
+one of the files we touch outside platform/linux-dpdk is modified. After
+resolving this conflict you need to implement the changes in the API. Also,
+some of the code in our files are exact copy of the linux-generic counterpart,
+it's important to port the fixes to the original. The git-transplant script
+can do this:
+
+scripts/git-transplant.py platform/linux-generic/ platform/linux-dpdk/ \
+[the previous last commit merged from odp.git]..HEAD
+
+It prints the list of prospective patches to be ported. See its comments about
+what it does.