summaryrefslogtreecommitdiffstats
path: root/remote/modules/busybox
diff options
context:
space:
mode:
authorSimon Rettberg2013-11-29 17:15:32 +0100
committerSimon Rettberg2013-11-29 17:15:32 +0100
commitee5539ba797f098baefa12f1c9fba49b25ba8266 (patch)
treed0f72e1d6d139ea62c1be97499cb7678c6811b79 /remote/modules/busybox
parent[systemd] Env variables added for kmod compiling/linking when no kmod in system. (diff)
downloadtm-scripts-ee5539ba797f098baefa12f1c9fba49b25ba8266.tar.gz
tm-scripts-ee5539ba797f098baefa12f1c9fba49b25ba8266.tar.xz
tm-scripts-ee5539ba797f098baefa12f1c9fba49b25ba8266.zip
Reworking busybox config and included tools
Diffstat (limited to 'remote/modules/busybox')
-rw-r--r--remote/modules/busybox/busybox.build4
-rw-r--r--remote/modules/busybox/openslx-busybox-config2
2 files changed, 3 insertions, 3 deletions
diff --git a/remote/modules/busybox/busybox.build b/remote/modules/busybox/busybox.build
index e93eeb81..adb3db86 100644
--- a/remote/modules/busybox/busybox.build
+++ b/remote/modules/busybox/busybox.build
@@ -1,4 +1,3 @@
-#!/bin/bash
fetch_source() {
git clone "${REQUIRED_GIT}" src || perror "Could not clone busybox git"
@@ -13,7 +12,8 @@ build() {
pinfo "Running make (if this hangs, check for unset options, ie. when you increased the REQUIRED_BRANCH)"
make || perror "failed."
pinfo "Running make install"
- make CONFIG_PREFIX="$MODULE_DIR/build" install || perror "failed"
+ make CONFIG_PREFIX="$MODULE_BUILD_DIR" install || perror "failed"
+ rm "$MODULE_BUILD_DIR/bin/mount" "$MODULE_BUILD_DIR/bin/umount" "$MODULE_BUILD_DIR/bin/bash"
cd - &> /dev/null
}
diff --git a/remote/modules/busybox/openslx-busybox-config b/remote/modules/busybox/openslx-busybox-config
index 0f508f47..ae9f9ede 100644
--- a/remote/modules/busybox/openslx-busybox-config
+++ b/remote/modules/busybox/openslx-busybox-config
@@ -642,7 +642,7 @@ CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
# Miscellaneous Utilities
#
# CONFIG_CONSPY is not set
-CONFIG_LESS=y
+# CONFIG_LESS is not set
CONFIG_FEATURE_LESS_MAXLINES=9999999
CONFIG_FEATURE_LESS_BRACKETS=y
CONFIG_FEATURE_LESS_FLAGS=y