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 884B01391DB for ; Sat, 22 Mar 2014 17:04:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5A51E0C7D; Sat, 22 Mar 2014 17:03:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23EAFE0C63 for ; Sat, 22 Mar 2014 17:03:47 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 4E8F733FD14 for ; Sat, 22 Mar 2014 17:03:46 +0000 (UTC) From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 05/17] Fix merging kernel without kerncache enabled. Date: Sat, 22 Mar 2014 10:03:03 -0700 Message-Id: <1395507795-13754-6-git-send-email-dolsen@gentoo.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1395507795-13754-1-git-send-email-dolsen@gentoo.org> References: <1395507795-13754-1-git-send-email-dolsen@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: ed46a01f-9493-4a68-ae53-4154371be188 X-Archives-Hash: 5723e2a4e7ce20f6cc09f5ddd6495336 From: Guy Martin 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. Conflicts: targets/support/kmerge.sh --- 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 8e832e1..fac6e9c 100644 --- 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 /etc/portage/make.conf ] && \ - echo "USE=\"\${USE} ${clst_kernel_use} \"" >> /etc/portage/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 --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} \"/d" /etc/portage/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 /etc/portage/profile/package.provided ] then sed -i "/^$(echo "${KERNELVERSION}" | sed -e 's|/|\\/|g')\$/d" /etc/portage/profile/package.provided -- 1.8.5.3