From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JWwEL-0006qp-Dv for garchives@archives.gentoo.org; Wed, 05 Mar 2008 16:12:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 790A6E0528; Wed, 5 Mar 2008 16:12:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 55449E0528 for ; Wed, 5 Mar 2008 16:12:32 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id CCD906527C for ; Wed, 5 Mar 2008 16:12:31 +0000 (UTC) Received: from wolf31o2 by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JWwEI-00020r-M4 for gentoo-commits@lists.gentoo.org; Wed, 05 Mar 2008 16:12:30 +0000 To: gentoo-commits@lists.gentoo.org From: "Chris Gianelloni (wolf31o2)" Subject: [gentoo-commits] catalyst r1352 - in trunk: . targets/support X-VCS-Repository: catalyst X-VCS-Revision: 1352 X-VCS-Files: trunk/ChangeLog trunk/catalyst trunk/targets/support/kmerge.sh X-VCS-Directories: . targets/support X-VCS-Committer: wolf31o2 X-VCS-Committer-Name: Chris Gianelloni Content-Type: text/plain; charset=UTF-8 Message-Id: Sender: Chris Gianelloni Date: Wed, 05 Mar 2008 16:12:30 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 1ebb5894-e5b9-47d5-9ae3-b0f0df67c09f X-Archives-Hash: 36213f61810a8e2a839d2d820a66a5d4 Author: wolf31o2 Date: 2008-03-05 16:12:29 +0000 (Wed, 05 Mar 2008) New Revision: 1352 Modified: trunk/ChangeLog trunk/catalyst trunk/targets/support/kmerge.sh Log: Added an additional make_destpath call to kmerge.sh so it'll export ROOT=3D= / prior to running genkernel. This is catalyst 2.0.6_pre11 for testing. Modified: trunk/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ChangeLog 2008-03-04 02:37:23 UTC (rev 1351) +++ trunk/ChangeLog 2008-03-05 16:12:29 UTC (rev 1352) @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ =20 + 05 Mar 2008; Chris Gianelloni catalyst, + targets/support/kmerge.sh: + Added an additional make_destpath call to kmerge.sh so it'll export RO= OT=3D/ + prior to running genkernel. This is catalyst 2.0.6_pre11 for testing. + 04 Mar 2008; Andrew Gaffney targets/support/create-iso.sh: Bash fscking sucks, so we have to compromise on this code reduction so= lution @@ -12,7 +17,7 @@ =20 02 Mar 2008; Andrew Gaffney targets/support/kmerge.sh: - Pass clst_root_path instead of ROOT to run_emerge, since it overrides = ROOT + Pass clst_root_path instead of ROOT to run_merge, since it overrides R= OOT =20 29 Feb 2008; Andrew Gaffney targets/support/kmerge.sh: Modified: trunk/catalyst =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/catalyst 2008-03-04 02:37:23 UTC (rev 1351) +++ trunk/catalyst 2008-03-05 16:12:29 UTC (rev 1352) @@ -8,7 +8,7 @@ import pdb =20 __maintainer__=3D"Chris Gianelloni " -__version__=3D"2.0.6_pre10" +__version__=3D"2.0.6_pre11" =20 conf_values=3D{} =20 Modified: trunk/targets/support/kmerge.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/targets/support/kmerge.sh 2008-03-04 02:37:23 UTC (rev 1351) +++ trunk/targets/support/kmerge.sh 2008-03-05 16:12:29 UTC (rev 1352) @@ -63,7 +63,6 @@ then GK_ARGS=3D"${GK_ARGS} --initramfs-overlay=3D\"${clst_merge_path}= \"" fi - =20 } =20 genkernel_compile(){ @@ -101,7 +100,8 @@ else genkernel ${GK_ARGS} || exit 1 fi - md5sum /var/tmp/${clst_kname}.config|awk '{print $1}' > /tmp/kerncache/= ${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG + md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \ + /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFI= G } =20 build_kernel() { @@ -196,6 +196,7 @@ else run_merge "${clst_ksource}" || exit 1 fi +make_destpath sed -i "/USE=3D\"\${USE} ${clst_kernel_use} symlink build\"/d" /etc/make= .conf =20 # If catalyst has set to a empty string, extraversion wasn't specified s= o we --=20 gentoo-commits@lists.gentoo.org mailing list