Gentoo Archives: gentoo-dev

From: Mike Pagano <mpagano@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH v2] eclass/kernel-2.eclass: Remove use of tr in global scope
Date: Thu, 31 Aug 2017 16:34:04
Message-Id: 20170831163355.GA11483@woodpecker.gentoo.org
1 As per PMS remove calls to external command 'tr' in global scope See bug #629106.
2
3 Signed-off-by: Mike Pagano <mpagano@g.o>
4 ---
5 eclass/kernel-2.eclass | 11 ++++++++---
6 1 file changed, 8 insertions(+), 3 deletions(-)
7
8 diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
9 index 09409ab1f..205ea93d5 100644
10 --- a/eclass/kernel-2.eclass
11 +++ b/eclass/kernel-2.eclass
12 @@ -1410,7 +1410,7 @@ getfilevar() {
13
14 detect_arch() {
15
16 - local ALL_ARCH LOOP_ARCH COMPAT_URI i
17 + local ALL_ARCH LOOP_ARCH LOOP_ARCH_L COMPAT_URI i TC_ARCH_KERNEL
18
19 # COMPAT_URI is the contents of ${ARCH}_URI
20 # ARCH_URI is the URI for all the ${ARCH}_URI patches
21 @@ -1418,20 +1418,25 @@ detect_arch() {
22
23 ARCH_URI=""
24 ARCH_PATCH=""
25 + TC_ARCH_KERNEL=""
26 ALL_ARCH="ALPHA AMD64 ARM HPPA IA64 M68K MIPS PPC PPC64 S390 SH SPARC X86"
27
28 for LOOP_ARCH in ${ALL_ARCH}; do
29 COMPAT_URI="${LOOP_ARCH}_URI"
30 COMPAT_URI="${!COMPAT_URI}"
31
32 + declare -l LOOP_ARCH_L=${LOOP_ARCH}
33 +
34 [[ -n ${COMPAT_URI} ]] && \
35 - ARCH_URI="${ARCH_URI} $(echo ${LOOP_ARCH} | tr '[:upper:]' '[:lower:]')? ( ${COMPAT_URI} )"
36 + ARCH_URI="${ARCH_URI} ${LOOP_ARCH_L}? ( ${COMPAT_URI} )"
37
38 - if [[ ${LOOP_ARCH} == "$(echo $(tc-arch-kernel) | tr '[:lower:]' '[:upper:]')" ]]; then
39 + declare -u TC_ARCH_KERNEL=$(tc-arch-kernel);
40 + if [[ ${LOOP_ARCH} == ${TC_ARCH_KERNEL} ]]; then
41 for i in ${COMPAT_URI}; do
42 ARCH_PATCH="${ARCH_PATCH} ${DISTDIR}/${i/*\//}"
43 done
44 fi
45 +
46 done
47 }
48
49 --
50 2.13.5

Replies