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
Next revision Both sides next revision
wiki:development:nxlibs-repository [2012/02/28 12:09]
morty Make use of DokuWiki formatting
wiki:development:nxlibs-repository [2012/02/28 13:22]
morty missing bash
Line 76: Line 76:
 Now clone the nx-libs repo: Now clone the nx-libs repo:
  
-   git clone git://code.x2go.org/nx-libs.git+<code bash> 
 +git clone git://code.x2go.org/nx-libs.git 
 +</code>
  
 there, for each new submodule, create a new branch. as an example, here for the nxcomp branch: there, for each new submodule, create a new branch. as an example, here for the nxcomp branch:
  
-   git checkout -b nxcomp a840692edc9c6d19cd7c057f68e39c7d95eb767d+<code bash> 
 +git checkout -b nxcomp a840692edc9c6d19cd7c057f68e39c7d95eb767d 
 +</code>
          
-NB: the commit a840692edc9c6d19cd7c057f68e39c7d95eb767d is the very first commit in the repository. It contains an empty tree as content and is common for all branches in ''nx-libs''. This faciliates the merging step later.+NB: the commit ''a840692edc9c6d19cd7c057f68e39c7d95eb767d'' is the very first commit in the repository. It contains an empty tree as content and is common for all branches in ''nx-libs''. This faciliates the merging step later.
  
 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 102: 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 121: Line 124:
 </code> </code>
  
-==== modifying patches ====+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> 
 + 
 +==== Modifying patches ====
 get a source tree from git get a source tree from git
 <code> <code>
Line 156: Line 164:
 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
Line 162: Line 170:
 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
wiki/development/nxlibs-repository.txt · Last modified: 2013/03/08 13:31 (external edit)