From 41487934fe097d63c5157cf47239d45c3ec4da5f Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 5 Mar 2008 21:34:53 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1361 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 9 +++++++++ catalyst | 2 +- modules/generic_stage_target.py | 21 ++++++++++++--------- targets/support/kmerge.sh | 8 ++++++-- targets/support/pre-kmerge.sh | 7 ------- 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ef624f5..46882956 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,15 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 05 Mar 2008; Chris Gianelloni 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 targets/support/kmerge.sh: We should run the default functions for kmerge.sh, too. diff --git a/catalyst b/catalyst index 57bc3ad7..75090dcd 100755 --- a/catalyst +++ b/catalyst @@ -8,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__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 b6ee5409..a29808c5 100644 --- 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 3a421dab..d844d7e3 100755 --- 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 9f21c9d3..cd23eda7 100755 --- 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" \ -- 2.26.2