summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsysroot.check6
-rwxr-xr-xsysroot.write6
2 files changed, 1 insertions, 11 deletions
diff --git a/sysroot.check b/sysroot.check
index 8ed965bd..71b35175 100755
--- a/sysroot.check
+++ b/sysroot.check
@@ -17,12 +17,6 @@
set -eu
-location="$1"
-if [ -d "$location" ]; then
- echo >&2 "ERROR: Deployment directory already exists: $location"
- exit 1
-fi
-
if [ "$UPGRADE" == "yes" ]; then
echo >&2 "ERROR: Cannot upgrade a sysroot deployment"
exit 1
diff --git a/sysroot.write b/sysroot.write
index 0ad8d630..019edbe9 100755
--- a/sysroot.write
+++ b/sysroot.write
@@ -19,8 +19,4 @@ set -eu
mkdir -p "$2"
-# Move the contents of our source directory to our target
-# Previously we would (cd "$1" && find -print0 | cpio -0pumd "$absolute_path")
-# to do this, but the source directory is disposable anyway, so we can move
-# its contents to save time
-find "$1" -maxdepth 1 -mindepth 1 -exec mv {} "$2/." +
+cp -a "$1/*" "$2"