Removed support for postconf as genkernel no longer has that option

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

diff --git a/ChangeLog b/ChangeLog
index f92c404e25f5ab42e15beb11c4d008c276640663..dd49a206a86236fabd755773870a41c59593099e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.218 2005/04/14 14:59:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.219 2005/04/14 17:09:07 rocket Exp $
+
+  14 Apr 2005; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py, targets/support/kmerge.sh:
+  Removed support for postconf as genkernel no longer has that option
 
   14 Apr 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py,
   modules/embedded_target.py, modules/generic_stage_target.py,

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 7115b96f1aa6d6fcd52fc841e7503aa53b61502b..0f4d4e1271bdcb72de920add1f9c06036dcd4e25 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.29 2005/04/14 14:59:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.30 2005/04/14 17:09:07 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -287,7 +287,18 @@ class generic_stage_target(generic_target):
                        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")
-                   
+                       if self.settings.has_key("boot/kernel/"+x+"/postconf"):
+                               print "boot/kernel/"+x+"/postconf is deprecated"
+                               print "\tInternally moving these ebuilds to boot/kernel/"+x+"/packages"
+                               print "\tPlease move them to boot/kernel/"+x+"/packages in your specfile"
+                               if type(self.settings["boot/kernel/"+x+"/postconf"]) == types.StringType:
+                                       loop2=[self.settings["boot/kernel/"+x+"/postconf"]]
+                               else:
+                                       loop2=self.settings["boot/kernel/"+x+"/postconf"]
+                               
+                               for y in loop2:
+                                       self.settings["boot/kernel/"+x+"/packages"].append(y)
+
            if self.settings.has_key(self.settings["spec_prefix"]+"/devmanager"):
                self.settings["devmanager"]=self.settings[self.settings["spec_prefix"]+"/devmanager"]
                del self.settings[self.settings["spec_prefix"]+"/devmanager"]

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 9309f4545fbb7f53be3379878faf7642bcf37da9..e7525c5e300804b118b5f929202cec70ac2bde6a 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -45,45 +45,23 @@ genkernel_compile(){
 
        setup_gk_args
        
-       eval "clst_kernel_postconf=\$clst_boot_kernel_${clst_kname}_postconf"
        eval "clst_kernel_merge=\$clst_boot_kernel_${clst_kname}_packages"
-       export clst_kernel_postconf
        export clst_kernel_merge
        # build with genkernel using the set options
-       # callback and postconf are put here to avoid escaping issues
+       # callback is put here to avoid escaping issues
        if [ -n "${clst_KERNCACHE}" ]
        then
-               if [ "$clst_kernel_postconf" != "" \
-                       -a "$clst_kernel_merge" != "" ]
+               if [ "$clst_kernel_merge" != "" ]
                then
                        genkernel --callback="PKGDIR=${PKGDIR} emerge -kb ${clst_kernel_merge}" \
-                               --postconf="PKGDIR=${PKGDIR} emerge -kb ${clst_kernel_postconf}" \
                                        ${GK_ARGS} || exit 1
-               elif [ "$clst_kernel_merge" != "" ]
-               then
-                       genkernel --callback="PKGDIR=${PKGDIR} emerge -kb ${clst_kernel_merge}" \
-                               ${GK_ARGS} || exit 1
-               elif [ "$clst_kernel_postconf" != "" ]
-               then
-                       genkernel --postconf="PKGDIR=${PKGDIR} emerge -kb ${clst_kernel_postconf}" \
-                               ${GK_ARGS} || exit 1
                else
                        genkernel ${GK_ARGS} || exit 1
                fi
        else
-               if [ "$clst_kernel_postconf" != "" \
-                       -a "$clst_kernel_merge" != "" ]
+               if [ "$clst_kernel_merge" != "" ]
                then
                        genkernel --callback="emerge ${clst_kernel_merge}" \
-                               --postconf="emerge ${clst_kernel_postconf}" \
-                               ${GK_ARGS} || exit 1
-               elif [ "$clst_kernel_merge" != "" ]
-               then
-                       genkernel --callback="emerge ${clst_kernel_merge}" \
-                               ${GK_ARGS} || exit 1
-               elif [ "$clst_kernel_postconf" != "" ]
-               then
-                       genkernel --postconf="emerge ${clst_kernel_postconf}" \
                                ${GK_ARGS} || exit 1
                else
                        genkernel ${GK_ARGS} || exit 1