This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
wiki:development:nxlibs-repository [2012/02/28 12:47] ncryer [modifying patches] |
wiki:development:nxlibs-repository [2013/03/08 13:31] (current) |
||
|---|---|---|---|
| Line 90: | Line 90: | ||
| We now import the sources using the [[http:// | We now import the sources using the [[http:// | ||
| - | <file bash git-load-dirs.sh> | + | <file bash run-git-load-dirs.sh> |
| - | wc=../ | + | # |
| - | l=`ls -d nxcomp-*(/ | + | wc=../ |
| - | for f in $l; do (cd $wc; git reset --hard ; git clean -dfx); git_load_dirs -w $wc $f; done | + | l=`ls -d nxcomp-*(/ |
| + | for f in $l; do (cd $wc; git reset --hard ; git clean -dfx); git_load_dirs -w $wc $f; done | ||
| </ | </ | ||
| Line 106: | Line 107: | ||
| ===== Editing patches using quilt ===== | ===== Editing patches using quilt ===== | ||
| ==== Configure quilt ==== | ==== Configure quilt ==== | ||
| - | add to ~/.bashrc | + | The following configuration options support the usage of quilt. |
| - | < | + | |
| - | alias dquilt=" | + | |
| - | </ | + | |
| create ~/ | create ~/ | ||
| - | < | + | < |
| + | #!/bin/bash | ||
| d=. ; while [ ! -d $d/debian -a `readlink -e $d` != / ]; do d=$d/..; done | d=. ; while [ ! -d $d/debian -a `readlink -e $d` != / ]; do d=$d/..; done | ||
| if [ -d $d/debian ] && [ -z $QUILT_PATCHES ]; then | if [ -d $d/debian ] && [ -z $QUILT_PATCHES ]; then | ||
| Line 123: | Line 122: | ||
| if ! [ -d $d/ | if ! [ -d $d/ | ||
| fi | fi | ||
| + | </ | ||
| + | |||
| + | Set an alias to use these configuration options. This only appies to Bash and can be added to '' | ||
| + | <code bash> | ||
| + | alias dquilt=" | ||
| </ | </ | ||
| Line 156: | Line 160: | ||
| commit your changes with " | commit your changes with " | ||
| ==== Create new patch ==== | ==== Create new patch ==== | ||
| - | apply paches | + | Apply patches |
| < | < | ||
| - | dquilt push | + | $ dquilt push |
| </ | </ | ||
| - | create | + | Create |
| < | < | ||
| - | dquilt new 203_nxagent_disable-rootless-exit.full.patch | + | $ dquilt new 203_nxagent_disable-rootless-exit.full.patch |
| </ | </ | ||
| - | add files, which you want to patch with | + | Add files, which you want to patch with |
| < | < | ||
| - | dquilt add DATEINAME | + | $ dquilt add < |
| </ | </ | ||
| - | edit files, you want to patch and save the changes | + | Edit files, you want to patch and save the changes |
| < | < | ||
| - | dquilt refresh | + | $ dquilt refresh |
| </ | </ | ||
| - | revoke all patches | + | Revoke all patches, apply all patches to verify that we didn't break any of the following patches, after that revoke all patches |
| < | < | ||
| - | dquilt pop -a | + | $ dquilt pop -a |
| + | $ dquilt push -a | ||
| + | $ dquilt pop -a | ||
| </ | </ | ||
| - | check your changes with "git status" | + | Check your changes with "git status" |
| < | < | ||
| - | * Create | + | * Add patch: 203_nxagent_disable-rootless-exit.full.patch, |
| < | < | ||
| </ | </ | ||
| - | commit | + | Commit |
| + | < | ||
| + | $ debcommit -a | ||
| + | </ | ||