summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJonathan Bauer2013-02-27 17:18:55 +0100
committerJonathan Bauer2013-02-27 17:18:55 +0100
commitfd7d5b81d0e2c193bf5ca678e054c216da03f90c (patch)
tree0e742a553c62c064f51a701c6ceed500b8c37a9f /server
parentusing binutils EVERYWHERE (diff)
parentImplemented more flexible command line parsing (diff)
downloadtm-scripts-fd7d5b81d0e2c193bf5ca678e054c216da03f90c.tar.gz
tm-scripts-fd7d5b81d0e2c193bf5ca678e054c216da03f90c.tar.xz
tm-scripts-fd7d5b81d0e2c193bf5ca678e054c216da03f90c.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Conflicts: remote/setup_tools remote/tools/base/base.build remote/tools/dbus/dbus.build
Diffstat (limited to 'server')
-rwxr-xr-xserver/build_core4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/build_core b/server/build_core
index 411036df..03ff6eca 100755
--- a/server/build_core
+++ b/server/build_core
@@ -27,9 +27,9 @@ STAGE32_DIR=${ROOT_DIR}/remote/stage3.2
# initial checks
initial_checks() {
local TOOL_STR="$TOOL_STR initial_checks:"
- [ -d "${STAGE32_DIR}" ] || perror "No stage3.2 directory found. Please run './mltk tools build' first."
+ [ -d "${STAGE32_DIR}" ] || perror "No stage3.2 directory found. Please run './mltk --tools -b' first."
- [ -e "${STAGE32_DIR}/openslx/bin/busybox" ] || perror "Busybox not found, run './mltk tools build busybox' first."
+ [ -e "${STAGE32_DIR}/openslx/bin/busybox" ] || perror "Busybox not found, run './mltk --tools -b busybox' first."
# shouldn't squashfs-tools be automatically installed as we need them nevertheless!?
# what if it is already on the machine? faster to check with which than the apt-get check?