From 9b9e3b19cdccf5e442c129d4814da7987afb16a7 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 9 Jul 2021 14:14:34 +0200
Subject: Use autoclone where possible

---
 core/modules/busybox/module.build | 8 +++-----
 core/modules/busybox/module.conf  | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'core/modules/busybox')

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="
 	/
-- 
cgit v1.2.3-55-g7522