From 33b9208e0612d5d26ff6b2490b3a905e111209c8 Mon Sep 17 00:00:00 2001
From: Andrew Gaffney <agaffney@gentoo.org>
Date: Wed, 24 Dec 2008 12:56:51 -0600
Subject: [PATCH 1/1] Add support for gk's --busybox-config= option

---
 ChangeLog                               |  4 ++++
 targets/netboot2/netboot2-controller.sh | 10 +++++++---
 targets/support/kmerge.sh               | 13 +++++++++----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cde73c4a..c394592b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  24 Dec 2008; Andrew Gaffney <agaffney@gentoo.org>
+  targets/netboot2/netboot2-controller.sh, targets/support/kmerge.sh:
+  Add support for gk's --busybox-config= option
+
   23 Dec 2008; Andrew Gaffney <agaffney@gentoo.org>
   modules/generic_stage_target.py:
   Missing / before 'iso'
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
index b46719cb..a0d26b8a 100644
--- a/targets/netboot2/netboot2-controller.sh
+++ b/targets/netboot2/netboot2-controller.sh
@@ -14,9 +14,6 @@ case ${1} in
 	;;
 	pre-kmerge)
 		# Sets up the build environment before any kernels are compiled
-#		if [ -n "${clst_netboot2_busybox_config}" ]; then
-#			cp ${clst_netboot2_busybox_config} ${clst_chroot_path}/tmp/busy-config
-#		fi
 		exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
 	;;
 	post-kmerge)
@@ -32,8 +29,15 @@ case ${1} in
 		then
 			cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
 		fi
+		if [ -n "${clst_busybox_config}" ]
+		then
+			cp ${clst_busybox_config} ${clst_chroot_path}/tmp/busy-config
+		fi
+
 		exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+
 		delete_from_chroot tmp/linuxrc
+		delete_from_chroot tmp/busy-config
 
 		extract_modules ${clst_chroot_path} ${clst_kname}
 		#16:12 <@solar> kernel_name=foo
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index c5fe5524..d3201bb7 100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -55,15 +55,20 @@ setup_gk_args() {
 		GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc"
 	fi
 
-    if [ "${clst_target}" == "netboot2" ]
-    then
+	if [ -n "${clst_busybox_config}" ]
+	then
+		GK_ARGS="${GK_ARGS} --busybox-config=/tmp/busy-config"
+	fi
+
+	if [ "${clst_target}" == "netboot2" ]
+	then
 		GK_ARGS="${GK_ARGS} --netboot"
 
 		if [ -n "${clst_merge_path}" ]
 		then
-	        GK_ARGS="${GK_ARGS} --initramfs-overlay=\"${clst_merge_path}\""
+			GK_ARGS="${GK_ARGS} --initramfs-overlay=\"${clst_merge_path}\""
 		fi
-    fi
+	fi
 }
 
 genkernel_compile(){
-- 
2.26.2