Automatically append --netboot to GK_ARGS for netboot2 target

Remove explicit --initramfs-overlay=/tmp/image from netboot2 example spec

diff --git a/ChangeLog b/ChangeLog
index fc72d31dbf27faa30b28f4506d827eeba0c65184..e7e42c85b9ef92a4c6ed4788bcc8ce3c137d036f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  07 Dec 2008; Andrew Gaffney <agaffney@gentoo.org>
+  examples/netboot2_template.spec, targets/support/kmerge.sh:
+  Automatically append --netboot to GK_ARGS for netboot2 target Remove
+  explicit --initramfs-overlay=/tmp/image from netboot2 example spec
+
   07 Dec 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/pre-kmerge.sh:
   Remove evil hacks that copy gk files around for netboot2

diff --git a/examples/netboot2_template.spec b/examples/netboot2_template.spec
index 1c7e32b54850a046d3c67a664c5f83c644352a13..987cf9ed627fc51c0dd2a73184d20cf915fc6bbd 100644 (file)
--- a/examples/netboot2_template.spec
+++ b/examples/netboot2_template.spec
@@ -34,12 +34,12 @@ boot/kernel/ip28r10k/use: -doc ip28
 boot/kernel/ip30r10k/use: -doc ip30
 boot/kernel/ip32r5k/use: -doc
 
-boot/kernel/ip22r4k/gk_kernargs: --kernel-cross-compile=mips-unknown-linux-gnu- --makeopts=-j2 --initramfs-overlay=/tmp/image
-boot/kernel/ip22r5k/gk_kernargs: --kernel-cross-compile=mips-unknown-linux-gnu- --makeopts=-j2 --initramfs-overlay=/tmp/image
-boot/kernel/ip27r10k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2 --initramfs-overlay=/tmp/image
-boot/kernel/ip28r10k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2 --initramfs-overlay=/tmp/image
-boot/kernel/ip30r10k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2 --initramfs-overlay=/tmp/image
-boot/kernel/ip32r5k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2 --initramfs-overlay=/tmp/image
+boot/kernel/ip22r4k/gk_kernargs: --kernel-cross-compile=mips-unknown-linux-gnu- --makeopts=-j2
+boot/kernel/ip22r5k/gk_kernargs: --kernel-cross-compile=mips-unknown-linux-gnu- --makeopts=-j2
+boot/kernel/ip27r10k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2
+boot/kernel/ip28r10k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2
+boot/kernel/ip30r10k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2
+boot/kernel/ip32r5k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2
 
 netboot2/builddate: 20060107
 netboot2/busybox_config: /usr/share/genkernel/mips/nb-busybox.cf

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 39a5e6e3c7b507579a2075ed412623faa48990fa..c5fe5524555b32718d5dfec5e758c838275c2936 100644 (file)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -55,9 +55,14 @@ setup_gk_args() {
                GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc"
        fi
 
-    if [ "${clst_target}" == "netboot2" -a -n "${clst_merge_path}" ]
+    if [ "${clst_target}" == "netboot2" ]
     then
-        GK_ARGS="${GK_ARGS} --initramfs-overlay=\"${clst_merge_path}\""
+               GK_ARGS="${GK_ARGS} --netboot"
+
+               if [ -n "${clst_merge_path}" ]
+               then
+               GK_ARGS="${GK_ARGS} --initramfs-overlay=\"${clst_merge_path}\""
+               fi
     fi
 }