From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A707013894B for ; Sat, 9 Feb 2013 20:46:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AEB521C0F2; Sat, 9 Feb 2013 20:46:08 +0000 (UTC) Received: from vms173007pub.verizon.net (vms173007pub.verizon.net [206.46.173.7]) by pigeon.gentoo.org (Postfix) with ESMTP id 0F7BD21C0F2 for ; Sat, 9 Feb 2013 20:46:07 +0000 (UTC) Received: from odin.tremily.us ([unknown] [72.68.84.219]) by vms173007.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MHZ00N7N0C90370@vms173007.mailsrvcs.net> for gentoo-catalyst@lists.gentoo.org; Sat, 09 Feb 2013 14:45:53 -0600 (CST) Received: by odin.tremily.us (Postfix, from userid 1000) id 644A0878CA9; Sat, 09 Feb 2013 15:45:45 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1360442745; bh=TbSiHFMFiCiSSHqxhkFZTrpk249Xf1ic3vRr0XmAKP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=J2PV6EIm/OmohXVSEVrTvgTYzxnCp/9I+uj/Kv79OI30/LAgXa/UYRXE5cO6MFW+Z VwJsuV7K1zCjTPqDb3kaC5+243ly4TYb2DzxCiknziwO2HeZ11hbbogJxiYdl+/JVS 8hxWVMhxL4u7pkbURHR0CWKZqedYPyBUT54ZwSUk= From: "W. Trevor King" To: Catalyst Cc: "W. Trevor King" Subject: [gentoo-catalyst] [PATCH 6/6] kmerge.sh: Make /var/tmp/${clst_kname}.config optional Date: Sat, 09 Feb 2013 15:45:38 -0500 Message-id: X-Mailer: git-send-email 1.7.12.4 In-reply-to: References: In-reply-to: References: Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: 88d5c142-d13c-49e6-baad-580eaa0874c9 X-Archives-Hash: 87d5a9b22993ac50dabbca7f840f0e96 From: "W. Trevor King" For users that don't want to specify a seed config. --- targets/support/kmerge.sh | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index b731373..ce1dddf 100644 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -109,8 +109,11 @@ genkernel_compile(){ 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 + if [ -e /var/tmp/${clst_kname}.config ] + then + md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \ + /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG + fi } build_kernel() { @@ -177,15 +180,17 @@ then fi CONFIG_MATCH=0 -if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ] +if [ -n "${clst_KERNCACHE}" -a + -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ] then - STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG` - STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'` - if [ "${STR1}" = "${STR2}" ] + if [ ! -e /var/tmp/${clst_kname}.config ] then - if [ -n "${clst_KERNCACHE}" ] + CONFIG_MATCH=1 + else + STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG` + STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'` + if [ "${STR1}" = "${STR2}" ] then - #echo "CONFIG match" CONFIG_MATCH=1 fi fi -- 1.8.1.336.g94702dd