From 96a285cc492ddd88dd062e4d88c61e1f268367b0 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 20 Dec 2012 15:51:55 +0100 Subject: minor fix --- mltk | 12 ++++++------ remote/setup_tools | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mltk b/mltk index 3af41ce5..b7ade22d 100755 --- a/mltk +++ b/mltk @@ -24,13 +24,13 @@ print_usage() { echo "Usage: $(basename ${SELF}) MODULE [OPTION]" echo -e " MODULE:" echo -e " \t core \t minimal initramfs (stage 3.1) to mount the system-container (stage 3.2)." - echo -e " \t sys \t minimal systemd-based rootfs including basic tools." + echo -e " \t tools \t minimal systemd-based rootfs including basic tools." echo -e " OPTION:" echo -e " \t build \t builds [MODULE]" echo -e " \t clean \t clean build files for [MODULE]" echo -e "" echo -e " Module specific option:" - echo -e " \t sys \t build [TOOL]" + echo -e " \t tools \t build [TOOL]" echo -e " \t \t TOOL can be: \t base, busybox, dbus, udev, systemd, plymouth" } @@ -57,18 +57,18 @@ if [ "x$1" = "xcore" ]; then print_usage exit 1 fi -elif [ "x$1" = "xsys" ]; then +elif [ "x$1" = "xtools" ]; then [ -e ${SETUP_TOOLS} ] && . ${SETUP_TOOLS} shift if [ "x$1" = "xbuild" ]; then # shift away first 2 parameters shift - echo "[sys] Building $@" + echo "[tools] Building $@" generate_stage32 $@ elif [ "x$1" = "xclean" ]; then shift - echo "[sys] Cleaning $@" - clean_sys $@ + echo "[tools] Cleaning $@" + clean_tools $@ else print_usage exit 1 diff --git a/remote/setup_tools b/remote/setup_tools index cf96df7b..95e3e0a9 100755 --- a/remote/setup_tools +++ b/remote/setup_tools @@ -161,7 +161,7 @@ generate_stage32 () { } -clean_sys() { +clean_tools() { if [ "x$1" = "x" -o "x$1" = "xall" ]; then #clean all [ -d ${INIT_DIR} ] && rm -rf ${INIT_DIR} @@ -175,6 +175,7 @@ clean_sys() { done fi } + clean_tool() { TOOLDIR=${TOOL_DIR}/$1 echo "Cleaning ${TOOLDIR}" -- cgit v1.2.3-55-g7522