| 1 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 2 |
--- |
| 3 |
targets/support/kmerge.sh | 7 ------- |
| 4 |
1 file changed, 7 deletions(-) |
| 5 |
|
| 6 |
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
| 7 |
index aec4d71e..d512954b 100755 |
| 8 |
--- a/targets/support/kmerge.sh |
| 9 |
+++ b/targets/support/kmerge.sh |
| 10 |
@@ -128,7 +128,6 @@ fi |
| 11 |
|
| 12 |
if [ -n "${clst_KERNCACHE}" ] |
| 13 |
then |
| 14 |
- |
| 15 |
USE_MATCH=0 |
| 16 |
if [ -e /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.USE ] |
| 17 |
then |
| 18 |
@@ -201,7 +200,6 @@ then |
| 19 |
SOURCESDIR="/tmp/kerncache/${kname}/sources" |
| 20 |
if [ -L /usr/src/linux ] |
| 21 |
then |
| 22 |
- |
| 23 |
# A kernel was merged, move it to $SOURCESDIR |
| 24 |
[ -e ${SOURCESDIR} ] && rm -Rf ${SOURCESDIR} |
| 25 |
|
| 26 |
@@ -210,7 +208,6 @@ then |
| 27 |
|
| 28 |
echo "Moving kernel sources to ${SOURCESDIR} ..." |
| 29 |
mv `readlink -f /usr/src/linux` ${SOURCESDIR} |
| 30 |
- |
| 31 |
fi |
| 32 |
ln -sf ${SOURCESDIR} /usr/src/linux |
| 33 |
|
| 34 |
@@ -227,7 +224,6 @@ then |
| 35 |
touch /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.EXTRAVERSION |
| 36 |
fi |
| 37 |
fi |
| 38 |
- |
| 39 |
else |
| 40 |
run_merge "${ksource}" |
| 41 |
#ensure that there is a /usr/src/linux symlink and it points to the sources we just installed |
| 42 |
@@ -242,14 +238,12 @@ $(portageq contents / $(portageq best_visible / "${ksource}" 2>/dev/null) 2>/dev |
| 43 |
fi |
| 44 |
fi |
| 45 |
|
| 46 |
- |
| 47 |
# Update USE flag in make.conf |
| 48 |
[ -e ${clst_make_conf} ] && \ |
| 49 |
echo "USE=\"\${USE} ${kernel_use} build\"" >> ${clst_make_conf} |
| 50 |
|
| 51 |
make_destpath |
| 52 |
|
| 53 |
- |
| 54 |
genkernel_compile |
| 55 |
|
| 56 |
sed -i "/USE=\"\${USE} ${kernel_use} \"/d" ${clst_make_conf} |
| 57 |
@@ -262,7 +256,6 @@ clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV} |
| 58 |
|
| 59 |
unset USE |
| 60 |
|
| 61 |
- |
| 62 |
if [ -n "${clst_KERNCACHE}" ] |
| 63 |
then |
| 64 |
echo ${kernel_use} > /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.USE |
| 65 |
-- |
| 66 |
2.26.2 |
Archives