From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/
Date: Tue, 20 Oct 2020 02:50:17 +0000 (UTC) [thread overview]
Message-ID: <1603162208.64e27c1d0169e5c05007b17869cbc2d25c402746.mattst88@gentoo> (raw)
commit: 64e27c1d0169e5c05007b17869cbc2d25c402746
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 17:20:06 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 02:50:08 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=64e27c1d
targets: Remove a bunch of stray newlines
Signed-off-by: Matt Turner <mattst88 <AT> 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
next reply other threads:[~2020-10-20 2:50 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 2:50 Matt Turner [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/ Matt Turner
2021-01-18 19:53 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-29 21:00 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-10-22 18:06 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-29 21:00 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-10-22 18:06 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-29 21:00 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-10-22 18:06 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-29 21:00 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-10-20 8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-29 21:00 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-10-22 18:06 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-28 20:51 Matt Turner
2020-10-28 20:51 Matt Turner
2020-10-22 18:06 Matt Turner
2020-10-22 18:06 Matt Turner
2020-10-22 18:06 Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20 8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20 8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20 8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20 8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20 8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20 8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20 8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-20 23:20 Matt Turner
2020-10-20 23:20 Matt Turner
2020-10-20 23:20 Matt Turner
2020-10-20 23:20 Matt Turner
2020-10-20 19:59 Matt Turner
2020-10-20 19:59 Matt Turner
2020-10-20 19:59 Matt Turner
2020-10-20 8:30 Matt Turner
2020-10-20 8:30 Matt Turner
2020-10-20 8:30 Matt Turner
2020-10-20 8:30 Matt Turner
2020-10-20 8:30 Matt Turner
2020-10-20 8:30 Matt Turner
2020-10-20 8:30 Matt Turner
2020-10-20 8:30 Matt Turner
2020-10-20 8:30 Matt Turner
2020-10-20 4:31 Matt Turner
2020-10-20 4:31 Matt Turner
2020-10-20 4:31 Matt Turner
2020-10-20 4:31 Matt Turner
2020-10-20 4:31 Matt Turner
2020-10-20 4:31 Matt Turner
2020-10-20 4:31 Matt Turner
2020-10-20 4:31 Matt Turner
2020-10-20 4:31 Matt Turner
2020-10-20 4:31 Matt Turner
2020-10-20 4:31 Matt Turner
2020-10-20 4:31 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-10-20 2:50 Matt Turner
2020-05-21 20:25 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-05-20 3:39 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-05-20 3:39 Matt Turner
2020-05-17 3:26 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-05-16 6:54 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-05-16 6:54 Matt Turner
2020-05-03 22:58 Matt Turner
2020-05-03 22:58 Matt Turner
2020-05-03 22:58 Matt Turner
2020-05-03 22:04 Matt Turner
2020-05-03 22:04 Matt Turner
2020-05-03 22:04 Matt Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1603162208.64e27c1d0169e5c05007b17869cbc2d25c402746.mattst88@gentoo \
--to=mattst88@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox