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 28AE2138CCF for ; Sun, 24 May 2015 00:08:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4854FE0940; Sun, 24 May 2015 00:08:37 +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 99FD3E091E for ; Sun, 24 May 2015 00:08:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 47E7F3409D0 for ; Sun, 24 May 2015 00:08:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9F8AA03 for ; Sun, 24 May 2015 00:08:30 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1425002584.0343a18ec34a9d9ef03d917afb5d24cd908752b5.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 0343a18ec34a9d9ef03d917afb5d24cd908752b5 X-VCS-Branch: master Date: Sun, 24 May 2015 00:08:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 047344e6-3e40-4d9c-8da4-8df405438e18 X-Archives-Hash: 4dec53cedd9b15466e65fc7ed949aeca commit: 0343a18ec34a9d9ef03d917afb5d24cd908752b5 Author: Guy Martin gentoo org> AuthorDate: Wed Feb 5 10:39:59 2014 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Fri Feb 27 02:03:04 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0343a18e Fix merging kernel without kerncache enabled. 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 | 111 +++++++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 51 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 8e832e1..100c6ef 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 /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,12 +254,13 @@ 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 - if [ -e /etc/portage/profile/package.provided ] + 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" /etc/portage/profile/package.provided fi 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 E7105138CD0 for ; Thu, 21 May 2015 23:53:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55414E090E; Thu, 21 May 2015 23:53:35 +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 404E8E08D9 for ; Thu, 21 May 2015 23:53:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BF73340FF9 for ; Thu, 21 May 2015 23:53:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 763AA9FD for ; Thu, 21 May 2015 23:53:30 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1425002584.0343a18ec34a9d9ef03d917afb5d24cd908752b5.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 0343a18ec34a9d9ef03d917afb5d24cd908752b5 X-VCS-Branch: pending Date: Thu, 21 May 2015 23:53:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bdaf3e07-24e1-47f5-bf0d-a7823dac489b X-Archives-Hash: a32999bc5959641c4628a5be402d6b0d Message-ID: <20150521235330.qxLq4vbTvH3ntVpmxtoj9vdfRN_X_eeBU98xiUR2L68@z> commit: 0343a18ec34a9d9ef03d917afb5d24cd908752b5 Author: Guy Martin gentoo org> AuthorDate: Wed Feb 5 10:39:59 2014 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Fri Feb 27 02:03:04 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0343a18e Fix merging kernel without kerncache enabled. 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 | 111 +++++++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 51 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 8e832e1..100c6ef 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 /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,12 +254,13 @@ 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 - if [ -e /etc/portage/profile/package.provided ] + 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" /etc/portage/profile/package.provided fi