diff options
| author | Christian Rößler | 2013-11-29 17:23:40 +0100 |
|---|---|---|
| committer | Christian Rößler | 2013-11-29 17:23:40 +0100 |
| commit | 9b331c2c88df8315d2033bb24953d05662fe06a3 (patch) | |
| tree | 8b5fc1a60034937db3c46c509cce864ce3c8080f /remote/modules | |
| parent | [openslx] script systemd-vmchooser_env shebang --> /bin/bash (diff) | |
| parent | [rfs-stage32] Changed sh symlink to /bin/bash (diff) | |
| download | tm-scripts-9b331c2c88df8315d2033bb24953d05662fe06a3.tar.gz tm-scripts-9b331c2c88df8315d2033bb24953d05662fe06a3.tar.xz tm-scripts-9b331c2c88df8315d2033bb24953d05662fe06a3.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/busybox/busybox.build | 4 | ||||
| -rw-r--r-- | remote/modules/busybox/openslx-busybox-config | 2 |
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 |