]> git.openpandora.org Git - openembedded.git/commitdiff
Remove some GNUism and replace cp -a with cp -pPR (once again)
authorHolger Freyther <zecke@selfish.org>
Sun, 23 Dec 2007 00:23:57 +0000 (00:23 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 23 Dec 2007 00:23:57 +0000 (00:23 +0000)
I didn't touch the to be installed files, as we have GNU coreutils or
at least a compatible busybox version on our targets so far.

18 files changed:
classes/xilinx-bsp.bbclass
packages/busybox/busybox_1.00.bb
packages/gallery/gallery_1.5.5.bb
packages/glibc/eglibc-package.bbclass
packages/glibc/glibc-package.bbclass
packages/linux/linux-dht-walnut_2.6.20.bb
packages/linux/linux-efika_2.6.20.20.bb
packages/linux/linux-efika_2.6.20.bb
packages/linux/linux-efika_2.6.21+git.bb
packages/linux/linux-magicbox_2.6.18.6.bb
packages/linux/linux-magicbox_2.6.19.2.bb
packages/linux/linux-ml403-mvista-2.6.x_git.bb
packages/linux/linux-ml403-slab-2.6.x_git.bb
packages/linux/linux-sequoia_2.6.21.bb
packages/meta/external-toolchain.bb
packages/openmoko2/openmoko-sample2_svn.bb
packages/qte/qtopia-core_4.2.0.bb
packages/qte/qtopia-core_4.3.3.bb

index fd09946061bb7b30ebf9be59186c8867b11c4630..f657e5be94d01486936c794408ecce0f67efc909 100644 (file)
@@ -34,7 +34,7 @@ fi
 case "${XILINX_BOARD}" in
      ML403)
         oenote "ML403 board setup"
-        cp -a ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \
+        cp -pPR ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \
                 ${S}/arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h
      ;;
 
