Changed boot/kernel/${kname}/config and boot/kernel/${kname}/sources to be valid...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1361 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 2ef624f5eca6f3b2e6d37bdf4b8e2e98209a6a0c..46882956e9385b8ccb9fb7021b69f555396654cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  05 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  modules/generic_stage_target.py, targets/support/kmerge.sh,
+  targets/support/pre-kmerge.sh:
+  Changed boot/kernel/${kname}/config and boot/kernel/${kname}/sources to be
+  valid, rather than required, changed clst_ksource to default to
+  virtual/linux-sources if boot/kernel/${kname}/sources is unset, moved
+  removal of USE to after the kernel build so the modules get the correct USE,
+  and did some minor cleanup on pre-kmerge. This is 2.0.6_pre13 for testing.
+
   05 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/kmerge.sh:
   We should run the default functions for kmerge.sh, too.

diff --git a/catalyst b/catalyst
index 57bc3ad7d0403821b09440b70dec675bd6ef32e5..75090dcd36e8344100fdcc2b34f56ca3b2c86c96 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6_pre12"
+__version__="2.0.6_pre13"
 
 conf_values={}
 

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index b6ee5409ae128e4b70cf734b8fbf6339d6af6d53..a29808c5ff18c3177335c13fc565a38d06b6a0c6 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -558,23 +558,23 @@ class generic_stage_target(generic_target):
                                loopy=addlargs["boot/kernel"]
 
                        for x in loopy:
-                               self.required_values.append("boot/kernel/"+x+"/sources")
-                               self.required_values.append("boot/kernel/"+x+"/config")
                                self.valid_values.append("boot/kernel/"+x+"/aliases")
+                               self.valid_values.append("boot/kernel/"+x+"/config")
+                               self.valid_values.append("boot/kernel/"+x+"/console")
                                self.valid_values.append("boot/kernel/"+x+"/extraversion")
+                               self.valid_values.append("boot/kernel/"+x+"/gk_action")
+                               self.valid_values.append("boot/kernel/"+x+"/gk_kernargs")
+                               self.valid_values.append("boot/kernel/"+x+"/initramfs_overlay")
+                               self.valid_values.append("boot/kernel/"+x+"/machine_type")
+                               self.valid_values.append("boot/kernel/"+x+"/sources")
+                               self.valid_values.append("boot/kernel/"+x+"/softlevel")
+                               self.valid_values.append("boot/kernel/"+x+"/use")
                                self.valid_values.append("boot/kernel/"+x+"/packages")
                                if addlargs.has_key("boot/kernel/"+x+"/packages"):
                                        if type(addlargs["boot/kernel/"+x+\
                                                "/packages"])==types.StringType:
                                                addlargs["boot/kernel/"+x+"/packages"]=\
                                                        [addlargs["boot/kernel/"+x+"/packages"]]
-                               self.valid_values.append("boot/kernel/"+x+"/use")
-                               self.valid_values.append("boot/kernel/"+x+"/gk_kernargs")
-                               self.valid_values.append("boot/kernel/"+x+"/gk_action")
-                               self.valid_values.append("boot/kernel/"+x+"/initramfs_overlay")
-                               self.valid_values.append("boot/kernel/"+x+"/softlevel")
-                               self.valid_values.append("boot/kernel/"+x+"/console")
-                               self.valid_values.append("boot/kernel/"+x+"/machine_type")
                                # TODO: remove this warning/code with the next major version
                                self.valid_values.append("boot/kernel/"+x+"/postconf")
                                if addlargs.has_key("boot/kernel/"+x+"/postconf"):
@@ -605,6 +605,9 @@ class generic_stage_target(generic_target):
                        del self.settings[self.settings["spec_prefix"]+"/devmanager"]
 
                if self.settings.has_key(self.settings["spec_prefix"]+"/splashtype"):
+                       # TODO: remove this warning/code with the next major version
+                       print self.settings["spec_prefix"]+\
+                               "/splashtype is deprecated and will be removed."
                        self.settings["splashtype"]=\
                                self.settings[self.settings["spec_prefix"]+"/splashtype"]
                        del self.settings[self.settings["spec_prefix"]+"/splashtype"]

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 3a421dab49eacdb7f96cc88760f5e4df3839e5f2..d844d7e3757007427e65362d8e51e4d210871888 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -118,10 +118,14 @@ filtered_kname=${clst_kname/\//_}
 filtered_kname=${filtered_kname/\./_}
 
 eval "clst_kernel_use=\$clst_boot_kernel_${filtered_kname}_use"
-
 eval "clst_kernel_gk_kernargs=\$clst_boot_kernel_${filtered_kname}_gk_kernargs"
 eval "clst_ksource=\$clst_boot_kernel_${filtered_kname}_sources"
 
+if [ -z "${clst_ksource}" ]
+then
+       clst_ksource="virtual/linux-sources"
+fi
+
 # Don't use pkgcache here, as the kernel source may get emerged with different
 # USE variables (and thus different patches enabled/disabled.) Also, there's no
 # real benefit in using the pkgcache for kernel source ebuilds.
@@ -189,7 +193,6 @@ else
        run_merge "${clst_ksource}" || exit 1
 fi
 make_destpath
-sed -i "/USE=\"\${USE} ${clst_kernel_use} symlink build\"/d" /etc/make.conf
 
 # If catalyst has set to a empty string, extraversion wasn't specified so we
 # skip this part
@@ -206,6 +209,7 @@ then
 fi
 
 build_kernel
+sed -i "/USE=\"\${USE} ${clst_kernel_use} symlink build\"/d" /etc/make.conf
 # grep out the kernel version so that we can do our modules magic
 VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
 PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index 9f21c9d330795776558459a7113f86dd233c43d2..cd23eda7738d8c4ad4fe1a53921dd9140e4c42d0 100755 (executable)
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -6,14 +6,7 @@ run_merge --oneshot genkernel
 install -d /tmp/kerncache
 
 case ${clst_target} in
-       livecd*|stage4)
-
-       ;;
-
        netboot2)
-               run_merge --oneshot genkernel
-               install -d /tmp/kerncache
-
                # Set the netboot builddate/hostname in linuxrc and copy to proper arch
                # directory in genkernel
                sed -e "s/@@MYDATE@@/$(date '+%Y%m%d')/g" \