[oe-commits] Koen Kooi : stage-manager: change cp -d to cp -p, add hacky check for BSD mktemp

[GIT User account]

Module: openembedded.git
Branch: koen/darwin-host-fixes
Commit: 3d5a806351fefd7c1a80e5c85d1017e6325b7b42
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3d5a806351fefd7c1a80e5c85d1017e6325b7b42

Author: Koen Kooi <koen at openembedded.org>
Date:   Thu Nov 13 14:23:03 2008 +0100

stage-manager: change cp -d to cp -p, add hacky check for BSD mktemp

---

 packages/stage-manager/files/stage-manager         |    2 +-
 packages/stage-manager/files/stage-manager-ipkg    |    8 +++++++-
 .../stage-manager/stagemanager-native_0.0.1.bb     |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/stage-manager/files/stage-manager b/packages/stage-manager/files/stage-manager
index 536d1af..0c01a18 100755
--- a/packages/stage-manager/files/stage-manager
+++ b/packages/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/packages/stage-manager/files/stage-manager-ipkg b/packages/stage-manager/files/stage-manager-ipkg
index 2559fdb..6cee079 100755
--- a/packages/stage-manager/files/stage-manager-ipkg
+++ b/packages/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/packages/stage-manager/stagemanager-native_0.0.1.bb b/packages/stage-manager/stagemanager-native_0.0.1.bb
index 5708045..4357517 100644
--- a/packages/stage-manager/stagemanager-native_0.0.1.bb
+++ b/packages/stage-manager/stagemanager-native_0.0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Helper script for packaged-staging.bbclass"
-PR = "r11"
+PR = "r13"
 
 SRC_URI = "file://stage-manager \
            file://stage-manager-ipkg \