From 57c3acf775eeb9f8a2613c3752688d7816f2b0a4 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 19 Sep 2005 12:29:59 +0000 Subject: GNU cp has a nice -a switch, sadly the BSD tools lack it update our descriptions to work with any version of cp. Patches that include cp -a are not changed. They seem to work and I'm too scared busybox cp is more like GNU cp than BSD cp. (e.g do not know about P) --- classes/autotools.bbclass | 2 +- classes/base.bbclass | 2 +- classes/sourcepkg.bbclass | 2 +- packages/brickout/brickout_2002.06.09.bb | 6 +++--- packages/db/db_4.3.27.bb | 2 +- packages/dviviewer/dviviewer_1.0.2.bb | 2 +- packages/freedroid/freedroid_1.0.2.bb | 6 +++--- packages/gemdropx/gemdropx_0.9.bb | 2 +- packages/gnome/gnome-common_2.4.0.bb | 6 +++--- packages/klimt/klimt_0.6.1.bb | 2 +- packages/knights/knights_1.14.bb | 2 +- packages/kstars/kstars-embedded_0.8.5.bb | 4 ++-- packages/libmodplug/libmodplug_0.7.bb | 2 +- packages/linux/linux-wrt_2.4.30.bb | 8 ++++---- packages/lirc/lirc_0.6.6+cvs20040918.bb | 2 +- packages/lirc/lirc_0.7.0.bb | 2 +- packages/lirc/lirc_0.7.1.bb | 2 +- packages/maemo/sdk-default-icons_0.2-1.bb | 2 +- packages/maemo/sdk-default-theme-config_1.0-1.bb | 2 +- packages/maemo/sdk-default-theme_0.1-1.bb | 2 +- packages/meta/meta-sdk.bb | 8 ++++---- packages/qte/qte_2.3.10.bb | 2 +- packages/qte/qte_4.0.0-snapshot.bb | 6 +++--- 23 files changed, 38 insertions(+), 38 deletions(-) diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 8a387da5ca..ec1d4af1a4 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -145,7 +145,7 @@ autotools_stage_includes() { rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} make DESTDIR="${STAGE_TEMP}" install - cp -a ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} rm -rf ${STAGE_TEMP} fi } diff --git a/classes/base.bbclass b/classes/base.bbclass index 066f7af9da..18d51a02ed 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -371,7 +371,7 @@ def oe_unpack_file(file, data, url = None): destdir = "." elif not os.access("%s/%s" % (os.getcwd(), destdir), os.F_OK): os.makedirs("%s/%s" % (os.getcwd(), destdir)) - cmd = 'cp -a %s %s/%s/' % (file, os.getcwd(), destdir) + cmd = 'cp -pPR %s %s/%s/' % (file, os.getcwd(), destdir) else: (type, host, path, user, pswd, parm) = bb.decodeurl(url) if not 'patch' in parm: diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index ee022c99d2..3eeff91333 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -43,7 +43,7 @@ sourcepkg_do_create_orig_tgz(){ echo $src_tree oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz" tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz $src_tree --exclude-from temp/exclude-from-file - cp -a $src_tree $src_tree.orig + cp -pPR $src_tree $src_tree.orig } sourcepkg_do_archive_bb() { diff --git a/packages/brickout/brickout_2002.06.09.bb b/packages/brickout/brickout_2002.06.09.bb index 1908ff520b..891b615331 100644 --- a/packages/brickout/brickout_2002.06.09.bb +++ b/packages/brickout/brickout_2002.06.09.bb @@ -28,9 +28,9 @@ do_install() { install -D -m 0755 brickout ${D}${palmtopdir}/bin/brickout install -D -m 0644 brickout.png ${D}${palmtopdir}/pics/brickout.png - cp -a sounds/* ${D}${palmtopdir}/share/brickout/sounds/ - cp -a music/* ${D}${palmtopdir}/share/brickout/music/ - cp -a images-sdl/* ${D}${palmtopdir}/share/brickout/images/ + cp -pPR sounds/* ${D}${palmtopdir}/share/brickout/sounds/ + cp -pPR music/* ${D}${palmtopdir}/share/brickout/music/ + cp -pPR images-sdl/* ${D}${palmtopdir}/share/brickout/images/ echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/brickout.desktop echo "Comment=Arkanoid game" >>${D}${palmtopdir}/apps/Games/brickout.desktop diff --git a/packages/db/db_4.3.27.bb b/packages/db/db_4.3.27.bb index 216fb5714b..8c0d8e6ec3 100644 --- a/packages/db/db_4.3.27.bb +++ b/packages/db/db_4.3.27.bb @@ -78,7 +78,7 @@ do_stage() { mkdir -p ${STAGE_TEMP} oe_runmake DESTDIR="${STAGE_TEMP}" install_include mkdir -p ${STAGING_INCDIR}/db4 - cp -af ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4 + cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4 rm -rf ${STAGE_TEMP} oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR} } diff --git a/packages/dviviewer/dviviewer_1.0.2.bb b/packages/dviviewer/dviviewer_1.0.2.bb index 75523ca793..531ba73362 100644 --- a/packages/dviviewer/dviviewer_1.0.2.bb +++ b/packages/dviviewer/dviviewer_1.0.2.bb @@ -17,5 +17,5 @@ do_install() { install -D -m 755 dviviewer ${D}${palmtopdir}/bin/dviviewer install -D -m 644 dviviewer.desktop ${D}${palmtopdir}/Applications/dviviewer.desktop install -d ${D}${palmtopdir}/pics - cp -a *.png ${D}${palmtopdir}/pics/ + cp -pPR *.png ${D}${palmtopdir}/pics/ } diff --git a/packages/freedroid/freedroid_1.0.2.bb b/packages/freedroid/freedroid_1.0.2.bb index 7718da0696..e51d22ca0b 100644 --- a/packages/freedroid/freedroid_1.0.2.bb +++ b/packages/freedroid/freedroid_1.0.2.bb @@ -26,9 +26,9 @@ do_install() { install -D -m 0755 src/freedroid ${D}${palmtopdir}/bin/freedroid install -D -m 0644 ${WORKDIR}/icon.png ${D}${palmtopdir}/pics/freedroid.png - cp -a graphics/* ${D}${palmtopdir}/share/freedroid/graphics - cp -a map/* ${D}${palmtopdir}/share/freedroid/map - cp -a sound/* ${D}${palmtopdir}/share/freedroid/sound + cp -pPR graphics/* ${D}${palmtopdir}/share/freedroid/graphics + cp -pPR map/* ${D}${palmtopdir}/share/freedroid/map + cp -pPR sound/* ${D}${palmtopdir}/share/freedroid/sound echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/freedroid.desktop echo "Comment=A Paradroid Clone" >>${D}${palmtopdir}/apps/Games/freedroid.desktop diff --git a/packages/gemdropx/gemdropx_0.9.bb b/packages/gemdropx/gemdropx_0.9.bb index 5c15b5dcf6..836c44c8b5 100644 --- a/packages/gemdropx/gemdropx_0.9.bb +++ b/packages/gemdropx/gemdropx_0.9.bb @@ -27,7 +27,7 @@ do_install() { ${D}${palmtopdir}/share/gemdropx install -D -m 0755 gemdropx ${D}${palmtopdir}/bin/gemdropx install -D -m 0644 ${WORKDIR}/icon.png ${D}${palmtopdir}/pics/gemdropx.png - cp -a data/* ${D}${palmtopdir}/share/gemdropx + cp -pPR data/* ${D}${palmtopdir}/share/gemdropx echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/gemdropx.desktop echo "Comment=Puzzle game" >>${D}${palmtopdir}/apps/Games/gemdropx.desktop diff --git a/packages/gnome/gnome-common_2.4.0.bb b/packages/gnome/gnome-common_2.4.0.bb index ed60b0c236..fc67bf9243 100644 --- a/packages/gnome/gnome-common_2.4.0.bb +++ b/packages/gnome/gnome-common_2.4.0.bb @@ -19,9 +19,9 @@ do_stage () { rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} make DESTDIR="${STAGE_TEMP}" install - cp -a ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin + cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin install -d ${STAGING_DIR}/${HOST_SYS}/share/gnome-common - cp -a ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DIR}/${HOST_SYS}/share/gnome-common - cp -a ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DIR}/${HOST_SYS}/share/aclocal + cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DIR}/${HOST_SYS}/share/gnome-common + cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DIR}/${HOST_SYS}/share/aclocal rm -rf ${STAGE_TEMP} } diff --git a/packages/klimt/klimt_0.6.1.bb b/packages/klimt/klimt_0.6.1.bb index c7c70bf9ae..fbb67de480 100644 --- a/packages/klimt/klimt_0.6.1.bb +++ b/packages/klimt/klimt_0.6.1.bb @@ -14,7 +14,7 @@ inherit opie do_stage() { oe_libinstall -so libKlimt ${STAGING_LIBDIR}/ - cp -a ${S}/../../include/* ${STAGING_INCDIR}/ + cp -pPR ${S}/../../include/* ${STAGING_INCDIR}/ } do_install() { diff --git a/packages/knights/knights_1.14.bb b/packages/knights/knights_1.14.bb index 87c0dc01ef..777ac6bda8 100644 --- a/packages/knights/knights_1.14.bb +++ b/packages/knights/knights_1.14.bb @@ -28,5 +28,5 @@ do_install() { install -D -m 755 knights/knights ${D}${palmtopdir}/bin/knights install -D -m 644 knights.desktop ${D}${palmtopdir}/apps/Games/knights.desktop install -d ${D}${palmtopdir}/pics - cp -a pics/knights ${D}${palmtopdir}/pics/ + cp -pPR pics/knights ${D}${palmtopdir}/pics/ } diff --git a/packages/kstars/kstars-embedded_0.8.5.bb b/packages/kstars/kstars-embedded_0.8.5.bb index a0c43e29d1..58a8522600 100644 --- a/packages/kstars/kstars-embedded_0.8.5.bb +++ b/packages/kstars/kstars-embedded_0.8.5.bb @@ -19,6 +19,6 @@ do_install() { install -d ${D}${palmtopdir}/bin \ ${D}${palmtopdir}/pics/kstars \ ${D}${palmtopdir}/share/apps/kstars - cp -a ${WORKDIR}/pics ${D}${palmtopdir} - cp -a ${WORKDIR}/share/apps/kstars ${D}${palmtopdir}/share/apps/ + cp -pPR ${WORKDIR}/pics ${D}${palmtopdir} + cp -pPR ${WORKDIR}/share/apps/kstars ${D}${palmtopdir}/share/apps/ } diff --git a/packages/libmodplug/libmodplug_0.7.bb b/packages/libmodplug/libmodplug_0.7.bb index 85afa1534d..72bd6adfbd 100644 --- a/packages/libmodplug/libmodplug_0.7.bb +++ b/packages/libmodplug/libmodplug_0.7.bb @@ -8,5 +8,5 @@ inherit autotools pkgconfig do_stage() { install -m 0644 ${S}/src/modplug.h ${STAGING_INCDIR} #FIXME! - cp -a src/.libs/libmodplug.so* ${STAGING_LIBDIR} + cp -pPR src/.libs/libmodplug.so* ${STAGING_LIBDIR} } diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb index 444fb5b7ea..1676562a93 100644 --- a/packages/linux/linux-wrt_2.4.30.bb +++ b/packages/linux/linux-wrt_2.4.30.bb @@ -85,12 +85,12 @@ export CFLAGS_KERNEL="-fno-delayed-branch " do_unpack_extra(){ # copy kernel source which is maintained in openwrt via cvs - cp -a ${WORKDIR}/kernel-source/* ${S} + cp -pPR ${WORKDIR}/kernel-source/* ${S} # copy binary wlan driver - cp -a ${WORKDIR}/wl/*.o ${S}/drivers/net/wl + cp -pPR ${WORKDIR}/wl/*.o ${S}/drivers/net/wl # copy proprietary et source - cp -a ${WORKDIR}/et/* ${S}/drivers/net/et - cp -a ${WORKDIR}/et/*.h ${S}/include/ + cp -pPR ${WORKDIR}/et/* ${S}/drivers/net/et + cp -pPR ${WORKDIR}/et/*.h ${S}/include/ } addtask unpack_extra after do_unpack before do_patch diff --git a/packages/lirc/lirc_0.6.6+cvs20040918.bb b/packages/lirc/lirc_0.6.6+cvs20040918.bb index dd41615f8f..e4e9fad461 100644 --- a/packages/lirc/lirc_0.6.6+cvs20040918.bb +++ b/packages/lirc/lirc_0.6.6+cvs20040918.bb @@ -44,7 +44,7 @@ do_install() { install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd install -d ${D}${datadir}/lirc/ - cp -a remotes ${D}${datadir}/lirc/ + cp -pPR remotes ${D}${datadir}/lirc/ find ${D}${datadir}/lirc -name CVS -o -name '*~*' | xargs rm -rf } diff --git a/packages/lirc/lirc_0.7.0.bb b/packages/lirc/lirc_0.7.0.bb index 3ab40a60d2..b7b832422e 100644 --- a/packages/lirc/lirc_0.7.0.bb +++ b/packages/lirc/lirc_0.7.0.bb @@ -31,6 +31,6 @@ do_install_append() { install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd install -d ${D}${datadir}/lirc/ - cp -a ${S}/remotes ${D}${datadir}/lirc/ + cp -pPR ${S}/remotes ${D}${datadir}/lirc/ } diff --git a/packages/lirc/lirc_0.7.1.bb b/packages/lirc/lirc_0.7.1.bb index a946d3cdb0..c865002116 100644 --- a/packages/lirc/lirc_0.7.1.bb +++ b/packages/lirc/lirc_0.7.1.bb @@ -30,6 +30,6 @@ do_install_append() { install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd install -d ${D}${datadir}/lirc/ - cp -a ${S}/remotes ${D}${datadir}/lirc/ + cp -pPR ${S}/remotes ${D}${datadir}/lirc/ } diff --git a/packages/maemo/sdk-default-icons_0.2-1.bb b/packages/maemo/sdk-default-icons_0.2-1.bb index fad8d479f3..769c71b77c 100644 --- a/packages/maemo/sdk-default-icons_0.2-1.bb +++ b/packages/maemo/sdk-default-icons_0.2-1.bb @@ -14,7 +14,7 @@ FILES_${PN} = "${datadir}" do_install() { install -d ${D}/${datadir} - cp -a ${S}/icons/ ${D}/${datadir}/ + cp -pPR ${S}/icons/ ${D}/${datadir}/ } diff --git a/packages/maemo/sdk-default-theme-config_1.0-1.bb b/packages/maemo/sdk-default-theme-config_1.0-1.bb index 135e722be6..c5b0e240a8 100644 --- a/packages/maemo/sdk-default-theme-config_1.0-1.bb +++ b/packages/maemo/sdk-default-theme-config_1.0-1.bb @@ -15,7 +15,7 @@ FILES_${PN} = "${datadir}" do_install() { install -d ${D}/${datadir} - cp -a ${S}/themes/ ${D}/${datadir}/ + cp -pPR ${S}/themes/ ${D}/${datadir}/ } diff --git a/packages/maemo/sdk-default-theme_0.1-1.bb b/packages/maemo/sdk-default-theme_0.1-1.bb index 5d95118845..11847958d4 100644 --- a/packages/maemo/sdk-default-theme_0.1-1.bb +++ b/packages/maemo/sdk-default-theme_0.1-1.bb @@ -14,7 +14,7 @@ FILES_${PN} = "${datadir}" do_install() { install -d ${D}/${datadir} - cp -a ${S}/themes/ ${D}/${datadir}/ + cp -pPR ${S}/themes/ ${D}/${datadir}/ } diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index d28b6cebc8..b71a2d44d8 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -148,16 +148,16 @@ EOF ${IPKG_TARGET} install ${TARGET_INSTALL} mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} - cp -a ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} + cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} rm -rf ${SDK_OUTPUT}/${prefix}/usr/ - cp -a ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib + cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib rm -rf ${SDK_OUTPUT}/${prefix}/lib/* mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib - cp -a ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ - cp -a ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ chmod -R a+r ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ -type d | xargs chmod +x diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index b94c030aa2..51f94e2c7c 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -147,7 +147,7 @@ do_stage() { rm -f include/qxt.h install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include - cp -a lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ + cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ } do_install() { diff --git a/packages/qte/qte_4.0.0-snapshot.bb b/packages/qte/qte_4.0.0-snapshot.bb index 09ee610484..9b98f7f4b1 100644 --- a/packages/qte/qte_4.0.0-snapshot.bb +++ b/packages/qte/qte_4.0.0-snapshot.bb @@ -105,11 +105,11 @@ do_stage() { for lib in Core Gui Network Sql Xml do - cp -a lib/libQt${lib}* ${STAGING_DIR}/${HOST_SYS}/qt4/lib/ + cp -pPR lib/libQt${lib}* ${STAGING_DIR}/${HOST_SYS}/qt4/lib/ done install -d ${STAGING_DIR}/${HOST_SYS}/qt4/include/ - cp -a include/* ${STAGING_DIR}/${HOST_SYS}/qt4/include + cp -pPR include/* ${STAGING_DIR}/${HOST_SYS}/qt4/include } do_install() { @@ -117,7 +117,7 @@ do_install() { install -d ${D}${sbindir}/ install -m 0755 ${WORKDIR}/update-qtfontdir ${D}${sbindir}/ install -d ${D}${palmtopdir}/lib/fonts/ - cp -a lib/fonts/* ${D}${palmtopdir}/lib/fonts/ + cp -pPR lib/fonts/* ${D}${palmtopdir}/lib/fonts/ for lib in Core Gui Network Sql Xml do -- cgit 1.2.3-korg