summaryrefslogtreecommitdiffstats
path: root/remote/modules/debug
diff options
context:
space:
mode:
authorSimon Rettberg2013-08-14 20:58:54 +0200
committerSimon Rettberg2013-08-14 20:58:54 +0200
commit9d4e9bf4e8db96ea5148f2a25ccda96c49a95913 (patch)
treea842d17dd45cfda21510a2bfdb07c4115adab367 /remote/modules/debug
parentMerge branch 'master' of simonslx:openslx-ng/tm-scripts (diff)
downloadtm-scripts-9d4e9bf4e8db96ea5148f2a25ccda96c49a95913.tar.gz
tm-scripts-9d4e9bf4e8db96ea5148f2a25ccda96c49a95913.tar.xz
tm-scripts-9d4e9bf4e8db96ea5148f2a25ccda96c49a95913.zip
[debug] Add htop
[setup_target] Make it possible to mark required binaries as optional by prefixing them with '@'
Diffstat (limited to 'remote/modules/debug')
-rw-r--r--remote/modules/debug/debug.build1
-rw-r--r--remote/modules/debug/debug.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/remote/modules/debug/debug.build b/remote/modules/debug/debug.build
index e791d347..c020181d 100644
--- a/remote/modules/debug/debug.build
+++ b/remote/modules/debug/debug.build
@@ -5,6 +5,7 @@ fetch_source() {
build() {
for BIN in $REQUIRED_BINARIES; do
+ [[ "$BIN" == @* ]] && BIN=$(echo "$BIN" | cut -c 2-)
BIN_LOCATION=$(which ${BIN})
if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ]; then
tarcopy "$(get_link_chain ${BIN_LOCATION})" "${MODULE_BUILD_DIR}"
diff --git a/remote/modules/debug/debug.conf b/remote/modules/debug/debug.conf
index b7242b58..ba1f065e 100644
--- a/remote/modules/debug/debug.conf
+++ b/remote/modules/debug/debug.conf
@@ -9,4 +9,5 @@ REQUIRED_BINARIES="
fc-query
xset
locale
+ @htop
"