Add support for gk's --busybox-config= option

diff --git a/ChangeLog b/ChangeLog
index cde73c4a1d815726b1441d8c37253dbae0d40a7e..c394592bc04c314769af5bf6e0a8dec005d89e46 100644 (file)
--- 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 b46719cbbebbb682832085b6d918cee050778368..a0d26b8a4e00877a14d0c3a98c6d3e928ed6cdaa 100644 (file)
--- 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 c5fe5524555b32718d5dfec5e758c838275c2936..d3201bb73e408808d593ad8fdf12c7336d7bc783 100644 (file)
--- 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(){