diff options
author | Holger Freyther <zecke@selfish.org> | 2005-09-19 13:09:59 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-19 13:09:59 +0000 |
commit | edcf35b6847d3fed9749f33970df61b881eb2554 (patch) | |
tree | 82d7824cfb52a0a59b218e62b4d8f94ba70345a0 | |
parent | 2f8389dfedb897cdda2a8f963f4bd8a93d2a42df (diff) | |
parent | 9a51b40bd6dc85714c12d9950e9e94e18d145e05 (diff) |
merge of 015819701896dc2df9f749ce23a18396353e34c5
and daa9aa7053ce66d42b09765d68c0c829dc72ad79
48 files changed, 72 insertions, 72 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/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb index a3593a4c49..e87bab1986 100644 --- a/packages/billiardz/billiardz_0.1.4.bb +++ b/packages/billiardz/billiardz_0.1.4.bb @@ -22,7 +22,7 @@ do_install() { ${D}${palmtopdir}/pics/billiardz install -m 0755 billiardz ${D}${palmtopdir}/bin/billiardz install -m 0644 billiardz.png ${D}${palmtopdir}/pics/billiardz.png - cp -a images/*.png ${D}${palmtopdir}/pics/billiardz + cp -pPR images/*.png ${D}${palmtopdir}/pics/billiardz echo "[Desktop Entry] " >${D}${palmtopdir}/apps/Games/billiardz.desktop echo "Comment=Billiards for Zaurus" >>${D}${palmtopdir}/apps/Games/billiardz.desktop 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..518fddee9f 100644 --- a/packages/db/db_4.3.27.bb +++ b/packages/db/db_4.3.27.bb @@ -69,7 +69,7 @@ do_configure() { do_stage() { # The .h files get installed read-only, the autostage - # function just uses cp -a, so do this by hand + # function just uses cp -pPR, so do this by hand # Install, for the moment, into include/db4 to avoid # interfering with the db3 headers (which have the same # name). -I${STAGING_INCDIR}/db4 to use db4, as opposed @@ -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/efl++/efl++.inc b/packages/efl++/efl++.inc index 7b26a45091..60d1ce1bb8 100644 --- a/packages/efl++/efl++.inc +++ b/packages/efl++/efl++.inc @@ -48,7 +48,7 @@ do_install() { install -d ${D}${bindir} install *-* ${D}${bindir} install -d ${D}${datadir}/efl++ - cp -a data/* ${D}${datadir}/efl++ + cp -pPR data/* ${D}${datadir}/efl++ } PACKAGES =+ "efl++-examples" 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/monotone/monotone.inc b/packages/monotone/monotone.inc index d13108a6e3..96d552e4d0 100644 --- a/packages/monotone/monotone.inc +++ b/packages/monotone/monotone.inc @@ -32,7 +32,7 @@ ALTERNATIVE_PRIORITY = "40" do_install_append() { install -d ${D}${tsd} install -c -m 755 testsuite ${D}${tsd}/testsuite - cp -a tests ${D}${tsd}/tests + cp -pPR tests ${D}${tsd}/tests # mv ${D}${bindir}/monotone ${D}${bindir}/${PN} } diff --git a/packages/netpbm/netpbm_10.28.bb b/packages/netpbm/netpbm_10.28.bb index 5057f13ed0..2d986666f1 100644 --- a/packages/netpbm/netpbm_10.28.bb +++ b/packages/netpbm/netpbm_10.28.bb @@ -65,16 +65,16 @@ do_install() { */VERSION) ;; */pkginfo) ;; */bin) install -d ${D}${bindir} - cp -a "$d"/* ${D}${bindir} + cp -pPR "$d"/* ${D}${bindir} rm ${D}${bindir}/doc.url;; */include) install -d ${D}${includedir} - cp -a "$d"/* ${D}${includedir};; + cp -pPR "$d"/* ${D}${includedir};; */link|*/lib) install -d ${D}${libdir} - cp -a "$d"/* ${D}${libdir};; + cp -pPR "$d"/* ${D}${libdir};; */man) install -d ${D}${mandir} - cp -a "$d"/* ${D}${mandir};; + cp -pPR "$d"/* ${D}${mandir};; */misc) install -d ${D}${datadir}/netpbm - cp -a "$d"/* ${D}${datadir}/netpbm;; + cp -pPR "$d"/* ${D}${datadir}/netpbm;; */config_template) install -d ${D}${bindir} sed "/^@/d diff --git a/packages/nonworking/freenote/freenote_1.6.1.bb b/packages/nonworking/freenote/freenote_1.6.1.bb index d8ada414e9..3e4540a060 100644 --- a/packages/nonworking/freenote/freenote_1.6.1.bb +++ b/packages/nonworking/freenote/freenote_1.6.1.bb @@ -18,5 +18,5 @@ do_install() { install -D -m 755 freenoteeintu ${D}${palmtopdir}/bin/freenoteeintu install -D -m 644 ${FILESDIR}/freenoteeintu.desktop ${D}${palmtopdir}/apps/Applications/freenoteeintu.desktop install -d ${D}/${palmtopdir}/pics - cp -a *.png ${D}${palmtopdir}/pics/ + cp -pPR *.png ${D}${palmtopdir}/pics/ } diff --git a/packages/nonworking/qualendar/qualendar_0.8.0.bb b/packages/nonworking/qualendar/qualendar_0.8.0.bb index 3a4bb15e35..0d6a5cbb99 100644 --- a/packages/nonworking/qualendar/qualendar_0.8.0.bb +++ b/packages/nonworking/qualendar/qualendar_0.8.0.bb @@ -13,5 +13,5 @@ do_install() { install -D -m 755 qualendar ${D}${palmtopdir}/bin/qualendar install -D -m 644 qualendar.desktop ${D}${palmtopdir}/apps/Applications/qualendar.desktop install -d ${D}${palmtopdir}/pics - cp -a *.png ${D}${palmtopdir}/pics/ + cp -pPR *.png ${D}${palmtopdir}/pics/ } diff --git a/packages/plone/plone_1.0.5.bb b/packages/plone/plone_1.0.5.bb index f16dd830aa..20b28e348b 100644 --- a/packages/plone/plone_1.0.5.bb +++ b/packages/plone/plone_1.0.5.bb @@ -9,7 +9,7 @@ S = "${WORKDIR}/CMFPlone-${PV}" do_install() { install -d ${D}${libdir}/python/Products/ - cp -a ${S}/* ${D}${libdir}/python/Products/ + cp -pPR ${S}/* ${D}${libdir}/python/Products/ } FILES_${PN} = "${libdir}/python/Products/" diff --git a/packages/poqetpresenter/poqetpresenter_0.0.6.bb b/packages/poqetpresenter/poqetpresenter_0.0.6.bb index cbdc2dce5c..c4646b9075 100644 --- a/packages/poqetpresenter/poqetpresenter_0.0.6.bb +++ b/packages/poqetpresenter/poqetpresenter_0.0.6.bb @@ -22,5 +22,5 @@ do_install() { install -D -m 0755 poqetp/poqetp ${D}${palmtopdir}/bin/poqetp install -D -m 0644 poqetp.desktop ${D}${palmtopdir}/apps/Applications/poqetp.desktop install -d ${D}${palmtopdir}/pics/poqetp - cp -a pics/* ${D}${palmtopdir}/pics/poqetp/ + cp -pPR pics/* ${D}${palmtopdir}/pics/poqetp/ } diff --git a/packages/puzz-le/puzz-le_2.0.0.bb b/packages/puzz-le/puzz-le_2.0.0.bb index 839f6f0edd..80b2d54da0 100644 --- a/packages/puzz-le/puzz-le_2.0.0.bb +++ b/packages/puzz-le/puzz-le_2.0.0.bb @@ -13,5 +13,5 @@ inherit palmtop do_install() { install -m 0755 puzz-le Qtopia/puzz-le/${palmtopdir}/bin/puzz-le install -d ${D}/ - cp -a Qtopia/puzz-le/* ${D}/ + cp -pPR Qtopia/puzz-le/* ${D}/ } diff --git a/packages/python/python-numeric_23.7.bb b/packages/python/python-numeric_23.7.bb index 2fc0e8873c..e06934ece8 100644 --- a/packages/python/python-numeric_23.7.bb +++ b/packages/python/python-numeric_23.7.bb @@ -12,6 +12,6 @@ S = "${WORKDIR}/Numeric-${PV}" inherit distutils do_stage() { - cp -a Include/Numeric ${STAGING_INCDIR} + cp -pPR Include/Numeric ${STAGING_INCDIR} } diff --git a/packages/qpf-fonts/qpf-qte_2.3.10.bb b/packages/qpf-fonts/qpf-qte_2.3.10.bb index caead15fd3..f759831e3a 100644 --- a/packages/qpf-fonts/qpf-qte_2.3.10.bb +++ b/packages/qpf-fonts/qpf-qte_2.3.10.bb @@ -31,5 +31,5 @@ QPF_DESCRIPTION = "Qt/E font %s" do_install() { install -d ${D}${palmqtdir}/lib/fonts/ - cp -a lib/fonts/* ${D}${palmqtdir}/lib/fonts/ + cp -pPR lib/fonts/* ${D}${palmqtdir}/lib/fonts/ } diff --git a/packages/qt/qt-x11-free_3.3.5.bb b/packages/qt/qt-x11-free_3.3.5.bb index 2bb9453159..afa33f98af 100644 --- a/packages/qt/qt-x11-free_3.3.5.bb +++ b/packages/qt/qt-x11-free_3.3.5.bb @@ -75,7 +75,7 @@ do_install() { install -d ${D}${bindir}/ install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir} install -d ${D}${prefix}/plugins/ - cp -a plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/ + cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/ } PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \ diff --git a/packages/qt/qt-x11-free_4.0.1.bb b/packages/qt/qt-x11-free_4.0.1.bb index f3b4dd3aa6..e08fc23ea0 100644 --- a/packages/qt/qt-x11-free_4.0.1.bb +++ b/packages/qt/qt-x11-free_4.0.1.bb @@ -70,7 +70,7 @@ do_stage() { oe_libinstall -so -C lib libQt$part ${STAGING_QT_DIR} done oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} - cp -a include/* ${STAGING_INCDIR}/ + cp -pPR include/* ${STAGING_INCDIR}/ } do_install() { @@ -81,9 +81,9 @@ do_install() { oe_libinstall -so -C lib libQt$part ${D}${libdir} done oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} - cp -a include/* ${D}${incdir} - cp -a plugins ${D}${libdir} - cp -a bin/* ${D}${bindir} + cp -pPR include/* ${D}${incdir} + cp -pPR plugins ${D}${libdir} + cp -pPR bin/* ${D}${bindir} install -d ${D}${bindir}/qt4-examples for binary in `find examples -perm 0755 -type f` 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 diff --git a/packages/qwt/qwt_4.2.0rc1.bb b/packages/qwt/qwt_4.2.0rc1.bb index 883bc5ae27..3b93c4c88c 100644 --- a/packages/qwt/qwt_4.2.0rc1.bb +++ b/packages/qwt/qwt_4.2.0rc1.bb @@ -15,13 +15,13 @@ EXTRA_QMAKEVARS_POST = "CONFIG-=thread" do_stage() { oe_libinstall -so -C lib libqwt ${STAGING_LIBDIR} - cp -a include/* ${STAGING_INCDIR} + cp -pPR include/* ${STAGING_INCDIR} } do_install() { install -d ${D}${libdir} \ ${D}${includedir} oe_libinstall -so -C lib libqwt ${D}${libdir} - cp -a include/* ${D}${includedir} + cp -pPR include/* ${D}${includedir} } diff --git a/packages/resolvconf/resolvconf_1.28.bb b/packages/resolvconf/resolvconf_1.28.bb index 5f340ff0cf..2aa2fccc8b 100644 --- a/packages/resolvconf/resolvconf_1.28.bb +++ b/packages/resolvconf/resolvconf_1.28.bb @@ -20,7 +20,7 @@ do_compile () { do_install () { install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface install -d ${D}${mandir}/man8 ${D}${docdir}/${P} - cp -a etc/* ${D}${sysconfdir}/ + cp -pPR etc/* ${D}${sysconfdir}/ install -m 0755 bin/resolvconf ${D}${base_sbindir}/ install -m 0644 README ${D}${docdir}/${P}/ install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ diff --git a/packages/sidplayer/sidplayer_1.5.0.bb b/packages/sidplayer/sidplayer_1.5.0.bb index 1916176694..1ee1821539 100644 --- a/packages/sidplayer/sidplayer_1.5.0.bb +++ b/packages/sidplayer/sidplayer_1.5.0.bb @@ -21,5 +21,5 @@ do_install() { install -d ${D}${palmtopdir}/bin \ ${D}${palmtopdir}/apps/Applications \ ${D}${palmtopdir}/pics - cp -a ../apps ../bin ../pics ${D}${palmtopdir}/ + cp -pPR ../apps ../bin ../pics ${D}${palmtopdir}/ } diff --git a/packages/tetex/tetex-texmf_3.0.bb b/packages/tetex/tetex-texmf_3.0.bb index 76c0dece2a..7405713d22 100644 --- a/packages/tetex/tetex-texmf_3.0.bb +++ b/packages/tetex/tetex-texmf_3.0.bb @@ -14,7 +14,7 @@ do_install() { install -d ${D}${datadir}/texmf for i in ${STUFF} do - cp -a $i ${D}${datadir}/texmf + cp -pPR $i ${D}${datadir}/texmf done } diff --git a/packages/tximage/tximage_0.2.bb b/packages/tximage/tximage_0.2.bb index c2dc18069f..892ada0c6b 100644 --- a/packages/tximage/tximage_0.2.bb +++ b/packages/tximage/tximage_0.2.bb @@ -17,5 +17,5 @@ do_install() { ${D}${palmtopdir}/bin install -D -m 755 tximage ${D}${palmtopdir}/bin/tximage install -D -m 644 imageviewer.desktop ${D}${palmtopdir}/apps/Applications/tximage.desktop - cp -a tximage.png ${D}${palmtopdir}/pics/ + cp -pPR tximage.png ${D}${palmtopdir}/pics/ } diff --git a/packages/unixbench/unixbench_4.1.0.bb b/packages/unixbench/unixbench_4.1.0.bb index 4e9d8f4b96..a5cbfe8aa2 100644 --- a/packages/unixbench/unixbench_4.1.0.bb +++ b/packages/unixbench/unixbench_4.1.0.bb @@ -9,5 +9,5 @@ FILES_${PN} = "${prefix}/src/unixbench-${PV}" do_install () { install -d ${D}${prefix}/src - cp -a ${S} ${D}${prefix}/src/ + cp -pPR ${S} ${D}${prefix}/src/ } diff --git a/packages/vectoroids/vectoroids_1.1.0.bb b/packages/vectoroids/vectoroids_1.1.0.bb index 74ded45eea..a283b023ce 100644 --- a/packages/vectoroids/vectoroids_1.1.0.bb +++ b/packages/vectoroids/vectoroids_1.1.0.bb @@ -24,7 +24,7 @@ do_install() { ${D}${palmtopdir}/bin install -m 0755 vectoroids-${PV} ${D}${palmtopdir}/bin/vectoroids install -m 0644 data/images/icon.png ${D}${palmtopdir}/pics/vectoroids.png - cp -a data/* ${D}${palmtopdir}/share/vectoroids + cp -pPR data/* ${D}${palmtopdir}/share/vectoroids echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/vectoroids.desktop echo "Comment=Asteroids game" >>${D}${palmtopdir}/apps/Games/vectoroids.desktop diff --git a/packages/xerces-c/xerces-c_2.6.0.bb b/packages/xerces-c/xerces-c_2.6.0.bb index b7207dd29e..4d87b77fad 100644 --- a/packages/xerces-c/xerces-c_2.6.0.bb +++ b/packages/xerces-c/xerces-c_2.6.0.bb @@ -27,7 +27,7 @@ do_stage () { oe_libinstall lib/libxerces-c ${STAGING_LIBDIR} oe_libinstall lib/libxerces-depdom ${STAGING_LIBDIR} - cp -a include/xercesc ${STAGING_INCDIR} + cp -pPR include/xercesc ${STAGING_INCDIR} } do_install () { diff --git a/packages/zauralign/zauralign_1.0.2.bb b/packages/zauralign/zauralign_1.0.2.bb index be05d7a521..41ef0e1f25 100644 --- a/packages/zauralign/zauralign_1.0.2.bb +++ b/packages/zauralign/zauralign_1.0.2.bb @@ -18,5 +18,5 @@ do_install() { install -m 0755 zauralign ${D}${palmtopdir}/bin/ install -m 0644 zauralign.png ${D}${palmtopdir}/pics/ install -m 0644 zauralign.desktop ${D}${palmtopdir}/apps/Games/ - cp -a pics/* ${D}${palmtopdir}/pics/zauralign/ + cp -pPR pics/* ${D}${palmtopdir}/pics/zauralign/ } diff --git a/packages/zipsc/zipsc_0.4.3.bb b/packages/zipsc/zipsc_0.4.3.bb index 228323364f..c253cfb468 100644 --- a/packages/zipsc/zipsc_0.4.3.bb +++ b/packages/zipsc/zipsc_0.4.3.bb @@ -15,5 +15,5 @@ inherit palmtop do_install() { install -m 0755 zipsc Qtopia${palmtopdir}/bin/zipsc install -d ${D}/ - cp -a Qtopia/* ${D}/ + cp -pPR Qtopia/* ${D}/ } diff --git a/packages/zmerlin/zmerlin_0.9.1.bb b/packages/zmerlin/zmerlin_0.9.1.bb index 6eab86dbd8..fc51b48ac9 100644 --- a/packages/zmerlin/zmerlin_0.9.1.bb +++ b/packages/zmerlin/zmerlin_0.9.1.bb @@ -13,6 +13,6 @@ inherit palmtop do_install() { install -m 0755 zmerlin ${S}/ipk${palmtopdir}/bin/zmerlin install -d ${D}${palmtopdir}/ - cp -a ipk/opt/* ${D}/opt + cp -pPR ipk/opt/* ${D}/opt } diff --git a/packages/ztappy/ztappy_0.9.1.bb b/packages/ztappy/ztappy_0.9.1.bb index b204cc1c03..5edeb676d3 100644 --- a/packages/ztappy/ztappy_0.9.1.bb +++ b/packages/ztappy/ztappy_0.9.1.bb @@ -13,6 +13,6 @@ inherit palmtop do_install() { install -m 0755 ${PN} ${S}/ipk${palmtopdir}/bin/${PN} install -d ${D}${palmtopdir}/ - cp -a ipk/opt/* ${D}/opt + cp -pPR ipk/opt/* ${D}/opt } |