From 60fdceff8332b976f6b8ccc10740659ca93dcdc8 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 8 Jun 2019 14:21:42 +0200
Subject: [PATCH] - unify busybox.config names; align patch

---
 .../{busybox-armbox.config => busybox-armbox-hd51.config}   | 0
 archive-patches/busybox-mount_single_uuid.patch             | 2 +-
 make/system-tools.mk                                        | 6 +-----
 3 files changed, 2 insertions(+), 6 deletions(-)
 rename archive-configs/{busybox-armbox.config => busybox-armbox-hd51.config} (100%)

diff --git a/archive-configs/busybox-armbox.config b/archive-configs/busybox-armbox-hd51.config
similarity index 100%
rename from archive-configs/busybox-armbox.config
rename to archive-configs/busybox-armbox-hd51.config
diff --git a/archive-patches/busybox-mount_single_uuid.patch b/archive-patches/busybox-mount_single_uuid.patch
index f2d651ca..b633c07f 100644
--- a/archive-patches/busybox-mount_single_uuid.patch
+++ b/archive-patches/busybox-mount_single_uuid.patch
@@ -1,6 +1,6 @@
 --- a/util-linux/mount.c
 +++ b/util-linux/mount.c
-@@ -2315,6 +2315,8 @@ int mount_main(int argc UNUSED_PARAM, ch
+@@ -2323,6 +2323,8 @@ int mount_main(int argc UNUSED_PARAM, ch
  		// "proc") or a full path from root
  		if (argv[0]) {
  
diff --git a/make/system-tools.mk b/make/system-tools.mk
index 6a4574a1..bdb2eebc 100644
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@@ -44,13 +44,9 @@ BUSYBOX_MAKE_OPTS = \
 $(D)/busybox: $(D)/libtirpc $(ARCHIVE)/$(BUSYBOX_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/busybox-$(BUSYBOX_VER)
 	$(UNTAR)/$(BUSYBOX_SOURCE)
-ifeq ($(BOXTYPE), coolstream)
-	cp $(CONFIGS)/busybox-$(BOXTYPE)-$(BOXSERIES).config $(BUILD_TMP)/busybox-$(BUSYBOX_VER)/.config
-else
-	cp $(CONFIGS)/busybox-$(BOXTYPE).config $(BUILD_TMP)/busybox-$(BUSYBOX_VER)/.config
-endif
 	$(CHDIR)/busybox-$(BUSYBOX_VER); \
 		$(call apply_patches, $(BUSYBOX_PATCH)); \
+		cp $(CONFIGS)/busybox-$(BOXTYPE)-$(BOXSERIES).config .config; \
 		sed -i -e 's|^CONFIG_PREFIX=.*|CONFIG_PREFIX="$(TARGET_DIR)"|' .config; \
 		$(BUSYBOX_MAKE_ENV) $(MAKE) busybox $(BUSYBOX_MAKE_OPTS); \
 		$(BUSYBOX_MAKE_ENV) $(MAKE) install $(BUSYBOX_MAKE_OPTS)