From 1b8721cb33470559a5ce5059fba73acc321fa8e8 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 19 Sep 2005 12:43:20 +0000 Subject: Same GNU cp changes... --- packages/billiardz/billiardz_0.1.4.bb | 2 +- packages/db/db_4.3.27.bb | 2 +- packages/netpbm/netpbm_10.28.bb | 10 +++++----- packages/qt/qt-x11-free_3.3.5.bb | 2 +- packages/qt/qt-x11-free_4.0.1.bb | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) 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/db/db_4.3.27.bb b/packages/db/db_4.3.27.bb index 8c0d8e6ec3..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 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/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` -- cgit 1.2.3-korg