User Tools

Site Tools


wiki:development:nxlibs-repository

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

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://packages.debian.org/squeeze/git-load-dirs | git_load_dirs]] tool. It is run in the temporary directory ''t/'': We now import the sources using the [[http://packages.debian.org/squeeze/git-load-dirs | git_load_dirs]] tool. It is run in the temporary directory ''t/'':
  
-<file bash git-load-dirs.sh> +<file bash run-git-load-dirs.sh> 
-  wc=../nx-libs +#!/bin/bash 
-  l=`ls -d nxcomp-*(/)` +wc=../nx-libs 
-  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
 </file> </file>
  
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.
-<code> +
-alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg" +
-</code>+
  
 create ~/.quiltrc-dpkg create ~/.quiltrc-dpkg
-<code>+<code bash .quiltrc-dpkg> 
 +#!/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/debian/patches ]; then mkdir $d/debian/patches; fi     if ! [ -d $d/debian/patches ]; then mkdir $d/debian/patches; fi
 fi fi
 +</code>
 +
 +Set an alias to use these configuration options. This only appies to Bash and can be added to ''~/.bashrc''. Other shells may have similar commands.
 +<code bash>
 +alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg"
 </code> </code>
  
Line 156: Line 160:
 commit your changes with "debcommit -a" commit your changes with "debcommit -a"
 ==== Create new patch ==== ==== Create new patch ====
-apply paches until you reach the code state where you want to begin with your new patch+Apply patches until you reach the code state where you want to begin with your new patch
 <code> <code>
-dquilt push+dquilt push
 </code> </code>
-create new patch NUMBER_NXCOMPONENT_DESCRIPTION.full.patch, for example:+Create new patch ''<NUMBER>_<NXCOMPONENT>_<DESCRIPTION>.full.patch'', for example:
 <code> <code>
-dquilt new 203_nxagent_disable-rootless-exit.full.patch+dquilt new 203_nxagent_disable-rootless-exit.full.patch
 </code> </code>
-add files, which you want to patch with+Add files, which you want to patch with
 <code> <code>
-dquilt add DATEINAME+dquilt add <FILE>
 </code> </code>
-edit files, you want to patch and save the changes+Edit files, you want to patch and save the changes
 <code> <code>
-dquilt refresh+dquilt refresh
 </code> </code>
-revoke all patches with +Revoke all patches, apply all patches to verify that we didn't break any of the following patches, after that revoke all patches again: 
 <code> <code>
-dquilt pop -a+$ dquilt pop -a 
 +$ dquilt push -a 
 +dquilt pop -a
 </code> </code>
-check your changes with "git status" and "git diff". Edit changelog with "dch", make sure you keep changelog lines below 80 characters, for example:+Check your changes with "git status" and "git diff". Edit changelog with "dch", make sure you keep changelog lines below 80 characters, for example:
 <code> <code>
-Create patch: 203_nxagent_disable-rootless-exit.full.patch,+Add patch: 203_nxagent_disable-rootless-exit.full.patch,
   <describe what you did...>.   <describe what you did...>.
 </code> </code>
-commit your changes with "debcommit -a"+Commit your changes with 
 +<code> 
 +debcommit -a 
 +</code>
wiki/development/nxlibs-repository.1330433241.txt.gz · Last modified: 2013/03/08 13:31 (external edit)