ia64/xen-unstable

changeset 4751:abf7ff0997cc

bitkeeper revision 1.1389.5.1 (4277a7497F1hK5nYlFqibtXDq_Uo5A)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xxx.bk
author kaf24@firebug.cl.cam.ac.uk
date Tue May 03 16:31:05 2005 +0000 (2005-05-03)
parents d8a9ad9290ac efa6730ad90e
children 774b106bc6fa
files BitKeeper/etc/logging_ok linux-2.4.29-xen-sparse/mkbuildtree linux-2.6.11-xen-sparse/mkbuildtree
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Tue May 03 14:27:54 2005 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Tue May 03 16:31:05 2005 +0000
     1.3 @@ -99,3 +99,4 @@ vh249@airwolf.cl.cam.ac.uk
     1.4  vh249@arcadians.cl.cam.ac.uk
     1.5  xen-ia64.adm@bkbits.net
     1.6  xenbk@gandalf.hpl.hp.com
     1.7 +ydroneaud@mandriva.com
     2.1 --- a/linux-2.4.29-xen-sparse/mkbuildtree	Tue May 03 14:27:54 2005 +0000
     2.2 +++ b/linux-2.4.29-xen-sparse/mkbuildtree	Tue May 03 16:31:05 2005 +0000
     2.3 @@ -66,7 +66,7 @@ relative_lndir ()
     2.4      (
     2.5      cd $i
     2.6      pref=`echo $i | sed -e 's#/[^/]*#../#g' -e 's#^\.##'`
     2.7 -    for j in `find . -type f -o -type l -maxdepth 1`; do
     2.8 +    for j in `find . -maxdepth 1 -type f -o -type l`; do
     2.9        ln -sf ${pref}${REAL_DIR}/$i/$j ${SYMLINK_DIR}/$i/$j
    2.10      done
    2.11      )
     3.1 --- a/linux-2.6.11-xen-sparse/mkbuildtree	Tue May 03 14:27:54 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/mkbuildtree	Tue May 03 16:31:05 2005 +0000
     3.3 @@ -66,7 +66,7 @@ relative_lndir ()
     3.4      (
     3.5      cd $i
     3.6      pref=`echo $i | sed -e 's#/[^/]*#../#g' -e 's#^\.##'`
     3.7 -    for j in `find . -type f -o -type l -maxdepth 1`; do
     3.8 +    for j in `find . -maxdepth 1 -type f -o -type l`; do
     3.9        ln -sf ${pref}${REAL_DIR}/$i/$j ${SYMLINK_DIR}/$i/$j
    3.10      done
    3.11      )