From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Wed, 5 Mar 2008 20:35:49 +0000 (+0000)
Subject: We should run the default functions for kmerge.sh, too.
X-Git-Tag: CATALYST_2_0_6_916~134
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ed756d9fcdd421b93df9aca5142f08b52766468b;p=catalyst.git

We should run the default functions for kmerge.sh, too.

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

diff --git a/ChangeLog b/ChangeLog
index cac9eece..2ef624f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  05 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/kmerge.sh:
+  We should run the default functions for kmerge.sh, too.
+
   05 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   -livecd/cdtar/aboot-0.9-r1-cdtar.tar.bz2,
   +livecd/cdtar/aboot-1.0_pre20040408-r2-cdtar.tar.bz2:
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 91050a38..3a421dab 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-RUN_DEFAULT_FUNCS="no"
-
 source /tmp/chroot-functions.sh
 
 check_genkernel_version
@@ -108,12 +106,6 @@ build_kernel() {
 	genkernel_compile
 }
 
-# Script to build each kernel, kernel-related packages
-/usr/sbin/env-update
-source /etc/profile
-
-setup_myfeatures
-
 [ -n "${clst_ENVSCRIPT}" ] && source /tmp/envscript
 export CONFIG_PROTECT="-*"