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 E2D5D138334 for ; Sun, 13 Oct 2019 01:53:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 248FBE0880; Sun, 13 Oct 2019 01:53:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 0B807E0880 for ; Sun, 13 Oct 2019 01:53:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57D7534BCAB for ; Sun, 13 Oct 2019 01:53:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8A6671A for ; Sun, 13 Oct 2019 01:53:27 +0000 (UTC) From: "Joshua Kinard" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joshua Kinard" Message-ID: <1570930720.c4ee012c2522cb7d0bb79024bd7d14f49de5e460.kumba@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/mips-sources/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/mips-sources/mips-sources-4.19.78.ebuild X-VCS-Directories: sys-kernel/mips-sources/ X-VCS-Committer: kumba X-VCS-Committer-Name: Joshua Kinard X-VCS-Revision: c4ee012c2522cb7d0bb79024bd7d14f49de5e460 X-VCS-Branch: master Date: Sun, 13 Oct 2019 01:53:27 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d36a3eb8-0bfd-4215-a182-13e45a30c812 X-Archives-Hash: 9b634897df9cd1eaaacdb1eabf88c121 commit: c4ee012c2522cb7d0bb79024bd7d14f49de5e460 Author: Joshua Kinard gentoo org> AuthorDate: Sun Oct 13 01:38:40 2019 +0000 Commit: Joshua Kinard gentoo org> CommitDate: Sun Oct 13 01:38:40 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4ee012c sys-kernel/mips-sources: Fix issue in src_unpack when no USE flags are set Also fix a minor grammar issue in show_ip27_info() Signed-off-by: Joshua Kinard gentoo.org> Package-Manager: Portage-2.3.76, Repoman-2.3.17 sys-kernel/mips-sources/mips-sources-4.19.78.ebuild | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sys-kernel/mips-sources/mips-sources-4.19.78.ebuild b/sys-kernel/mips-sources/mips-sources-4.19.78.ebuild index c2f35b632ff..48845501865 100644 --- a/sys-kernel/mips-sources/mips-sources-4.19.78.ebuild +++ b/sys-kernel/mips-sources/mips-sources-4.19.78.ebuild @@ -188,7 +188,7 @@ show_ip22_info() { show_ip27_info() { echo -e "" - ewarn "IP27 on the Origin 2k/Onyx2 systems may be prone to sudden hard lockups." + ewarn "IP27 Origin 2k/Onyx2 systems may be prone to sudden hard lockups." ewarn "The exact trigger is unknown at this time." echo -e "" } @@ -318,18 +318,16 @@ src_unpack() { for x in {ip27,ip28,ip30}; do use ${x} && v="${v}.${x}" && break done - mv "${WORKDIR}/linux-${fkv/_/-}" "${WORKDIR}/linux-${v}" || die - S="${WORKDIR}/linux-${v}" + local old="${WORKDIR}/linux-${fkv/_/-}" + local new="${WORKDIR}/linux-${v}" + if [ "${old}" != "${new}" ]; then + mv "${old}" "${new}" || die + fi + S="${new}" # Set the EXTRAVERSION to linux-VERSION-mipsgit-GITDATE EXTRAVERSION="${EXTRAVERSION}-gentoo-mips" unpack_set_extraversion -# local old="${WORKDIR}/linux-${fkv/_/-}" -# local new="${WORKDIR}/linux-${v}" -# if [ "${old}" != "${new}" ]; then -# mv "${old}" "${new}" || die -# fi -# S="${new}" } src_prepare() {