Signed-off-by: Matt Turner <matts...@gentoo.org> --- targets/support/kmerge.sh | 7 ------- 1 file changed, 7 deletions(-)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index aec4d71e..d512954b 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -128,7 +128,6 @@ fi if [ -n "${clst_KERNCACHE}" ] then - USE_MATCH=0 if [ -e /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.USE ] then @@ -201,7 +200,6 @@ then SOURCESDIR="/tmp/kerncache/${kname}/sources" if [ -L /usr/src/linux ] then - # A kernel was merged, move it to $SOURCESDIR [ -e ${SOURCESDIR} ] && rm -Rf ${SOURCESDIR} @@ -210,7 +208,6 @@ then echo "Moving kernel sources to ${SOURCESDIR} ..." mv `readlink -f /usr/src/linux` ${SOURCESDIR} - fi ln -sf ${SOURCESDIR} /usr/src/linux @@ -227,7 +224,6 @@ then touch /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.EXTRAVERSION fi fi - else run_merge "${ksource}" #ensure that there is a /usr/src/linux symlink and it points to the sources we just installed @@ -242,14 +238,12 @@ $(portageq contents / $(portageq best_visible / "${ksource}" 2>/dev/null) 2>/dev fi fi - # Update USE flag in make.conf [ -e ${clst_make_conf} ] && \ echo "USE=\"\${USE} ${kernel_use} build\"" >> ${clst_make_conf} make_destpath - genkernel_compile sed -i "/USE=\"\${USE} ${kernel_use} \"/d" ${clst_make_conf} @@ -262,7 +256,6 @@ clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV} unset USE - if [ -n "${clst_KERNCACHE}" ] then echo ${kernel_use} > /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.USE -- 2.26.2