We should be using --newuse when merging our packages in callback.

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

diff --git a/ChangeLog b/ChangeLog
index 6f0ad55db0af018076862b16b65d5e0f17e29eb1..dae3f24dcda5688cf12958022cea9232cd98ae0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  11 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/kmerge.sh:
+  We should be using --newuse when merging our packages in callback.
+
   11 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/grp/grp-chroot.sh:
   We should only use --noreplace when building a pkgset, everything else

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 67a41a028051f26c8cd8b1e2ce8623627d22d4d3..db5632eaf0f92f69750793cc337b33ec68201815 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -84,7 +84,7 @@ genkernel_compile(){
        fi
        # Build with genkernel using the set options
        # callback is put here to avoid escaping issues
-       gk_callback_opts="-q"
+       gk_callback_opts="-qN"
        PKGDIR=${PKGDIR}
        if [ -n "${clst_KERNCACHE}" ]
        then