index ca2db7e7608ee72c5ba332a3d7d85fc9127ad90f..262d6afff10d13eee8508ac9453833309846f2f8 100644 (file)
@@ -94,7 +94,7 @@ pkg_prerm_${PN} () {
        # providing its files, this will make update-alternatives work, but the update-rc.d part
        # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
        tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
-       cp -a /bin/busybox $tmpdir/
+       cp -pPR /bin/busybox $tmpdir/
        ln -s /bin/busybox $tmpdir/[
        ln -s /bin/busybox $tmpdir/test
        ln -s /bin/busybox $tmpdir/head
index 9aba2a2f0a877ff57c8db29ba8531617b7acc1c7..5756e98567afe069dee28ec9dd67eaef0da77e60 100644 (file)
@@ -32,7 +32,7 @@ do_compile() {
 #
 do_install() {
        mkdir -p ${D}/${DEST_DIR} ${D}/etc/apache2/modules.d
-       cp -a ${S} ${D}/${DEST_DIR}
+       cp -pPR ${S} ${D}/${DEST_DIR}
        cp ${FILESDIR}/gallery.conf  ${D}/etc/apache2/modules.d/95_gallery.conf
 }
 
index a859ac2ca97e43f56c43249d68acb741ac623474..702d3545912568cf71869868b927e48e22062d5a 100644 (file)
@@ -150,14 +150,14 @@ do_prep_locale_tree() {
        treedir=${WORKDIR}/locale-tree
        rm -rf $treedir
        mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale
-       cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n
+       cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n
        # unzip to avoid parsing errors
        for i in $treedir/${datadir}/i18n/charmaps/*gz; do 
                gunzip $i
        done
-       ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib
+       ls ${D}/lib/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
        if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then
-               cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
+               cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
        fi
        install -m 0755 ${D}${bindir}/localedef $treedir/bin
 }
@@ -166,7 +166,7 @@ do_collect_bins_from_locale_tree() {
        treedir=${WORKDIR}/locale-tree
 
        mkdir -p ${D}${libdir}
-       cp -a $treedir/${libdir}/locale ${D}${libdir}
+       cp -pPR $treedir/${libdir}/locale ${D}${libdir}
 }
 
 python package_do_split_gconvs () {
index b96aae37b99c4184f5b6fb0887de6142190820b6..50fae44bf3ba4b7ed100239dc45a4aebf0155c84 100644 (file)
@@ -141,17 +141,17 @@ do_prep_locale_tree() {
        treedir=${WORKDIR}/locale-tree
        rm -rf $treedir
        mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale
-       cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n
+       cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n
        # unzip to avoid parsing errors
        for i in $treedir/${datadir}/i18n/charmaps/*gz; do 
                gunzip $i
        done
-       ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib
+       ls ${D}/lib/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
        if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then
-               cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
+               cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
        fi
        if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then
-               cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib
+               cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib
        fi
        install -m 0755 ${D}${bindir}/localedef $treedir/bin
 }
@@ -160,7 +160,7 @@ do_collect_bins_from_locale_tree() {
        treedir=${WORKDIR}/locale-tree
 
        mkdir -p ${D}${libdir}
-       cp -a $treedir/${libdir}/locale ${D}${libdir}
+       cp -pPR $treedir/${libdir}/locale ${D}${libdir}
 }
 
 python package_do_split_gconvs () {
index 89a776e07547b691d811c72ab0fcb9cf7c768d0e..ca94ee809f695bea4b00d3e66bbbc2dff729fde8 100644 (file)
@@ -35,11 +35,11 @@ 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/
 }
 
 
index 630e5a62746c44e0b8ae10317ebb74542e411eef..8ef0af6c78d10f988368377dff62fe3875915042 100644 (file)
@@ -63,12 +63,12 @@ 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/
 
        install -d ${STAGING_KERNEL_DIR}/include/asm
-       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_deploy() {
index ddf3ee325708ad3799c092564a54e09eab554ba2..87c769a1aee4b94064e6f44169dc3680efeb7184 100644 (file)
@@ -60,12 +60,12 @@ 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/
 
        install -d ${STAGING_KERNEL_DIR}/include/asm
-       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/
 }
 
 
index 80a4e69a4a70fe4672c7f0f050bb353f0b910102..5f8427ef1e9c8010e62cda0a09d44f1359325a75 100644 (file)
@@ -47,12 +47,12 @@ 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/
 
        install -d ${STAGING_KERNEL_DIR}/include/asm
-       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_deploy() {
index 9410294020ce20eab8ddec42139e63ed7e9721b4..bd9a1c4060958c349f29d0c758d52f371e7836d3 100644 (file)
@@ -44,11 +44,11 @@ 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/
 }
 
 
index 82576776f3664970c32f7b5d8c0c106ce9e484a0..2c79a94e10d10d29b06181b436904fd0c4223efd 100644 (file)
@@ -77,11 +77,11 @@ 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/
 }
 
 
@@ -93,7 +93,7 @@ do_install_append () {
         powerpc${TARGET_VENDOR}-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR_IMAGE}/vmlinux \ 
                  ${DEPLOY_DIR_IMAGE}/linux.bin
         gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin
-        cp -a ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/linux-${PV}-${MACHINE}-${DATETIME}.bin.gz        
+        cp -pPR ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/linux-${PV}-${MACHINE}-${DATETIME}.bin.gz        
         mkimage -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 -n "magicbox"-${PV} \
                 -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${MACHINE}-${DATETIME}.bin        
         rm ${DEPLOY_DIR_IMAGE}/vmlinux
index 76fa75f65d607ba610ed5152701be83c63761440..77b0bbc326fcaf64bad122318b723b6b6771b871 100644 (file)
@@ -33,12 +33,12 @@ do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$
 
        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/
 
        install -d ${STAGING_KERNEL_DIR}/include/asm
-       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/
 }
 
 
index 75233492eb1dbd0d5510fc10eb7bb075a364009f..f0408f365ccb86d3502d6f16b347510627a9a1b2 100644 (file)
@@ -56,12 +56,12 @@ do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$
 
        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/
 
        install -d ${STAGING_KERNEL_DIR}/include/asm
-       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/
 }
 
 
index 1fa520e9140b1abcb3a05bbb25d2e158a83ccf8b..49c7878ca263c313b982f3416193586472908c50 100644 (file)
@@ -31,12 +31,12 @@ do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$
 
        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/
 
        install -d ${STAGING_KERNEL_DIR}/include/asm
-       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/
 }
 
 
index c483ea26a6f98b55d89a35dbee78a19c9d6c60d3..47d9a93a1591763c9cd81a6ed650a75fa7c12aeb 100644 (file)
@@ -30,21 +30,21 @@ do_stage() {
        install -d ${STAGING_DIR}/pkgdata/
        install -d ${STAGING_DIR_TARGET}/shlibs/
 
-       cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
-       cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
+       cp -pPRr ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
+       cp -pPRr ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
 
        if [ -d ${prefix}/ipk ]; then
                install -d ${DEPLOY_DIR_IPK}/
-               cp -ar ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/
+               cp -pPRr ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/
        fi
 
        if [ -d ${prefix}/deb ]; then
                install -d ${DEPLOY_DIR_DEB}/
-               cp -ar ${prefix}/deb/* ${DEPLOY_DIR_DEB}/
+               cp -pPRr ${prefix}/deb/* ${DEPLOY_DIR_DEB}/
        fi
 
        if [ -d ${prefix}/pstage -a "x${DEPLOY_DIR_PSTAGE}" != "x" ]; then
                install -d ${DEPLOY_DIR_PSTAGE}/
-               cp -ar ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/
+               cp -pPRr ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/
        fi
 }
index c05b6d361813b0259d970f48ff09a04f15d43dda..4c2c5aad46b269bf46206d0ba9159a3ff488fed2 100644 (file)
@@ -13,12 +13,12 @@ PACKAGE_ARCH_${PN}-src = "all"
 
 do_configure_prepend() {
        install -d ${WORKDIR}/source
-       cp -a ${S} ${WORKDIR}/source/
+       cp -pPR ${S} ${WORKDIR}/source/
        find ${WORKDIR}/source -name ".svn"|xargs rm -rf
 }
 
 do_install_append() {
        install -d ${D}/usr/local/openmoko/source/
-       cp -a ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/
+       cp -pPR ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/
 }
 
index ab07ecf35d8d4fe00d3aa0107f20ea2250e6f1d1..509230f3ea3990c7b258f0a53eb8fc81551a154b 100644 (file)
@@ -198,7 +198,7 @@ do_stage() {
        mkdir -p ${STAGE_TEMP}
        oe_runmake install INSTALL_ROOT=${STAGE_TEMP}
 
-       cp -af ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}
+       cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}
 
        for i in ${STAGE_TEMP}/${libdir}/*.la
        do
index c486ba164f7d4c053a4a09b12e661f997708bb7a..2995988b42a08236bd8d5bbf942f1347ccf2d9ec 100644 (file)
@@ -210,7 +210,7 @@ do_stage() {
 
     install -d ${STAGING_INCDIR}/qtopiacore4
     install -d ${STAGING_LIBDIR}/qtopiacore4
-    cp -af ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/qtopiacore4/
+    cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/qtopiacore4/
 
     for i in ${STAGE_TEMP}/${libdir}/*.la
     do