diff options
58 files changed, 92 insertions, 86 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index d0aaea1284..e968e4d8f4 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -247,7 +247,7 @@ python packagestage_scenefunc () { # # Copy the stamp files into the main stamps directoy # - cmd = bb.data.expand("cp -dpR ${WORKDIR}/tstage/stamps/* ${TMPDIR}/stamps/", d) + cmd = bb.data.expand("cp -PpR ${WORKDIR}/tstage/stamps/* ${TMPDIR}/stamps/", d) try: ret = oe_run(d, cmd) except RuntimeError: @@ -495,7 +495,7 @@ python do_package_stage () { bb.mkdirhier(destdir) # We need to include the package_stage stamp in the staging package so create one bb.build.make_stamp("do_package_stage", d) - oe_run(d, "cp -dpR %s.do_* %s/" % (stampfn, destdir)) + oe_run(d, "cp -PpR %s.do_* %s/" % (stampfn, destdir)) pstage_set_pkgmanager(d) bb.build.exec_func("staging_helper", d) diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass index c018a03e2f..2c425ac1d4 100644 --- a/classes/rootfs_rpm.bbclass +++ b/classes/rootfs_rpm.bbclass @@ -82,7 +82,7 @@ EOF # Copy the packages into the target image # Ugly ugly ugly but rpm is braindead and can't see outside the chroot # when installing :( - cp -r ${DEPLOY_DIR_RPM}/$arch ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}/ + cp -R ${DEPLOY_DIR_RPM}/$arch ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}/ done # Uclibc builds don't provide this stuff... diff --git a/classes/sourceipk.bbclass b/classes/sourceipk.bbclass index 182785ba66..09fc5d5607 100644 --- a/classes/sourceipk.bbclass +++ b/classes/sourceipk.bbclass @@ -105,7 +105,7 @@ sourceipk_do_create_srcipk() { # Copy sources for packaging mkdir -p $tmp_dir/${SRCIPK_INSTALL_DIR} - cp -rLf ${S}/* $tmp_dir/${SRCIPK_INSTALL_DIR}/ + cp -RLf ${S}/* $tmp_dir/${SRCIPK_INSTALL_DIR}/ if [ ${SRCIPK_INCLUDE_EXTRAFILES} != "0" ] then diff --git a/classes/staging.bbclass b/classes/staging.bbclass index 3f4ff8ca02..3e7adbb995 100644 --- a/classes/staging.bbclass +++ b/classes/staging.bbclass @@ -23,7 +23,7 @@ package_stagefile_shell() { destfile=`echo $srcfile | sed s#${TMPDIR}#${PSTAGE_TMPDIR_STAGE}#` destdir=`dirname $destfile` mkdir -p $destdir - cp -dp $srcfile $destfile + cp -Pp $srcfile $destfile fi } diff --git a/recipes/ant/ant-native_1.7.1.bb b/recipes/ant/ant-native_1.7.1.bb index b4fdb054f9..ff758c817b 100644 --- a/recipes/ant/ant-native_1.7.1.bb +++ b/recipes/ant/ant-native_1.7.1.bb @@ -46,7 +46,7 @@ do_compile() { mkdir -p build/org/apache/tools/ant/types/conditions - cp -r src/resources/org build/ + cp -R src/resources/org build/ (cd src/main && find . \( -name "*.properties" -or -name "*.xml" -or -name "*.mf" \) -exec cp {} ../../build/{} \;) echo "VERSION=${PV}" > build/org/apache/tools/ant/version.txt diff --git a/recipes/boost-asio/boost-asio_0.3.7.bb b/recipes/boost-asio/boost-asio_0.3.7.bb index 7ab5171af1..d8959be402 100644 --- a/recipes/boost-asio/boost-asio_0.3.7.bb +++ b/recipes/boost-asio/boost-asio_0.3.7.bb @@ -23,13 +23,13 @@ do_compile() { do_install() { cd ${S} install -d ${D}/usr/include - cp -dpR boost ${D}/usr/include + cp -PpR boost ${D}/usr/include } do_stage() { cd ${S} install -d -m 775 ${STAGING_INCDIR} - cp -dpR boost ${STAGING_INCDIR} + cp -PpR boost ${STAGING_INCDIR} } FILES_${PN}-dev = "/usr/include" diff --git a/recipes/busybox/busybox_1.2.1.bb b/recipes/busybox/busybox_1.2.1.bb index c3ab626f2f..08e8556b07 100644 --- a/recipes/busybox/busybox_1.2.1.bb +++ b/recipes/busybox/busybox_1.2.1.bb @@ -33,7 +33,7 @@ do_install () { install -d ${D}/busybox ls ${D} -R - cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ + cp -PpR ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ # Move the busybox binary back to /bin install -d ${D}${base_bindir} mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/ diff --git a/recipes/busybox/busybox_1.7.2.bb b/recipes/busybox/busybox_1.7.2.bb index ad2fd8d2c3..81b620fa5b 100644 --- a/recipes/busybox/busybox_1.7.2.bb +++ b/recipes/busybox/busybox_1.7.2.bb @@ -48,7 +48,7 @@ do_install () { install -d ${D}/busybox ls ${D} -R - cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ + cp -PpR ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ # Move the busybox binary back to /bin install -d ${D}${base_bindir} mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/ diff --git a/recipes/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb b/recipes/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb index 234606f712..0e1736f2e2 100644 --- a/recipes/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb +++ b/recipes/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb @@ -23,7 +23,7 @@ do_install () { install -d ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV} install -m 0644 catalog ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV} - cp -dpr common ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV} + cp -PpRr common ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV} install-catalog --add ${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat \ ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV}/catalog diff --git a/recipes/docbook-sgml-dtd/docbook-sgml-dtd-native.inc b/recipes/docbook-sgml-dtd/docbook-sgml-dtd-native.inc index d2330944c3..47e58cfc41 100644 --- a/recipes/docbook-sgml-dtd/docbook-sgml-dtd-native.inc +++ b/recipes/docbook-sgml-dtd/docbook-sgml-dtd-native.inc @@ -23,7 +23,7 @@ do_install () { # for details. install -d -m 755 ${D}${datadir}/sgml/docbook/sgml-dtd-${DTD_VERSION} install docbook.cat ${D}${datadir}/sgml/docbook/sgml-dtd-${DTD_VERSION}/catalog - cp -dpr *.dtd *.mod *.dcl ${D}${datadir}/sgml/docbook/sgml-dtd-${DTD_VERSION} + cp -PpRr *.dtd *.mod *.dcl ${D}${datadir}/sgml/docbook/sgml-dtd-${DTD_VERSION} install-catalog --add ${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat \ ${D}${datadir}/sgml/docbook/sgml-dtd-${DTD_VERSION}/catalog diff --git a/recipes/ecj/libecj-bootstrap.inc b/recipes/ecj/libecj-bootstrap.inc index a92e87e86d..1adce625ec 100644 --- a/recipes/ecj/libecj-bootstrap.inc +++ b/recipes/ecj/libecj-bootstrap.inc @@ -38,7 +38,7 @@ do_unpackpost() { # Make a copy of the remaining source to get the embedded # resources. - cp -r source/org build/ + cp -R source/org build/ # Remove source code and other stuff. find build -name '*.java' -exec rm -f {} \; diff --git a/recipes/eyeos/eyeos_1.8.7.1.bb b/recipes/eyeos/eyeos_1.8.7.1.bb index 0966a5ec5d..a8a921fb88 100644 --- a/recipes/eyeos/eyeos_1.8.7.1.bb +++ b/recipes/eyeos/eyeos_1.8.7.1.bb @@ -8,7 +8,7 @@ S = "${WORKDIR}/eyeOS" do_install() { install -d ${D}/www/pages/eyeos - cp -r ${S}/* ${D}/www/pages/eyeos + cp -R ${S}/* ${D}/www/pages/eyeos } PACKAGE_ARCH = "all" diff --git a/recipes/fbreader/fbreader_0.7.4q.bb b/recipes/fbreader/fbreader_0.7.4q.bb index 9bee0c0e99..1f5b780ea0 100644 --- a/recipes/fbreader/fbreader_0.7.4q.bb +++ b/recipes/fbreader/fbreader_0.7.4q.bb @@ -18,7 +18,7 @@ inherit pkgconfig do_install () { cd fbreader/openzaurus; oe_runmake .builddir RESOLUTION=240x320 - cp -r data/* ${D} + cp -R data/* ${D} } SRC_URI[md5sum] = "17062ae0f1d7d093e61cd002e39885ae" diff --git a/recipes/fbreader/fbreader_0.8.2a.bb b/recipes/fbreader/fbreader_0.8.2a.bb index 50e27c5517..cc285c1831 100644 --- a/recipes/fbreader/fbreader_0.8.2a.bb +++ b/recipes/fbreader/fbreader_0.8.2a.bb @@ -58,7 +58,7 @@ do_configure() { do_install () { cd fbreader/${READER_ARCH}; oe_runmake .builddir RESOLUTION=${READER_RESOLUTION} - cp -r data/* ${D} + cp -R data/* ${D} } SRC_URI[md5sum] = "3b4944bf0d37b42249bef84d59918ce0" diff --git a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb index 95377a4b99..e5cfb52799 100644 --- a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb +++ b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb @@ -14,7 +14,7 @@ SRC_URI = "http://gecko-mediaplayer.googlecode.com/files/${P}.tar.gz \ " do_install_append() { - cp -dpR ${WORKDIR}/extens* ${D}${libdir}/mozilla/ + cp -PpR ${WORKDIR}/extens* ${D}${libdir}/mozilla/ } PACKAGES =+ "${PN}-firefox-hack" diff --git a/recipes/gnome-mplayer/gecko-mediaplayer_svn.bb b/recipes/gnome-mplayer/gecko-mediaplayer_svn.bb index fe50daa023..a9b3dccc41 100644 --- a/recipes/gnome-mplayer/gecko-mediaplayer_svn.bb +++ b/recipes/gnome-mplayer/gecko-mediaplayer_svn.bb @@ -21,7 +21,7 @@ EXTRA_OECONF = " --enable-new-libxul=yes " TARGET_CC_ARCH += " -DHAVE_NEW_XULRUNNER=1 " do_install_append() { - cp -dpR ${WORKDIR}/extens* ${D}${libdir}/mozilla/ + cp -PpR ${WORKDIR}/extens* ${D}${libdir}/mozilla/ } PACKAGES =+ "${PN}-firefox-hack" diff --git a/recipes/gpe-icons/gpe-icons.inc b/recipes/gpe-icons/gpe-icons.inc index 69c4ff21a2..f1ce472e89 100644 --- a/recipes/gpe-icons/gpe-icons.inc +++ b/recipes/gpe-icons/gpe-icons.inc @@ -13,9 +13,9 @@ ALTERNATIVE_PRIORITY ?= 1 # copy icons from other alternatives if they are not provided by current alternative # ie gpe-sketchbook install own icon to pixmaps dir even before gpe-icons_*.bb is installed -# so if we switch pixmaps link to neo theme, there would be no icon for gpe-sketchbook +# so if we switch pixmaps link to neo theme, there would be no icon for gpe-sketchbook # unless we copy it to neo theme in postinst too -# inherit update-alternatives is not used, because not all distributions want to use it +# inherit update-alternatives is not used, because not all distributions want to use it # and conditional inherit is a bit difficult to use (inherit ${GPE_INHERIT} works, but only if we always want at least 1 bbclass) pkg_postinst_shr() { @@ -33,12 +33,12 @@ pkg_postinst_shr() { if [ "${pixmap_dir}"x == "pixmaps.${PN}"x ] ; then continue; fi - for pixmap in `find ${pixmap_dir}`; do - pixmap_target=`echo ${pixmap} | sed "s/${pixmap_dir}/pixmaps.${PN}/g"`; - if [ ! -e ${pixmap_target} ] ; then - cp -ra ${pixmap} ${pixmap_target}; - echo "${pixmap} merged"; - fi; + for pixmap in `find ${pixmap_dir}`; do + pixmap_target=`echo ${pixmap} | sed "s/${pixmap_dir}/pixmaps.${PN}/g"`; + if [ ! -e ${pixmap_target} ] ; then + cp -Ra ${pixmap} ${pixmap_target}; + echo "${pixmap} merged"; + fi; done done update-alternatives --install ${ALTERNATIVE_LINK} ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH} ${ALTERNATIVE_PRIORITY} diff --git a/recipes/gpe-icons/gpe-theme-neo_git.bb b/recipes/gpe-icons/gpe-theme-neo_git.bb index 2e15976c25..8242a85599 100644 --- a/recipes/gpe-icons/gpe-theme-neo_git.bb +++ b/recipes/gpe-icons/gpe-theme-neo_git.bb @@ -20,7 +20,7 @@ ALTERNATIVE_PRIORITY = 10 do_install() { install -d ${D}${datadir}/gpe/ install -d ${D}${datadir}/gpe/pixmaps.${PN}/ - cp -r ${S}/* "${D}${datadir}/gpe/pixmaps.${PN}/" + cp -R ${S}/* "${D}${datadir}/gpe/pixmaps.${PN}/" } FILES_${PN} = "${datadir}/gpe/pixmaps.${PN}/" diff --git a/recipes/gstreamer/gst-plugin-bc_git.bb b/recipes/gstreamer/gst-plugin-bc_git.bb index 732ada0d5b..602607c1fd 100644 --- a/recipes/gstreamer/gst-plugin-bc_git.bb +++ b/recipes/gstreamer/gst-plugin-bc_git.bb @@ -20,7 +20,7 @@ EXTRA_OECONF = " --enable-gles2-example " # bitbake git fetcher doesn't handle git submodules currently do_configure_prepend () { - cp -rf ${WORKDIR}/gstreamer-0.10.25/common/* ${S}/common/ + cp -Rf ${WORKDIR}/gstreamer-0.10.25/common/* ${S}/common/ autopoint } diff --git a/recipes/gstreamer/gst-plugin-gles_git.bb b/recipes/gstreamer/gst-plugin-gles_git.bb index 3ba9fdd5a3..91ed8fab69 100644 --- a/recipes/gstreamer/gst-plugin-gles_git.bb +++ b/recipes/gstreamer/gst-plugin-gles_git.bb @@ -28,8 +28,8 @@ inherit autotools pkgconfig EXTRA_OECONF = " --disable-rpath --disable-tests --disable-examples" do_configure_prepend () { - cp -rf ${WORKDIR}/gstreamer-0.10.29/common/* ${S}/common/ - cp -rf ${WORKDIR}/gstreamer-0.10.29/po/* ${S}/po/ + cp -Rf ${WORKDIR}/gstreamer-0.10.29/common/* ${S}/common/ + cp -Rf ${WORKDIR}/gstreamer-0.10.29/po/* ${S}/po/ autopoint --force sed -i -e '/po /d' ${S}/Makefile.am } diff --git a/recipes/gtk-engines/elementary-gtk-theme_1.0.bb b/recipes/gtk-engines/elementary-gtk-theme_1.0.bb index bf6424e736..16fbddf9c7 100644 --- a/recipes/gtk-engines/elementary-gtk-theme_1.0.bb +++ b/recipes/gtk-engines/elementary-gtk-theme_1.0.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/eGTK" do_install() { rm -rf ${S}/patches install -d ${D}${datadir}/themes/elementary - cp -r ${S}/* ${D}${datadir}/themes/elementary/ + cp -R ${S}/* ${D}${datadir}/themes/elementary/ } PACKAGE_ARCH = "all" diff --git a/recipes/gtk-engines/elementary-icon-theme_2.3.bb b/recipes/gtk-engines/elementary-icon-theme_2.3.bb index 5fdb345980..7e3c02f4e6 100644 --- a/recipes/gtk-engines/elementary-icon-theme_2.3.bb +++ b/recipes/gtk-engines/elementary-icon-theme_2.3.bb @@ -24,8 +24,8 @@ do_install() { install -d ${D}${datadir}/icons/elementary/ install -d ${D}${datadir}/icons/elementary-monochrome/ - cp -r ${S}/elementary/* ${D}${datadir}/icons/elementary/ - cp -r ${S}/elementary-monochrome/* ${D}${datadir}/icons/elementary-monochrome/ + cp -R ${S}/elementary/* ${D}${datadir}/icons/elementary/ + cp -R ${S}/elementary-monochrome/* ${D}${datadir}/icons/elementary-monochrome/ } FILES_${PN} = "${datadir}/icons/elementary*" diff --git a/recipes/havp/havp.inc b/recipes/havp/havp.inc index e0f4849ecf..75a5477eb4 100644 --- a/recipes/havp/havp.inc +++ b/recipes/havp/havp.inc @@ -39,7 +39,7 @@ do_install () { for i in whitelist blacklist; do install -m 644 etc/havp/$i ${D}${sysconfdir}/havp/$i done - cp -r etc/havp/templates ${D}${sysconfdir}/havp + cp -R etc/havp/templates ${D}${sysconfdir}/havp chmod -R a+rX ${D}${sysconfdir}/havp/templates # We need some /var directories diff --git a/recipes/icedtea/icedtea6-native.inc b/recipes/icedtea/icedtea6-native.inc index 20155ed5ee..5be2dc6c4e 100644 --- a/recipes/icedtea/icedtea6-native.inc +++ b/recipes/icedtea/icedtea6-native.inc @@ -185,7 +185,7 @@ do_install() { for F in bootstrap/icedtea/{bin,include,jre,lib} do - cp -rL $F ${JDK_INSTALL_DIR} + cp -RL $F ${JDK_INSTALL_DIR} done install -d ${JDK_INSTALL_DIR}/include/hpi diff --git a/recipes/jakarta-libs/log4j1.2_1.2.15.bb b/recipes/jakarta-libs/log4j1.2_1.2.15.bb index 5876a5ff2e..dd1b5ad0a7 100644 --- a/recipes/jakarta-libs/log4j1.2_1.2.15.bb +++ b/recipes/jakarta-libs/log4j1.2_1.2.15.bb @@ -24,7 +24,7 @@ do_compile() { # Built everything but the JMS and JMX classes (like in Debian) javac -sourcepath src/main/java -cp $cp -d build `find src/main/java -name "*.java" -and -not \( -iwholename "*jms*" -or -iwholename "*jmx*" \)` - cp -r src/main/resources/* build/ + cp -R src/main/resources/* build/ fastjar -C build -c -f ${JARFILENAME} . } diff --git a/recipes/librcf/librcf_0.4.bb b/recipes/librcf/librcf_0.4.bb index ce174bf07a..13b2353d95 100644 --- a/recipes/librcf/librcf_0.4.bb +++ b/recipes/librcf/librcf_0.4.bb @@ -31,8 +31,8 @@ do_install() { do_stage() { cd ${S} install -d -m 775 ${STAGING_LIBDIR} - cp -dp src/RCF/libRCF[sm]t.a ${STAGING_LIBDIR} - cp -dp src/RCF/libRCF[sm]t.so* ${STAGING_LIBDIR} + cp -PpR src/RCF/libRCF[sm]t.a ${STAGING_LIBDIR} + cp -PpR src/RCF/libRCF[sm]t.so* ${STAGING_LIBDIR} install -d -m 775 ${STAGING_INCDIR} tar -C include --exclude='*.diff' -cvf - . | tar -C ${STAGING_INCDIR} -xvf - } diff --git a/recipes/libtool/libtool-native_2.2.6a.bb b/recipes/libtool/libtool-native_2.2.6a.bb index fb83cf2258..ccd8d32af1 100644 --- a/recipes/libtool/libtool-native_2.2.6a.bb +++ b/recipes/libtool/libtool-native_2.2.6a.bb @@ -37,7 +37,7 @@ do_stage () { install -c -m 0644 ${S}/libltdl/m4/argz.m4 ${STAGING_DATADIR}/aclocal/ install -d ${STAGING_DATADIR}/libtool/libltdl - cp -pfPr ${S}/libltdl/* ${STAGING_DATADIR}/libtool/libltdl/ + cp -pfPR ${S}/libltdl/* ${STAGING_DATADIR}/libtool/libltdl/ } do_install () { diff --git a/recipes/libtool/libtool-native_2.2.6b.bb b/recipes/libtool/libtool-native_2.2.6b.bb index d5c7139d21..bf004592c0 100644 --- a/recipes/libtool/libtool-native_2.2.6b.bb +++ b/recipes/libtool/libtool-native_2.2.6b.bb @@ -39,6 +39,6 @@ do_install () { install -c -m 0644 ${S}/libltdl/m4/argz.m4 ${D}${datadir}/aclocal/ install -d ${D}${datadir}/libtool/libltdl - cp -pfPr ${S}/libltdl/* ${D}${datadir}/libtool/libltdl/ + cp -pfPR ${S}/libltdl/* ${D}${datadir}/libtool/libltdl/ } diff --git a/recipes/linux-firmware/linux-firmware_git.bb b/recipes/linux-firmware/linux-firmware_git.bb index 2f408409aa..7bff379119 100644 --- a/recipes/linux-firmware/linux-firmware_git.bb +++ b/recipes/linux-firmware/linux-firmware_git.bb @@ -13,7 +13,7 @@ do_compile() { do_install() { install -d ${D}/lib/firmware/ - cp -rpP * ${D}/lib/firmware/ + cp -RpP * ${D}/lib/firmware/ } FILES_${PN} += "/lib/firmware/*" diff --git a/recipes/linux-firmware/zd1211-firmware_1.4.bb b/recipes/linux-firmware/zd1211-firmware_1.4.bb index 15879be877..0453d7dd1d 100644 --- a/recipes/linux-firmware/zd1211-firmware_1.4.bb +++ b/recipes/linux-firmware/zd1211-firmware_1.4.bb @@ -12,7 +12,7 @@ do_compile() { do_install() { install -d ${D}/lib/firmware/zd1211 - cp -rpP zd1211-firmware/* ${D}/lib/firmware/zd1211 + cp -RpP zd1211-firmware/* ${D}/lib/firmware/zd1211 } FILES_${PN} += "/lib/firmware/zd1211/*" diff --git a/recipes/llvm/llvm.inc b/recipes/llvm/llvm.inc index ad39cab1e0..03ff61da0e 100644 --- a/recipes/llvm/llvm.inc +++ b/recipes/llvm/llvm.inc @@ -86,9 +86,9 @@ llvm_stage() { install -d ${STAGING_LIBDIR}/llvm${LLVM_RELEASE} # Move headers into their own directory - cp -r ${WORKDIR}/llvm-install/${prefix}/include/llvm \ + cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm \ ${STAGING_INCDIR}/llvm${LLVM_RELEASE}/ - cp -r ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \ + cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \ ${STAGING_INCDIR}/llvm${LLVM_RELEASE}/ find ${WORKDIR}/llvm-install/${prefix}/lib -name "*" -maxdepth 1 -exec \ diff --git a/recipes/mingw/mingw-runtime-headers.inc b/recipes/mingw/mingw-runtime-headers.inc index 3bc5cd4307..874a5db408 100644 --- a/recipes/mingw/mingw-runtime-headers.inc +++ b/recipes/mingw/mingw-runtime-headers.inc @@ -15,5 +15,5 @@ do_install() { do_stage() { mkdir -p ${STAGING_INCDIR} - cp -r ${S}/include/* ${STAGING_INCDIR}/ + cp -R ${S}/include/* ${STAGING_INCDIR}/ } diff --git a/recipes/mingw/mingw-w32api-headers.inc b/recipes/mingw/mingw-w32api-headers.inc index bbd97f9593..fcfb999ed7 100644 --- a/recipes/mingw/mingw-w32api-headers.inc +++ b/recipes/mingw/mingw-w32api-headers.inc @@ -15,5 +15,5 @@ do_install() { do_stage() { mkdir -p ${STAGING_INCDIR} - cp -r ${S}/include/* ${STAGING_INCDIR}/ + cp -R ${S}/include/* ${STAGING_INCDIR}/ } diff --git a/recipes/mythtv/mythplugins_0.22+fixes.bb b/recipes/mythtv/mythplugins_0.22+fixes.bb index d828d0245b..08daace60a 100644 --- a/recipes/mythtv/mythplugins_0.22+fixes.bb +++ b/recipes/mythtv/mythplugins_0.22+fixes.bb @@ -51,8 +51,8 @@ do_install_mythweb_apache () { install -d ${D}${datadir}/apache2/htdocs install -d ${D}/etc/apache2 install -d ${D}/etc/apache2/extra - cp -r ${S}/mythweb/* ${D}${datadir}/apache2/htdocs/ - cp -r ${S}/mythweb/mythweb.conf.apache ${D}/etc/apache2/extra/mythweb.conf + cp -R ${S}/mythweb/* ${D}${datadir}/apache2/htdocs/ + cp -R ${S}/mythweb/mythweb.conf.apache ${D}/etc/apache2/extra/mythweb.conf sed -i -e s:/var/www/html:/usr/share/apache2/htdocs:g ${D}/etc/apache2/extra/mythweb.conf } @@ -60,8 +60,8 @@ do_install_mythweb_lighttpd () { oe_runmake install INSTALL_ROOT="${D}" install -d ${D}/www install -d ${D}/www/pages - cp -r ${S}/mythweb/* ${D}www/pages/ - cp -r ${S}/mythweb/mythweb.conf.lighttpd ${D}/etc/mythweb.conf + cp -R ${S}/mythweb/* ${D}www/pages/ + cp -R ${S}/mythweb/mythweb.conf.lighttpd ${D}/etc/mythweb.conf sed -i -e s:/var/www/html:/www/pages:g ${D}/etc/mythweb.conf } diff --git a/recipes/mythtv/mythplugins_0.23+fixes.bb b/recipes/mythtv/mythplugins_0.23+fixes.bb index 0ce6784ade..0d2eb5f7b5 100644 --- a/recipes/mythtv/mythplugins_0.23+fixes.bb +++ b/recipes/mythtv/mythplugins_0.23+fixes.bb @@ -68,12 +68,12 @@ do_install () { install -d ${D}${sysconfdir}/ install -d ${D}${sysconfdir}/apache2 install -d ${D}${sysconfdir}/apache2/extra - cp -r ${S}/mythweb/* ${D}/${datadir}/apache2/htdocs/ + cp -R ${S}/mythweb/* ${D}/${datadir}/apache2/htdocs/ mv ${S}/mythweb/mythweb.conf.apache ${D}${sysconfdir}/apache2/extra/mythweb.conf sed -i -e s:/var/www/html:/usr/share/apache2/htdocs:g ${D}${sysconfdir}/apache2/extra/mythweb.conf install -d ${D}/www install -d ${D}/www/pages - cp -r ${S}/mythweb/* ${D}/www/pages/ + cp -R ${S}/mythweb/* ${D}/www/pages/ mv ${S}/mythweb/mythweb.conf.lighttpd ${D}${sysconfdir}/mythweb.conf sed -i -e s:/var/www/html:/www/pages:g ${D}${sysconfdir}/mythweb.conf } diff --git a/recipes/ogre/ogre-egl_svn.bb b/recipes/ogre/ogre-egl_svn.bb index 5cb7393894..37673eeb83 100644 --- a/recipes/ogre/ogre-egl_svn.bb +++ b/recipes/ogre/ogre-egl_svn.bb @@ -32,7 +32,7 @@ do_install_append() { cp ${S}/Samples/Common/bin/Release/*cfg ${D}${datadir}/ogre3d/samples/Common/bin install -d ${D}${datadir}/ogre3d/Media - cp -r ${S}/Samples/Media/* ${D}${datadir}/ogre3d/Media/ + cp -R ${S}/Samples/Media/* ${D}${datadir}/ogre3d/Media/ find ${D} -name ".svn" | xargs rm -rf } diff --git a/recipes/openmoko-3rdparty/thone_0.7.bb b/recipes/openmoko-3rdparty/thone_0.7.bb index 2a74d4e78d..6e6754dac5 100644 --- a/recipes/openmoko-3rdparty/thone_0.7.bb +++ b/recipes/openmoko-3rdparty/thone_0.7.bb @@ -14,6 +14,6 @@ S = "${WORKDIR}/usr" do_install() { install -d ${D}/usr - cp -ra ${S}/bin ${D}/usr - cp -ra ${S}/share ${D}/usr + cp -Ra ${S}/bin ${D}/usr + cp -Ra ${S}/share ${D}/usr } diff --git a/recipes/opkg/update-alternatives-merge.inc b/recipes/opkg/update-alternatives-merge.inc index f129fdbe84..69813c61d8 100644 --- a/recipes/opkg/update-alternatives-merge.inc +++ b/recipes/opkg/update-alternatives-merge.inc @@ -11,8 +11,8 @@ pkg_postinst_${PN}_append () { fi echo "Old alternatives directory ${alternatives_dir_old} exists, moving entries to new one ${alternatives_dir_new}" echo "Creating backup copy of both ${alternatives_dir_old}-backup and ${alternatives_dir_new}-backup" - cp -ra "${alternatives_dir_old}" "${alternatives_dir_old}-backup" - cp -ra "${alternatives_dir_new}" "${alternatives_dir_new}-backup" + cp -Ra "${alternatives_dir_old}" "${alternatives_dir_old}-backup" + cp -Ra "${alternatives_dir_new}" "${alternatives_dir_new}-backup" cd ${alternatives_dir_old} for alt_file in * ; do diff --git a/recipes/powervr-drivers/kernel-module-bc_git.bb b/recipes/powervr-drivers/kernel-module-bc_git.bb index 057378801d..172612ce7a 100644 --- a/recipes/powervr-drivers/kernel-module-bc_git.bb +++ b/recipes/powervr-drivers/kernel-module-bc_git.bb @@ -21,7 +21,7 @@ EXTRA_OECONF = " --with-kpath=${STAGING_KERNEL_DIR} --enable-module-only --with- # bitbake git fetcher doesn't handle git submodules currently do_configure_prepend () { sed -i s:cp:echo:g ${S}/module/Makefile.in - cp -rf ${WORKDIR}/gstreamer-0.10.25/common/* ${S}/common/ + cp -Rf ${WORKDIR}/gstreamer-0.10.25/common/* ${S}/common/ autopoint mkdir -p ${S}/win32 touch ${S}/win32/MANIFEST diff --git a/recipes/python/python-pygobject_2.20.0.bb b/recipes/python/python-pygobject_2.20.0.bb index adc17e7663..61327cc3c0 100644 --- a/recipes/python/python-pygobject_2.20.0.bb +++ b/recipes/python/python-pygobject_2.20.0.bb @@ -27,7 +27,7 @@ do_configure_prepend() { do_install_append() { install -d ${D}${datadir}/pygobject/ - cp -dpfR docs/* ${D}${datadir}/pygobject/ + cp -PpRfR docs/* ${D}${datadir}/pygobject/ install -d ${D}${datadir}/gtk-doc/html/pygobject/ cp docs/style.css ${D}${datadir}/gtk-doc/html/pygobject/ } diff --git a/recipes/rocksndiamonds/rocksndiamonds_3.2.0.bb b/recipes/rocksndiamonds/rocksndiamonds_3.2.0.bb index 16cfb96df9..7d048ed5e4 100644 --- a/recipes/rocksndiamonds/rocksndiamonds_3.2.0.bb +++ b/recipes/rocksndiamonds/rocksndiamonds_3.2.0.bb @@ -20,7 +20,7 @@ do_install() { install -d ${D}${bindir} install -m 755 ${PN} ${D}${bindir} install -d ${D}${datadir}/${PN} - cp -r graphics levels music scores sounds ${D}${datadir}/${PN}/ + cp -R graphics levels music scores sounds ${D}${datadir}/${PN}/ } diff --git a/recipes/rox/rox-filer_2.5.bb b/recipes/rox/rox-filer_2.5.bb index 644365af56..5216d7bc4b 100644 --- a/recipes/rox/rox-filer_2.5.bb +++ b/recipes/rox/rox-filer_2.5.bb @@ -29,15 +29,15 @@ do_install() { gzip -c9 ${WORKDIR}/${P}/rox.1 >${D}${mandir}/man1/rox.1.gz - cp -r ${WORKDIR}/${P}/Choices ${D}${datadir}/rox + cp -R ${WORKDIR}/${P}/Choices ${D}${datadir}/rox rm -rf ${D}${datadir}rox/Choices/MIME-info/ cp ${WORKDIR}/${P}/ROX-Filer/*.xml ${D}${datadir}/rox cp ${WORKDIR}/${P}/ROX-Filer/Help/{Changes,README*,TODO} ${D}${datadir}/doc/rox cp ${WORKDIR}/${P}/ROX-Filer/Help/*html ${D}${datadir}/doc/rox/html cp ${WORKDIR}/${P}/ROX-Filer/style.css ${D}${datadir}/doc/rox/html - cp -r ${WORKDIR}/${P}/ROX-Filer/images ${D}${datadir}/rox - cp -r ${WORKDIR}/${P}/ROX-Filer/ROX ${D}${datadir}/rox + cp -R ${WORKDIR}/${P}/ROX-Filer/images ${D}${datadir}/rox + cp -R ${WORKDIR}/${P}/ROX-Filer/ROX ${D}${datadir}/rox # cp ROX-Filer/ROX-Filer ${D}/usr/bin/rox cp ${WORKDIR}/${P}/ROX-Filer/.DirIcon ${D}${datadir}/rox/.DirIcon diff --git a/recipes/ruby/ruby-dbus_0.2.1.bb b/recipes/ruby/ruby-dbus_0.2.1.bb index ac1a22be19..78f3b3649a 100644 --- a/recipes/ruby/ruby-dbus_0.2.1.bb +++ b/recipes/ruby/ruby-dbus_0.2.1.bb @@ -14,7 +14,7 @@ FILES_${PN} += "${RUBY_DIR}" do_install() { install -d ${D}${RUBY_DIR} - cp -r lib/* ${D}${RUBY_DIR} + cp -R lib/* ${D}${RUBY_DIR} } diff --git a/recipes/shr/gtk-theme.inc b/recipes/shr/gtk-theme.inc index ccc8798f82..bc985c00aa 100644 --- a/recipes/shr/gtk-theme.inc +++ b/recipes/shr/gtk-theme.inc @@ -8,7 +8,7 @@ SRC_URI += "file://gtk-theme/gtkrc.${PN}" do_install() { install -d "${D}${datadir}/themes/${PN}/gtk-2.0" - cp -r "${S}/./" "${D}${datadir}/themes/${PN}/gtk-2.0" + cp -R "${S}/./" "${D}${datadir}/themes/${PN}/gtk-2.0" install -d ${D}${sysconfdir}/gtk-2.0/ install -m 0644 ${WORKDIR}/gtk-theme/gtkrc.${PN} ${D}${sysconfdir}/gtk-2.0/gtkrc.${PN} } diff --git a/recipes/shr/icon-theme-neo_git.bb b/recipes/shr/icon-theme-neo_git.bb index 2d529ba6fd..baa7697c2f 100644 --- a/recipes/shr/icon-theme-neo_git.bb +++ b/recipes/shr/icon-theme-neo_git.bb @@ -17,7 +17,7 @@ S = "${WORKDIR}/git/icons/icon-theme-neo" do_install() { install -d ${D}${datadir}/icons/ install -d ${D}${datadir}/icons/nEo/ - cp -r ${S}/* "${D}${datadir}/icons/nEo/" + cp -R ${S}/* "${D}${datadir}/icons/nEo/" } FILES_${PN} = "${datadir}/icons/nEo/" diff --git a/recipes/skype/skype_2.0.0.72.bb b/recipes/skype/skype_2.0.0.72.bb index f545571877..fb388f47af 100644 --- a/recipes/skype/skype_2.0.0.72.bb +++ b/recipes/skype/skype_2.0.0.72.bb @@ -9,10 +9,10 @@ do_install() { cp skype ${D}/usr/bin/ install -d ${D}/usr/share/skype - cp -r sounds lang avatars ${D}/usr/share/skype + cp -R sounds lang avatars ${D}/usr/share/skype install -d ${D}/usr/share/pixmaps - cp -r icons/SkypeBlue_48x48.png ${D}/usr/share/pixmaps/skype.png + cp -R icons/SkypeBlue_48x48.png ${D}/usr/share/pixmaps/skype.png } FILES_${PN} += "${datadir}/skype" diff --git a/recipes/stage-manager/files/stage-manager b/recipes/stage-manager/files/stage-manager index 536d1afda0..0c01a18f94 100755 --- a/recipes/stage-manager/files/stage-manager +++ b/recipes/stage-manager/files/stage-manager @@ -91,7 +91,7 @@ if __name__ == "__main__": if options.copydir: copypath = os.path.join(options.copydir, path.replace(options.parentdir, '', 1)) mkdirhier(os.path.split(copypath)[0]) - os.system("cp -dp " + path + " " + copypath) + os.system("cp -Pp " + path + " " + copypath) def copydir(path, fstamp): if options.copydir: diff --git a/recipes/stage-manager/files/stage-manager-ipkg b/recipes/stage-manager/files/stage-manager-ipkg index 07005e3cb0..53c172e77a 100755 --- a/recipes/stage-manager/files/stage-manager-ipkg +++ b/recipes/stage-manager/files/stage-manager-ipkg @@ -109,7 +109,13 @@ Valid destinations are directories or one of the dest names from $IPKG_CONF:" >& IPKG_DIR_PREFIX=usr/lib/ipkg IPKG_LISTS_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/lists IPKG_PENDING_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/pending - IPKG_TMP=`mktemp -d` + + # test for bsd mktemp and pass -t <prefix> when needed + if (mktemp -V) ; then + IPKG_TMP=`mktemp -d` + else + IPKG_TMP=`mktemp -d -t ipkg` + fi if [ ! -d "$IPKG_TMP" ]; then echo "Error, could not create a temp directory" diff --git a/recipes/stage-manager/stagemanager-native_0.0.1.bb b/recipes/stage-manager/stagemanager-native_0.0.1.bb index 9eeac4b073..b54c38df02 100644 --- a/recipes/stage-manager/stagemanager-native_0.0.1.bb +++ b/recipes/stage-manager/stagemanager-native_0.0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Helper script for packaged-staging.bbclass" -PR = "r13" +PR = "r14" SRC_URI = "file://stage-manager \ file://stage-manager-ipkg \ diff --git a/recipes/ti/files/dvsdk-rules/Makefile b/recipes/ti/files/dvsdk-rules/Makefile index bc1eabf249..c3cd7ee5bc 100644 --- a/recipes/ti/files/dvsdk-rules/Makefile +++ b/recipes/ti/files/dvsdk-rules/Makefile @@ -245,7 +245,7 @@ install: $(MAKE) -C $(DEMO_INSTALL_DIR)/$(PLATFORM) install @echo Copying examples.. - @cp -rp examples/$(PLATFORM)/web $(EXEC_DIR)/ + @cp -Rp examples/$(PLATFORM)/web $(EXEC_DIR)/ @cp -p examples/$(PLATFORM)/dvevmdemo $(EXEC_DIR)/ @echo Installing clips.. diff --git a/recipes/ti/gstreamer-ti.inc b/recipes/ti/gstreamer-ti.inc index d9ae67f2a8..880bc729de 100644 --- a/recipes/ti/gstreamer-ti.inc +++ b/recipes/ti/gstreamer-ti.inc @@ -86,14 +86,14 @@ do_install_prepend () { install -d ${D}/${installdir}/gst/${PLATFORM} # copy gstreamer demo scripts - cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/shared ${D}/${installdir}/gst + cp -R ${WORKDIR}/gstreamer_ti/gstreamer_demo/shared ${D}/${installdir}/gst # If we have loadmodules.sh in WORKDIR then give preference to this over # the default gst-ti loadmdules.sh if [ -f ${WORKDIR}/loadmodules.sh ]; then cp ${WORKDIR}/loadmodules.sh ${D}/${installdir}/gst/${PLATFORM} else - cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/${PLATFORM} ${D}/${installdir}/gst + cp -R ${WORKDIR}/gstreamer_ti/gstreamer_demo/${PLATFORM} ${D}/${installdir}/gst fi # delete .svn files diff --git a/recipes/ti/ti-audio-soc-example.inc b/recipes/ti/ti-audio-soc-example.inc index a3942ccbcc..5e37113c44 100644 --- a/recipes/ti/ti-audio-soc-example.inc +++ b/recipes/ti/ti-audio-soc-example.inc @@ -60,11 +60,11 @@ do_install() { cp -pPrf ${S}/* ${D}${AUDIO_SOC_INSTALL_DIR_RECIPE} install -d ${D}/${installdir}/ti-audio-soc-example - cp -rf ${S}/gpp/${BOARD} ${D}/${installdir}/ti-audio-soc-example - cp -rf ${S}/data/* ${D}/${installdir}/ti-audio-soc-example + cp -Rf ${S}/gpp/${BOARD} ${D}/${installdir}/ti-audio-soc-example + cp -Rf ${S}/data/* ${D}/${installdir}/ti-audio-soc-example - cp -rf ${S}/dsp/${BOARD}/Debug/audioSoc_dsp.out ${D}/${installdir}/ti-audio-soc-example/${BOARD}/Debug - cp -rf ${S}/dsp/${BOARD}/Debug/audioSoc_dsp.out ${D}/${installdir}/ti-audio-soc-example/${BOARD}/Release + cp -Rf ${S}/dsp/${BOARD}/Debug/audioSoc_dsp.out ${D}/${installdir}/ti-audio-soc-example/${BOARD}/Debug + cp -Rf ${S}/dsp/${BOARD}/Debug/audioSoc_dsp.out ${D}/${installdir}/ti-audio-soc-example/${BOARD}/Release } diff --git a/recipes/tracker/tracker_0.5.4.bb b/recipes/tracker/tracker_0.5.4.bb index 6661d9a32f..e77aa5d00b 100644 --- a/recipes/tracker/tracker_0.5.4.bb +++ b/recipes/tracker/tracker_0.5.4.bb @@ -11,7 +11,7 @@ SRC_URI = "http://www.gnome.org/~jamiemcc/tracker/tracker-${PV}.tar.gz \ inherit autotools pkgconfig do_install_append() { - cp -dPr ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true + cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true install -d ${D}/${sysconfdir}/X11/Xsession.d/ install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ } diff --git a/recipes/tracker/tracker_0.6.95.bb b/recipes/tracker/tracker_0.6.95.bb index 906c60d1f2..00381ed191 100644 --- a/recipes/tracker/tracker_0.6.95.bb +++ b/recipes/tracker/tracker_0.6.95.bb @@ -22,7 +22,7 @@ EXTRA_OECONF += " tracker_cv_have_ioprio=yes" LEAD_SONAME = "libtrackerclient.so.0" do_install_append() { - cp -dPr ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true + cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true install -d ${D}/${sysconfdir}/X11/Xsession.d/ install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ } diff --git a/recipes/webif/webif_svn.bb b/recipes/webif/webif_svn.bb index f5c8d8aa5d..22831ea8ab 100644 --- a/recipes/webif/webif_svn.bb +++ b/recipes/webif/webif_svn.bb @@ -25,10 +25,10 @@ do_install() { install -m 0755 ${S}/webifmetabin ${D}${bindir}/ install -d ${D}${sysconfdir} - cp -dPr ${S}/package/webif/files/etc/* ${D}${sysconfdir}/ + cp -PpR ${S}/package/webif/files/etc/* ${D}${sysconfdir}/ install -d ${D}${libdir} - cp -dPr ${S}/package/webif/files/usr/lib/* ${D}${libdir}/ + cp -PpR ${S}/package/webif/files/usr/lib/* ${D}${libdir}/ find ${D} -name ".svn" | xargs rm -r || true } diff --git a/recipes/webkit/arora.inc b/recipes/webkit/arora.inc index 5d41a2e685..defb71fff2 100644 --- a/recipes/webkit/arora.inc +++ b/recipes/webkit/arora.inc @@ -37,8 +37,8 @@ do_install() { done oe_runmake -e INSTALL_ROOT=${D} install - cp -r ${D}/${D}/* ${D}/ || true - cp -r ${D}/usr/local/* ${D}${prefix} || true + cp -R ${D}/${D}/* ${D}/ || true + cp -R ${D}/usr/local/* ${D}${prefix} || true rm -rf ${D}/usr/local ${D}/${D} if [ "$QT_LIBINFIX" = "E" ] ; then diff --git a/recipes/webm/libvpx_0.9.0.bb b/recipes/webm/libvpx_0.9.0.bb index 3447c6f2c9..bce50a6df9 100644 --- a/recipes/webm/libvpx_0.9.0.bb +++ b/recipes/webm/libvpx_0.9.0.bb @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "a0096ac6859cfb61cf06dd9bc0a79a3333a4ec389ba311911d84df8ff2 do_install() { oe_runmake install install -d ${D}${prefix} - cp -r ${S}/vpx-vp8-nopost-nodocs*${PV}/* ${D}${prefix}/ + cp -R ${S}/vpx-vp8-nopost-nodocs*${PV}/* ${D}${prefix}/ install -d ${D}${includedir}/vpx mv ${D}${includedir}/*.h ${D}${includedir}/vpx } diff --git a/recipes/woodstox/woodstox2_2.0.6.bb b/recipes/woodstox/woodstox2_2.0.6.bb index 46ed187e13..27cf54e5b2 100644 --- a/recipes/woodstox/woodstox2_2.0.6.bb +++ b/recipes/woodstox/woodstox2_2.0.6.bb @@ -19,7 +19,7 @@ do_compile() { `find src/java/org -name "*.java"` \ `find src/java/com -name "*.java"` - cp -r src/resources/* build/META-INF/services + cp -R src/resources/* build/META-INF/services fastjar -C build -c -f ${JARFILENAME} . } |