summaryrefslogtreecommitdiffstats
path: root/opal-ci
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.ibm.com>2018-09-10 14:20:03 +1000
committerStewart Smith <stewart@linux.vnet.ibm.com>2018-09-13 15:19:36 +1000
commit084e37bab1cf6fb334af3f2c8a77f0f260eb91fe (patch)
tree3d2a955eec28f6f31b25a9528497f84fb5641e81 /opal-ci
parent9ff660e218345ac21f266d0a8dc8514f5d651e64 (diff)
downloadtalos-skiboot-084e37bab1cf6fb334af3f2c8a77f0f260eb91fe.tar.gz
talos-skiboot-084e37bab1cf6fb334af3f2c8a77f0f260eb91fe.zip
Use $() rather than backticks in all shell
The cool kids are all using $() these days as backticks are all backwards and uncool. Practically speaking, it makes it easier to escape things, nest things, and all the other reasons listed on http://mywiki.wooledge.org/BashFAQ/082 Signed-off-by: Stewart Smith <stewart@linux.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'opal-ci')
-rwxr-xr-xopal-ci/build-centos7.sh8
-rwxr-xr-xopal-ci/build-fedora27.sh4
-rwxr-xr-xopal-ci/build-qemu-powernv.sh2
-rwxr-xr-xopal-ci/build-ubuntu-16.04.sh6
-rwxr-xr-xopal-ci/build-ubuntu-18.04.sh4
5 files changed, 12 insertions, 12 deletions
diff --git a/opal-ci/build-centos7.sh b/opal-ci/build-centos7.sh
index b1234b37..44733345 100755
--- a/opal-ci/build-centos7.sh
+++ b/opal-ci/build-centos7.sh
@@ -7,15 +7,15 @@ set -vx
# We're limited as to what we want to bother to run on CentOS7
# It's fairly old and some of the things (e.g. build+run qemu) we don't
# want to bother doing.
-if [ `arch` == "x86_64" ]; then
+if [ $(arch) == "x86_64" ]; then
export CROSS=/opt/cross/gcc-4.8.0-nolibc/powerpc64-linux/bin/powerpc64-linux-
fi
# Note that this doesn't work on centos7 because "/lib64/ld64.so.2: version `GLIBC_2.22' not found"
-if [ `arch` == "ppc64le" ]; then
+if [ $(arch) == "ppc64le" ]; then
export CROSS=/opt/cross/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-
fi
-MAKE_J=`grep -c processor /proc/cpuinfo`
+MAKE_J=$(grep -c processor /proc/cpuinfo)
make -j${MAKE_J} all
make -j${MAKE_J} check
@@ -28,5 +28,5 @@ SKIBOOT_GCOV=1 make -j${MAKE_J} check
make clean
rm -rf builddir
mkdir builddir
-make SRC=`pwd` -f ../Makefile -C builddir -j${MAKE_J}
+make SRC=$(pwd) -f ../Makefile -C builddir -j${MAKE_J}
make clean
diff --git a/opal-ci/build-fedora27.sh b/opal-ci/build-fedora27.sh
index be082592..02ac4280 100755
--- a/opal-ci/build-fedora27.sh
+++ b/opal-ci/build-fedora27.sh
@@ -4,7 +4,7 @@ set -uo pipefail
set -e
set -vx
-MAKE_J=`grep -c processor /proc/cpuinfo`
+MAKE_J=$(grep -c processor /proc/cpuinfo)
export CROSS="ccache powerpc64-linux-gnu-"
make -j${MAKE_J} all
@@ -21,5 +21,5 @@ make clean
make clean
rm -rf builddir
mkdir builddir
-make SRC=`pwd` -f ../Makefile -C builddir -j${MAKE_J}
+make SRC=$(pwd) -f ../Makefile -C builddir -j${MAKE_J}
make clean
diff --git a/opal-ci/build-qemu-powernv.sh b/opal-ci/build-qemu-powernv.sh
index 58a89778..5c61aa72 100755
--- a/opal-ci/build-qemu-powernv.sh
+++ b/opal-ci/build-qemu-powernv.sh
@@ -8,4 +8,4 @@ git submodule update --init dtc
export CC="ccache gcc"
export CXX="ccache g++"
./configure --target-list=ppc64-softmmu --disable-werror
-make -j `grep -c processor /proc/cpuinfo`
+make -j $(grep -c processor /proc/cpuinfo)
diff --git a/opal-ci/build-ubuntu-16.04.sh b/opal-ci/build-ubuntu-16.04.sh
index 053e7e2a..06a9b484 100755
--- a/opal-ci/build-ubuntu-16.04.sh
+++ b/opal-ci/build-ubuntu-16.04.sh
@@ -4,13 +4,13 @@ set -uo pipefail
set -e
set -vx
-MAKE_J=`grep -c processor /proc/cpuinfo`
+MAKE_J=$(grep -c processor /proc/cpuinfo)
export CROSS="ccache powerpc64le-linux-gnu-"
make -j${MAKE_J} all
(cd opal-ci; ./build-qemu-powernv.sh)
-export QEMU_BIN=`pwd`/opal-ci/qemu/ppc64-softmmu/qemu-system-ppc64
+export QEMU_BIN=$(pwd)/opal-ci/qemu/ppc64-softmmu/qemu-system-ppc64
./opal-ci/fetch-debian-jessie-installer.sh
make -j${MAKE_J} check
(make clean; cd external/gard && CROSS= make -j${MAKE_J})
@@ -30,5 +30,5 @@ SKIBOOT_GCOV=1 make -j${MAKE_J} check
make clean
rm -rf builddir
mkdir builddir
-make SRC=`pwd` -f ../Makefile -C builddir -j${MAKE_J}
+make SRC=$(pwd) -f ../Makefile -C builddir -j${MAKE_J}
make clean
diff --git a/opal-ci/build-ubuntu-18.04.sh b/opal-ci/build-ubuntu-18.04.sh
index 7bcd2d50..2786600f 100755
--- a/opal-ci/build-ubuntu-18.04.sh
+++ b/opal-ci/build-ubuntu-18.04.sh
@@ -4,7 +4,7 @@ set -uo pipefail
set -e
set -vx
-MAKE_J=`grep -c processor /proc/cpuinfo`
+MAKE_J=$(grep -c processor /proc/cpuinfo)
export CROSS="ccache powerpc64le-linux-gnu-"
@@ -28,7 +28,7 @@ SKIBOOT_GCOV=1 make -j${MAKE_J} check
make clean
rm -rf builddir
mkdir builddir
-make SRC=`pwd` -f ../Makefile -C builddir -j${MAKE_J}
+make SRC=$(pwd) -f ../Makefile -C builddir -j${MAKE_J}
make clean
echo "Building with clang..."
OpenPOWER on IntegriCloud