diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-02 14:26:39 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-02 14:26:39 +0000 |
commit | a4f5d580dfe9b1715e24dd1b49dde4f1d240b880 (patch) | |
tree | 104596308ba97931e8ff52a921c9a9278b71a407 | |
parent | 30aaa46e250a1bd8081283839abd7d5aab97fb1e (diff) | |
parent | 807e6a90876c5469d2421a47649d15f06e94ca36 (diff) | |
download | morph-a4f5d580dfe9b1715e24dd1b49dde4f1d240b880.tar.gz |
Merge remote-tracking branch 'origin/baserock/tiagogomes/sysroot-checks'
Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk>
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
-rwxr-xr-x | morphlib/exts/sysroot.check | 30 | ||||
-rwxr-xr-x | morphlib/exts/sysroot.write | 4 |
2 files changed, 31 insertions, 3 deletions
diff --git a/morphlib/exts/sysroot.check b/morphlib/exts/sysroot.check new file mode 100755 index 00000000..bfacd3fc --- /dev/null +++ b/morphlib/exts/sysroot.check @@ -0,0 +1,30 @@ +#!/bin/sh +# Copyright (C) 2015 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Preparatory checks for Morph 'sysroot' write extension + +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 +fi diff --git a/morphlib/exts/sysroot.write b/morphlib/exts/sysroot.write index 1ae4864f..be315365 100755 --- a/morphlib/exts/sysroot.write +++ b/morphlib/exts/sysroot.write @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2014,2015 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,9 +18,7 @@ set -eu -# Ensure the target is an empty directory mkdir -p "$2" -find "$2" -mindepth 1 -delete # Move the contents of our source directory to our target # Previously we would (cd "$1" && find -print0 | cpio -0pumd "$absolute_path") |