From: Holger Freyther <zecke@selfish.org>
Date: Wed, 26 Dec 2007 11:37:13 +0000 (+0000)
Subject: merge of '49e39c42b944dda8eed607394e1849029b9f527f'
X-Git-Tag: Release-2010-05/1~8080^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5614741d180f628cb95b3e38852bf40fa65a98e7;p=openembedded.git

Merge ... '49e39c42b944dda8eed607394e1849029b9f527f'
     and 'fbf7570478d5954f66dbaa425a8b6b1c8c1b862c'
---

5614741d180f628cb95b3e38852bf40fa65a98e7
diff --cc packages/linux/linux-dht-walnut_2.6.20.bb
index ca94ee809f,a168ec15de..8c1d2b85e1
--- a/packages/linux/linux-dht-walnut_2.6.20.bb
+++ b/packages/linux/linux-dht-walnut_2.6.20.bb
@@@ -35,17 -24,13 +24,13 @@@ do_stage_append () 
  #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
  
         install -d ${STAGING_KERNEL_DIR}/arch/
 -       cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
 -       cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
 +       cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
 +       cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
  
 -       cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
 -       cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 +       cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
 +       cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
  }
  
- 
- 
- 
- 
  do_install_append () {
          install -d  ${DEPLOY_DIR_IMAGE}
          install -m 0755 arch/ppc/boot/images/zImage.elf \