summaryrefslogtreecommitdiffstats
path: root/core/modules/busybox
diff options
context:
space:
mode:
Diffstat (limited to 'core/modules/busybox')
-rw-r--r--core/modules/busybox/module.build8
-rw-r--r--core/modules/busybox/module.conf3
2 files changed, 4 insertions, 7 deletions
diff --git a/core/modules/busybox/module.build b/core/modules/busybox/module.build
index ae009259..27270a2c 100644
--- a/core/modules/busybox/module.build
+++ b/core/modules/busybox/module.build
@@ -1,10 +1,8 @@
#!/bin/bash
fetch_source() {
- if ! [ -d "src/.git" ]; then
- git clone --depth 1 "${REQUIRED_GIT}" --branch "$REQUIRED_BRANCH" src || perror "Could not clone busybox git"
- fi
- cde src
+ autoclone
+ cde src/busybox
# Needed for newer glibc
if ! grep -q 'OPT_SET.*clock_settime.*CLOCK_REALTIME' "coreutils/date.c"; then
git apply "${MODULE_DIR}/1_31_1-stime.patch" || perror "Could not apply stime patch for 1.31.1"
@@ -29,7 +27,7 @@ fetch_source() {
build() {
cp "${MODULE_DIR}/openslx-busybox-config" "src/.config"
- cde src
+ cde src/busybox
yes '' | make oldconfig
pinfo "Running make (if this hangs, check for unset options, ie. when you increased the REQUIRED_BRANCH)"
make || perror "failed."
diff --git a/core/modules/busybox/module.conf b/core/modules/busybox/module.conf
index 6f29188b..f9072efe 100644
--- a/core/modules/busybox/module.conf
+++ b/core/modules/busybox/module.conf
@@ -1,6 +1,5 @@
#!/bin/bash
-REQUIRED_GIT="git://git.busybox.net/busybox"
-REQUIRED_BRANCH="1_31_1"
+REQUIRED_GIT="git://git.busybox.net/busybox||1_31_1"
REQUIRED_BINARIES="busybox"
REQUIRED_DIRECTORIES="
/