diff options
Diffstat (limited to 'core/modules/busybox')
-rw-r--r-- | core/modules/busybox/module.build | 10 | ||||
-rw-r--r-- | core/modules/busybox/module.conf | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/core/modules/busybox/module.build b/core/modules/busybox/module.build index 9b83e1e7..2643bf15 100644 --- a/core/modules/busybox/module.build +++ b/core/modules/busybox/module.build @@ -34,10 +34,14 @@ 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_BUILD_DIR" install || perror "failed" - rm -f "$MODULE_BUILD_DIR/bin/mount" "$MODULE_BUILD_DIR/bin/umount" "$MODULE_BUILD_DIR/bin/bash" + local INSTALL_PREFIX="${MODULE_BUILD_DIR}/opt/openslx" + make CONFIG_PREFIX="${INSTALL_PREFIX}" install || perror "failed" + rm -f "${INSTALL_PREFIX}/bin/mount" "${INSTALL_PREFIX}/bin/umount" "${INSTALL_PREFIX}/bin/bash" + cd - &> /dev/null } post_copy() { - : + mkdir -p "${TARGET_BUILD_DIR}/bin" || perror "Failed to create '${TARGET_BUILD_DIR}/bin'." + ln -sf "/opt/openslx/bin/busybox" "${TARGET_BUILD_DIR}/bin/ash" || \ + perror "Failed to link '${TARGET_BUILD_DIR}/bin/ash' to '/opt/openslx/bin/busybox'." } diff --git a/core/modules/busybox/module.conf b/core/modules/busybox/module.conf index 265f53f3..d5bb5c41 100644 --- a/core/modules/busybox/module.conf +++ b/core/modules/busybox/module.conf @@ -3,6 +3,6 @@ REQUIRED_GIT="git://git.busybox.net/busybox" REQUIRED_BRANCH="1_31_1" REQUIRED_BINARIES="busybox" REQUIRED_DIRECTORIES=" - /bin - /sbin + /opt/openslx/bin + /opt/openslx/sbin " |