From 6cf0812c5520cdeb1d6c53eff5d9771c61f04be8 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 11 Mar 2008 20:32:56 +0000 Subject: [PATCH] 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 --- ChangeLog | 4 ++++ targets/support/kmerge.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6f0ad55d..dae3f24d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 11 Mar 2008; Chris Gianelloni + targets/support/kmerge.sh: + We should be using --newuse when merging our packages in callback. + 11 Mar 2008; Chris Gianelloni 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 67a41a02..db5632ea 100755 --- 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 -- 2.26.2