From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 94F04138359 for ; Wed, 21 Oct 2020 00:24:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB59EE0A91; Wed, 21 Oct 2020 00:24:24 +0000 (UTC) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3B4BE0A91 for ; Wed, 21 Oct 2020 00:24:24 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id bf6so290606plb.4 for ; Tue, 20 Oct 2020 17:24:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jz01+q5gts/Hj5GsOJZCo2n2tnecPwrPMl9ud8P4jG0=; b=n3LuLqDT19GvTEhpuBwt8SoLsk8sbfzI+ATFrdUXnHUr296w2EIiKEz7rYHf9zBGYc XKcP8v7sOKzb1lzw0YiAaIWFiZdL6QfDjMcH3PCC/rVafHJLoSLOCSbK8k17+y+sxaUq 2a7hh2FDX2jy557dYA8I4ywqACWSte2tEU6+iSXoWJXtBkZOf28BRm3ZXB66AAXk+tHj 6HU1xHTbbxQvcnBvl2z+nH7WpSVP8YtsYs0RVZvssF+1JwshJGTzhqGz+d3ALqvO6lI4 zCYIQQXznqSpxBU+DG11spOEt9jm4NoR6bDVSp2oszcax9kQm66HCiDijO3A5Pt/QXXV Ho3g== X-Gm-Message-State: AOAM531xC8/tBnmt5sPOqlyGzYkwfIkbFOtwulLD7OIBNpp+GCPeG3N4 dEK95l2+Xf9TocgOJYK30NbB5yo+tVkI0Q== X-Google-Smtp-Source: ABdhPJxp92IId7dyYyI2C+8o4Rp9I76ibut66VI839MacdhKozvliysm/CiIMMdglW8VipI3CnZkcg== X-Received: by 2002:a17:90a:c68e:: with SMTP id n14mr652530pjt.158.1603239863672; Tue, 20 Oct 2020 17:24:23 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id q2sm175779pfb.106.2020.10.20.17.24.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:23 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 16/37] targets: Remove a bunch of stray newlines Date: Tue, 20 Oct 2020 17:23:23 -0700 Message-Id: <20201021002344.378131-16-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021002344.378131-1-mattst88@gentoo.org> References: <20201021002344.378131-1-mattst88@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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: deb721e8-06a3-450b-a994-c1ff504fbca2 X-Archives-Hash: 800fc79a673b22b064f80f7b7aad078e Signed-off-by: Matt Turner --- 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