Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Unified Diff: README.rst

Issue 889963004: Update instrucitons on regenerating patches (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: README.rst
diff --git a/README.rst b/README.rst
index 554c87600fd812dcb4b3b58d726f53f9c128466f..7c9a999d2fe011814309f82b770032047d0af743 100644
--- a/README.rst
+++ b/README.rst
@@ -220,7 +220,7 @@ Modifying package sources / Working with patches
------------------------------------------------
When a package is first built, its source is downloaded and extracted to
-``out/build/<PKG_NAME>``. A new git repository is then created in this
+``out/build/<pkg_name>``. A new git repository is then created in this
folder with the original archive contents on a branch called ``upstream``. The
optional ``nacl.patch`` file is then applied on the ``master`` branch. This
means that at any given time you can see the changes from upstream using ``git
@@ -228,13 +228,12 @@ diff upstream``.
To make changes to a package's patch file the recommended workflow is:
-1. Directly modify the sources in ``out/build/PKG_NAME``.
+1. Directly modify the sources in ``out/build/<pkg_name>``.
2. Build the package and verify the changes.
-3. Use ``git diff upstream.. > ../path/to/nacl.patch`` to regenerate
- the patch file.
+3. Use ``naclpors updatepatch <pkg_name>`` to (re)generate the patch file.
Whenever the upstream archive or patch file changes and you try to build the
package you will be prompted to remove the existing repository and start a new
-one. This is to avoid deleting a repository that might have unsaved changed.
+one. This is to avoid deleting a repository that might contain unsaved changed.
Happy porting!
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698