Gentoo Archives: gentoo-commits

From: Joshua Kinard <kumba@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/mips-sources/
Date: Sun, 13 Oct 2019 01:53:33
Message-Id: 1570930720.c4ee012c2522cb7d0bb79024bd7d14f49de5e460.kumba@gentoo
1 commit: c4ee012c2522cb7d0bb79024bd7d14f49de5e460
2 Author: Joshua Kinard <kumba <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 13 01:38:40 2019 +0000
4 Commit: Joshua Kinard <kumba <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 13 01:38:40 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4ee012c
7
8 sys-kernel/mips-sources: Fix issue in src_unpack when no USE flags are set
9
10 Also fix a minor grammar issue in show_ip27_info()
11
12 Signed-off-by: Joshua Kinard <kumba <AT> gentoo.org>
13 Package-Manager: Portage-2.3.76, Repoman-2.3.17
14
15 sys-kernel/mips-sources/mips-sources-4.19.78.ebuild | 16 +++++++---------
16 1 file changed, 7 insertions(+), 9 deletions(-)
17
18 diff --git a/sys-kernel/mips-sources/mips-sources-4.19.78.ebuild b/sys-kernel/mips-sources/mips-sources-4.19.78.ebuild
19 index c2f35b632ff..48845501865 100644
20 --- a/sys-kernel/mips-sources/mips-sources-4.19.78.ebuild
21 +++ b/sys-kernel/mips-sources/mips-sources-4.19.78.ebuild
22 @@ -188,7 +188,7 @@ show_ip22_info() {
23
24 show_ip27_info() {
25 echo -e ""
26 - ewarn "IP27 on the Origin 2k/Onyx2 systems may be prone to sudden hard lockups."
27 + ewarn "IP27 Origin 2k/Onyx2 systems may be prone to sudden hard lockups."
28 ewarn "The exact trigger is unknown at this time."
29 echo -e ""
30 }
31 @@ -318,18 +318,16 @@ src_unpack() {
32 for x in {ip27,ip28,ip30}; do
33 use ${x} && v="${v}.${x}" && break
34 done
35 - mv "${WORKDIR}/linux-${fkv/_/-}" "${WORKDIR}/linux-${v}" || die
36 - S="${WORKDIR}/linux-${v}"
37 + local old="${WORKDIR}/linux-${fkv/_/-}"
38 + local new="${WORKDIR}/linux-${v}"
39 + if [ "${old}" != "${new}" ]; then
40 + mv "${old}" "${new}" || die
41 + fi
42 + S="${new}"
43
44 # Set the EXTRAVERSION to linux-VERSION-mipsgit-GITDATE
45 EXTRAVERSION="${EXTRAVERSION}-gentoo-mips"
46 unpack_set_extraversion
47 -# local old="${WORKDIR}/linux-${fkv/_/-}"
48 -# local new="${WORKDIR}/linux-${v}"
49 -# if [ "${old}" != "${new}" ]; then
50 -# mv "${old}" "${new}" || die
51 -# fi
52 -# S="${new}"
53 }
54
55 src_prepare() {