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 9904E1380DC 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 E7106E0B1D; 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 ABF88E0B1E 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:31 +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 1WAztn-0002QU-Ek for gentoo-catalyst@lists.gentoo.org; Wed, 05 Feb 2014 11:40:07 +0100 From: Guy Martin To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 04/11] Fix merging kernel without kerncache enabled. Date: Wed, 5 Feb 2014 11:39:59 +0100 Message-Id: <1391596806-14955-5-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: 1712b44e-3eb9-436a-abfe-e18aed6361cf X-Archives-Hash: de78ab92240c3cd7a91ec8c340816165 This is the proper fix for building kernels without kerncache. It prevents the creation of kerncache specific files and does not check for them. Build with kerncache require the later patch to work. --- targets/support/kmerge.sh | 109 +++++++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 50 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 3c08702..7c7f8fe 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -109,7 +109,7 @@ genkernel_compile(){ else genkernel ${GK_ARGS} || exit 1 fi - if [ -e /var/tmp/${clst_kname}.config ] + if [ -n "${clst_KERNCACHE}" -a -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 @@ -144,63 +144,58 @@ fi # USE variables (and thus different patches enabled/disabled.) Also, there's no # real benefit in using the pkgcache for kernel source ebuilds. -USE_MATCH=0 -if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE ] + +# Check if we have a match in kerncach + +if [ -n "${clst_KERNCACHE}" ] then - STR1=$(for i in `cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE`; do echo $i; done|sort) - STR2=$(for i in ${clst_kernel_use}; do echo $i; done|sort) - if [ "${STR1}" = "${STR2}" ] + + USE_MATCH=0 + if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE ] then - #echo "USE Flags match" - USE_MATCH=1 - else - if [ -n "${clst_KERNCACHE}" ] + STR1=$(for i in `cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE`; do echo $i; done|sort) + STR2=$(for i in ${clst_kernel_use}; do echo $i; done|sort) + if [ "${STR1}" = "${STR2}" ] then - [ -d /tmp/kerncache/${clst_kname}/ebuilds ] && \ - rm -r /tmp/kerncache/${clst_kname}/ebuilds - [ -e /tmp/kerncache/${clst_kname}/usr/src/linux/.config ] && \ - rm /tmp/kerncache/${clst_kname}/usr/src/linux/.config + #echo "USE Flags match" + USE_MATCH=1 + else + [ -d /tmp/kerncache/${clst_kname}/ebuilds ] && \ + rm -r /tmp/kerncache/${clst_kname}/ebuilds + [ -e /tmp/kerncache/${clst_kname}/usr/src/linux/.config ] && \ + rm /tmp/kerncache/${clst_kname}/usr/src/linux/.config fi fi -fi -EXTRAVERSION_MATCH=0 -if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION ] -then - STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION` - STR2=${clst_kextraversion} - if [ "${STR1}" = "${STR2}" ] + EXTRAVERSION_MATCH=0 + if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION ] then - if [ -n "${clst_KERNCACHE}" ] + STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION` + STR2=${clst_kextraversion} + if [ "${STR1}" = "${STR2}" ] then #echo "EXTRAVERSION match" EXTRAVERSION_MATCH=1 fi fi -fi -CONFIG_MATCH=0 -if [ -n "${clst_KERNCACHE}" -a \ - -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ] -then - if [ ! -e /var/tmp/${clst_kname}.config ] + CONFIG_MATCH=0 + if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ] then - 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}" ] + if [ ! -e /var/tmp/${clst_kname}.config ] then 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 + CONFIG_MATCH=1 + fi fi fi -fi -[ -e ${clst_make_conf} ] && \ - echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> ${clst_make_conf} - -if [ -n "${clst_KERNCACHE}" ] -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}"` @@ -216,26 +211,39 @@ then fi [ -L /usr/src/linux ] && rm -f /usr/src/linux ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux + + # If catalyst has set to a empty string, extraversion wasn't specified so we + # skip this part + if [ "${EXTRAVERSION_MATCH}" = "0" ] + then + if [ ! "${clst_kextraversion}" = "" ] + then + echo "Setting extraversion to ${clst_kextraversion}" + sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile + echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION + else + touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION + fi + fi + else [ -L /usr/src/linux ] && rm -f /usr/src/linux run_merge "${clst_ksource}" || exit 1 -fi -make_destpath - -# If catalyst has set to a empty string, extraversion wasn't specified so we -# skip this part -if [ "${EXTRAVERSION_MATCH}" = "0" ] -then if [ ! "${clst_kextraversion}" = "" ] then echo "Setting extraversion to ${clst_kextraversion}" sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile - echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION - else - touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION fi fi + +# Update USE flag in make.conf +[ -e ${clst_make_conf} ] && \ + echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> ${clst_make_conf} + +make_destpath + + build_kernel sed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" ${clst_make_conf} # grep out the kernel version so that we can do our modules magic @@ -246,11 +254,12 @@ EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION =// clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV} unset USE -echo ${clst_kernel_use} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.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 -- 1.8.3.2