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 07B701380DC for ; Wed, 5 Feb 2014 10:40:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBCA2E0B1E; Wed, 5 Feb 2014 10:40:19 +0000 (UTC) Received: from venus.vo.lu (venus.vo.lu [80.90.45.96]) by pigeon.gentoo.org (Postfix) with ESMTP id AAC4FE0B1D for ; Wed, 5 Feb 2014 10:40:18 +0000 (UTC) Received: from ibiza.lux.tuxicoman.be (vodsl-8217.vo.lu [85.93.199.25]) by venus.vo.lu with SMTP (version=TLS\Tls cipher=Aes128 bits=128); Wed, 5 Feb 2014 11:39:32 +0100 Received: from terminatrix.lux.tuxicoman.be ([172.19.0.9]) by ibiza.lux.tuxicoman.be with esmtp (Exim 4.80.1) (envelope-from ) id 1WAzto-0002QU-1L for gentoo-catalyst@lists.gentoo.org; Wed, 05 Feb 2014 11:40:08 +0100 From: Guy Martin To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 08/11] Fix and improve kernel build when kerncache is enabled. Date: Wed, 5 Feb 2014 11:40:03 +0100 Message-Id: <1391596806-14955-9-git-send-email-gmsoft@gentoo.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1391596806-14955-1-git-send-email-gmsoft@gentoo.org> References: <1391596806-14955-1-git-send-email-gmsoft@gentoo.org> 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: 191b5d59-82d6-4032-a5e9-4fc6dabd36fb X-Archives-Hash: 1fb5297e12e9220f5135c32bfbe04a78 This patch gets rid of setting ROOT for merging kernel sources. Instead, the sources are moved manually to the kerncache directory. A new file is created containing the kernel version and it is fed into package.provided to prevent merging the kernel sources again. --- targets/support/kmerge.sh | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 7c7f8fe..ababc57 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -197,8 +197,17 @@ then # Create the kerncache directory if it doesn't exists mkdir -p /tmp/kerncache/${clst_kname} - clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --nodeps --update --newuse" run_merge "${clst_ksource}" || exit 1 - KERNELVERSION=`portageq best_visible / "${clst_ksource}"` + + + if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.KERNELVERSION ] + then + KERNELVERSION=$( ${clst_port_conf}/profile/package.provided + else + rm -f ${clst_port_conf}/profile/package.provided + fi + if [ ! -e ${clst_port_conf}/profile/package.provided ] then mkdir -p ${clst_port_conf}/profile @@ -209,8 +218,26 @@ then echo "${KERNELVERSION}" >> ${clst_port_conf}/profile/package.provided fi fi + [ -L /usr/src/linux ] && rm -f /usr/src/linux - ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux + + PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --nodeps --update --newuse" run_merge "${clst_ksource}" || exit 1 + + SOURCESDIR="/tmp/kerncache/${clst_kname}/sources" + if [ -L /usr/src/linux ] + then + + # A kernel was merged, move it to $SOURCESDIR + [ -e ${SOURCESDIR} ] && rm -Rf ${SOURCESDIR} + + KERNELVERSION=`portageq best_visible / "${clst_ksource}"` + echo "${KERNELVERSION}" > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.KERNELVERSION + + echo "Moving kernel sources to ${SOURCESDIR} ..." + mv `readlink -f /usr/src/linux` ${SOURCESDIR} + + fi + ln -sf ${SOURCESDIR} /usr/src/linux # If catalyst has set to a empty string, extraversion wasn't specified so we # skip this part @@ -259,9 +286,4 @@ unset USE if [ -n "${clst_KERNCACHE}" ] then echo ${clst_kernel_use} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE - - if [ -e ${clst_port_conf}/profile/package.provided ] - then - sed -i "/^$(echo "${KERNELVERSION}" | sed -e 's|/|\\/|g')\$/d" ${clst_port_conf}/profile/package.provided - fi fi -- 1.8.3.2