diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2010-10-15 20:06:53 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-10-21 20:28:50 -0700 |
| commit | caa6067f7faf33200681c75843ce2e059cb1c0b4 (patch) | |
| tree | 334e6f6ab9b6dea945d192cb73afda3b30dd218f /classes | |
| parent | e84f4995e257e0505fb73432cbd2a9f53cdf074b (diff) | |
| download | openembedded-caa6067f7faf33200681c75843ce2e059cb1c0b4.tar.gz | |
Various fixes for cp argument portability
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/packaged-staging.bbclass | 4 | ||||
| -rw-r--r-- | classes/rootfs_rpm.bbclass | 2 | ||||
| -rw-r--r-- | classes/sourceipk.bbclass | 2 | ||||
| -rw-r--r-- | classes/staging.bbclass | 2 |
4 files changed, 5 insertions, 5 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 } |