[oe-commits] org.oe.dev Remove some GNUism and replace cp -a with cp -pPR (once again)
freyther commit
openembedded-commits at lists.openembedded.org
Wed Dec 26 12:15:09 UTC 2007
Remove some GNUism and replace cp -a with cp -pPR (once again)
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.
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 85e0c839d1cc6e3f8c279e0ac76fdae361d68f73
ViewMTN: http://monotone.openembedded.org/revision/info/85e0c839d1cc6e3f8c279e0ac76fdae361d68f73
Files:
1
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
Diffs:
#
# mt diff -r0e05da824e1f51562e4d0cdc2aae56a6572fc7cf -r85e0c839d1cc6e3f8c279e0ac76fdae361d68f73
#
#
#
# patch "classes/xilinx-bsp.bbclass"
# from [1c5ead4afe4f57431d3f3a5a8c80bdaf34afa9b8]
# to [e8c7ed63687307cb104b234a6c0f4b060974c982]
#
# patch "packages/busybox/busybox_1.00.bb"
# from [a4331e926e10003bf120d6d761b2d94e554c6ab9]
# to [cbf5fd6adad4719d56db281aafea88d874e63772]
#
# patch "packages/gallery/gallery_1.5.5.bb"
# from [08012e9bbaba0586c7721ce8bf77b816de83ebd2]
# to [733e15213ab5e6ec1bd791438af67af63d5ec35c]
#
# patch "packages/glibc/eglibc-package.bbclass"
# from [8f51cdb2c68ef10a8cc444bb9c80b76e1b529a8e]
# to [707f3f7fec8dba48bff09a80fe93f4d753d0ae20]
#
# patch "packages/glibc/glibc-package.bbclass"
# from [87de7a00ded18ae91f844d05b3fb78dd64e0fd7b]
# to [f4791b3fa7f4d093f75d3e760b405eca7feae357]
#
# patch "packages/linux/linux-dht-walnut_2.6.20.bb"
# from [62bdf8a25e2c69fa6d78f11a236567cc8e3205ea]
# to [0c179ddf00c01ed7abb520e96d914fffa789a83b]
#
# patch "packages/linux/linux-efika_2.6.20.20.bb"
# from [02bf23057848f530f4bb9b387634af8ca51c55f3]
# to [01117a66cc290abe28c789551dafbdaadaf2e6df]
#
# patch "packages/linux/linux-efika_2.6.20.bb"
# from [3d646a13d61ed36e48613a5d62ae4c153c42616e]
# to [26eb3e8b2f654dac6975e04c0e7c078417623da6]
#
# patch "packages/linux/linux-efika_2.6.21+git.bb"
# from [b07652616db0ca693ab942e5d21576b84f04e3e9]
# to [1d96763c1bba903c9753ae5d85530485bea1668d]
#
# patch "packages/linux/linux-magicbox_2.6.18.6.bb"
# from [2863c6191e6edd688014663327d3b35bfd47e9ea]
# to [9929bed5a862613d7d6d47cab1dbbed6605b127d]
#
# patch "packages/linux/linux-magicbox_2.6.19.2.bb"
# from [b03c2ca7543c5914973b54ef5b3ea159fbef77ed]
# to [f40feb36483f15f528a68ff787da7d1a1dc83f38]
#
# patch "packages/linux/linux-ml403-mvista-2.6.x_git.bb"
# from [607a3ec1212c49a8bec07ab6a9220e1868f31e6d]
# to [1627e847f526fa7073747ec037b61f626f96352f]
#
# patch "packages/linux/linux-ml403-slab-2.6.x_git.bb"
# from [9199fb7885a068659ab66b6897c7dcf1f94cf3c4]
# to [5030af659ba81e0fd39cabcfe458111ae1646763]
#
# patch "packages/linux/linux-sequoia_2.6.21.bb"
# from [91ba088cf6b7afc424eda939be7afb1dd6223594]
# to [5dc8ca7fe3e92accabff7e6dc3d9d28540f8839b]
#
# patch "packages/meta/external-toolchain.bb"
# from [32574844f3d4c4554cb6e4193123ab1c001b9046]
# to [dcaf40be62789b278a8bcf32b7d1a80010487c6a]
#
# patch "packages/openmoko2/openmoko-sample2_svn.bb"
# from [8dfb2ad71843cf6a80cb46f17623565dbd5a95fa]
# to [f81b348bfe4ffd0c3a27b9c3042e6e2945ea3971]
#
# patch "packages/qte/qtopia-core_4.2.0.bb"
# from [003bf319b5866af6b727725457754c7f73345f6d]
# to [d6737081d102288c5e64af76e569846fe24aa160]
#
# patch "packages/qte/qtopia-core_4.3.3.bb"
# from [132f2ff144e5483dcf628cf56459ce7b81f52b0f]
# to [d4c1b9cf0eb88a354b2c9eab889125d62c8cef89]
#
============================================================
--- classes/xilinx-bsp.bbclass 1c5ead4afe4f57431d3f3a5a8c80bdaf34afa9b8
+++ classes/xilinx-bsp.bbclass e8c7ed63687307cb104b234a6c0f4b060974c982
@@ -34,7 +34,7 @@ case "${XILINX_BOARD}" in
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
;;
============================================================
--- packages/busybox/busybox_1.00.bb a4331e926e10003bf120d6d761b2d94e554c6ab9
+++ packages/busybox/busybox_1.00.bb cbf5fd6adad4719d56db281aafea88d874e63772
@@ -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
============================================================
--- packages/gallery/gallery_1.5.5.bb 08012e9bbaba0586c7721ce8bf77b816de83ebd2
+++ packages/gallery/gallery_1.5.5.bb 733e15213ab5e6ec1bd791438af67af63d5ec35c
@@ -32,7 +32,7 @@ do_install() {
#
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
}
============================================================
--- packages/glibc/eglibc-package.bbclass 8f51cdb2c68ef10a8cc444bb9c80b76e1b529a8e
+++ packages/glibc/eglibc-package.bbclass 707f3f7fec8dba48bff09a80fe93f4d753d0ae20
@@ -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 () {
============================================================
--- packages/glibc/glibc-package.bbclass 87de7a00ded18ae91f844d05b3fb78dd64e0fd7b
+++ packages/glibc/glibc-package.bbclass f4791b3fa7f4d093f75d3e760b405eca7feae357
@@ -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 () {
============================================================
--- packages/linux/linux-dht-walnut_2.6.20.bb 62bdf8a25e2c69fa6d78f11a236567cc8e3205ea
+++ packages/linux/linux-dht-walnut_2.6.20.bb 0c179ddf00c01ed7abb520e96d914fffa789a83b
@@ -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/
}
============================================================
--- packages/linux/linux-efika_2.6.20.20.bb 02bf23057848f530f4bb9b387634af8ca51c55f3
+++ packages/linux/linux-efika_2.6.20.20.bb 01117a66cc290abe28c789551dafbdaadaf2e6df
@@ -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() {
============================================================
--- packages/linux/linux-efika_2.6.20.bb 3d646a13d61ed36e48613a5d62ae4c153c42616e
+++ packages/linux/linux-efika_2.6.20.bb 26eb3e8b2f654dac6975e04c0e7c078417623da6
@@ -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/
}
============================================================
--- packages/linux/linux-efika_2.6.21+git.bb b07652616db0ca693ab942e5d21576b84f04e3e9
+++ packages/linux/linux-efika_2.6.21+git.bb 1d96763c1bba903c9753ae5d85530485bea1668d
@@ -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() {
============================================================
--- packages/linux/linux-magicbox_2.6.18.6.bb 2863c6191e6edd688014663327d3b35bfd47e9ea
+++ packages/linux/linux-magicbox_2.6.18.6.bb 9929bed5a862613d7d6d47cab1dbbed6605b127d
@@ -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/
}
============================================================
--- packages/linux/linux-magicbox_2.6.19.2.bb b03c2ca7543c5914973b54ef5b3ea159fbef77ed
+++ packages/linux/linux-magicbox_2.6.19.2.bb f40feb36483f15f528a68ff787da7d1a1dc83f38
@@ -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
============================================================
--- packages/linux/linux-ml403-mvista-2.6.x_git.bb 607a3ec1212c49a8bec07ab6a9220e1868f31e6d
+++ packages/linux/linux-ml403-mvista-2.6.x_git.bb 1627e847f526fa7073747ec037b61f626f96352f
@@ -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/
}
============================================================
--- packages/linux/linux-ml403-slab-2.6.x_git.bb 9199fb7885a068659ab66b6897c7dcf1f94cf3c4
+++ packages/linux/linux-ml403-slab-2.6.x_git.bb 5030af659ba81e0fd39cabcfe458111ae1646763
@@ -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/
}
============================================================
--- packages/linux/linux-sequoia_2.6.21.bb 91ba088cf6b7afc424eda939be7afb1dd6223594
+++ packages/linux/linux-sequoia_2.6.21.bb 5dc8ca7fe3e92accabff7e6dc3d9d28540f8839b
@@ -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/
-%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list