summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorAndrew Shadura <andrew.shadura@collabora.co.uk>2016-05-26 17:13:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-30 15:58:15 +0100
commit8d7f58bac1fe528d2a8d442073398336d4fdbc22 (patch)
treed640569b94b187ba11bda2601e6fb50630e7ff8d /meta/recipes-bsp
parent6b38e77493b36fbbd8be835ba9dd7bb38b91c2f6 (diff)
downloadpoky-8d7f58bac1fe528d2a8d442073398336d4fdbc22.tar.gz
u-boot: replace old-style shell syntax with the modern one
Use "-n" operation instead of comparing with an "x"-ed empty string, use $(...) notation instead of the deprecated backticks. (From OE-Core rev: b8436a9c470f1e27ff7fdd952b2743eaf97cadf8) Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc60
1 files changed, 30 insertions, 30 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 037f35cfc3..1071d1f270 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -79,13 +79,13 @@ do_compile () {
79 echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion 79 echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
80 echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion 80 echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
81 fi 81 fi
82 82
83 if [ "x${UBOOT_CONFIG}" != "x" ] 83 if [ -n "${UBOOT_CONFIG}" ]
84 then 84 then
85 for config in ${UBOOT_MACHINE}; do 85 for config in ${UBOOT_MACHINE}; do
86 i=`expr $i + 1`; 86 i=$(expr $i + 1);
87 for type in ${UBOOT_CONFIG}; do 87 for type in ${UBOOT_CONFIG}; do
88 j=`expr $j + 1`; 88 j=$(expr $j + 1);
89 if [ $j -eq $i ] 89 if [ $j -eq $i ]
90 then 90 then
91 oe_runmake O=${config} ${config} 91 oe_runmake O=${config} ${config}
@@ -104,12 +104,12 @@ do_compile () {
104} 104}
105 105
106do_install () { 106do_install () {
107 if [ "x${UBOOT_CONFIG}" != "x" ] 107 if [ -n "${UBOOT_CONFIG}" ]
108 then 108 then
109 for config in ${UBOOT_MACHINE}; do 109 for config in ${UBOOT_MACHINE}; do
110 i=`expr $i + 1`; 110 i=$(expr $i + 1);
111 for type in ${UBOOT_CONFIG}; do 111 for type in ${UBOOT_CONFIG}; do
112 j=`expr $j + 1`; 112 j=$(expr $j + 1);
113 if [ $j -eq $i ] 113 if [ $j -eq $i ]
114 then 114 then
115 install -d ${D}/boot 115 install -d ${D}/boot
@@ -127,14 +127,14 @@ do_install () {
127 ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} 127 ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
128 fi 128 fi
129 129
130 if [ "x${UBOOT_ELF}" != "x" ] 130 if [ -n "${UBOOT_ELF}" ]
131 then 131 then
132 if [ "x${UBOOT_CONFIG}" != "x" ] 132 if [ -n "${UBOOT_CONFIG}" ]
133 then 133 then
134 for config in ${UBOOT_MACHINE}; do 134 for config in ${UBOOT_MACHINE}; do
135 i=`expr $i + 1`; 135 i=$(expr $i + 1);
136 for type in ${UBOOT_CONFIG}; do 136 for type in ${UBOOT_CONFIG}; do
137 j=`expr $j + 1`; 137 j=$(expr $j + 1);
138 if [ $j -eq $i ] 138 if [ $j -eq $i ]
139 then 139 then
140 install ${S}/${config}/${UBOOT_ELF} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} 140 install ${S}/${config}/${UBOOT_ELF} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX}
@@ -156,14 +156,14 @@ do_install () {
156 install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config 156 install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
157 fi 157 fi
158 158
159 if [ "x${SPL_BINARY}" != "x" ] 159 if [ -n "${SPL_BINARY}" ]
160 then 160 then
161 if [ "x${UBOOT_CONFIG}" != "x" ] 161 if [ -n "${UBOOT_CONFIG}" ]
162 then 162 then
163 for config in ${UBOOT_MACHINE}; do 163 for config in ${UBOOT_MACHINE}; do
164 i=`expr $i + 1`; 164 i=$(expr $i + 1);
165 for type in ${UBOOT_CONFIG}; do 165 for type in ${UBOOT_CONFIG}; do
166 j=`expr $j + 1`; 166 j=$(expr $j + 1);
167 if [ $j -eq $i ] 167 if [ $j -eq $i ]
168 then 168 then
169 install ${S}/${config}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}-${type}-${PV}-${PR} 169 install ${S}/${config}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}-${type}-${PV}-${PR}
@@ -180,7 +180,7 @@ do_install () {
180 fi 180 fi
181 fi 181 fi
182 182
183 if [ "x${UBOOT_ENV}" != "x" ] 183 if [ -n "${UBOOT_ENV}" ]
184 then 184 then
185 install ${WORKDIR}/${UBOOT_ENV_BINARY} ${D}/boot/${UBOOT_ENV_IMAGE} 185 install ${WORKDIR}/${UBOOT_ENV_BINARY} ${D}/boot/${UBOOT_ENV_IMAGE}
186 ln -sf ${UBOOT_ENV_IMAGE} ${D}/boot/${UBOOT_ENV_BINARY} 186 ln -sf ${UBOOT_ENV_IMAGE} ${D}/boot/${UBOOT_ENV_BINARY}
@@ -190,12 +190,12 @@ do_install () {
190FILES_${PN} = "/boot ${sysconfdir}" 190FILES_${PN} = "/boot ${sysconfdir}"
191 191
192do_deploy () { 192do_deploy () {
193 if [ "x${UBOOT_CONFIG}" != "x" ] 193 if [ -n "${UBOOT_CONFIG}" ]
194 then 194 then
195 for config in ${UBOOT_MACHINE}; do 195 for config in ${UBOOT_MACHINE}; do
196 i=`expr $i + 1`; 196 i=$(expr $i + 1);
197 for type in ${UBOOT_CONFIG}; do 197 for type in ${UBOOT_CONFIG}; do
198 j=`expr $j + 1`; 198 j=$(expr $j + 1);
199 if [ $j -eq $i ] 199 if [ $j -eq $i ]
200 then 200 then
201 install -d ${DEPLOYDIR} 201 install -d ${DEPLOYDIR}
@@ -205,8 +205,8 @@ do_deploy () {
205 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} 205 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}
206 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} 206 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type}
207 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY} 207 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}
208 fi 208 fi
209 done 209 done
210 unset j 210 unset j
211 done 211 done
212 unset i 212 unset i
@@ -219,14 +219,14 @@ do_deploy () {
219 ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} 219 ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
220 fi 220 fi
221 221
222 if [ "x${UBOOT_ELF}" != "x" ] 222 if [ -n "${UBOOT_ELF}" ]
223 then 223 then
224 if [ "x${UBOOT_CONFIG}" != "x" ] 224 if [ -n "${UBOOT_CONFIG}" ]
225 then 225 then
226 for config in ${UBOOT_MACHINE}; do 226 for config in ${UBOOT_MACHINE}; do
227 i=`expr $i + 1`; 227 i=$(expr $i + 1);
228 for type in ${UBOOT_CONFIG}; do 228 for type in ${UBOOT_CONFIG}; do
229 j=`expr $j + 1`; 229 j=$(expr $j + 1);
230 if [ $j -eq $i ] 230 if [ $j -eq $i ]
231 then 231 then
232 install ${S}/${config}/${UBOOT_ELF} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} 232 install ${S}/${config}/${UBOOT_ELF} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX}
@@ -247,14 +247,14 @@ do_deploy () {
247 fi 247 fi
248 248
249 249
250 if [ "x${SPL_BINARY}" != "x" ] 250 if [ -n "${SPL_BINARY}" ]
251 then 251 then
252 if [ "x${UBOOT_CONFIG}" != "x" ] 252 if [ -n "${UBOOT_CONFIG}" ]
253 then 253 then
254 for config in ${UBOOT_MACHINE}; do 254 for config in ${UBOOT_MACHINE}; do
255 i=`expr $i + 1`; 255 i=$(expr $i + 1);
256 for type in ${UBOOT_CONFIG}; do 256 for type in ${UBOOT_CONFIG}; do
257 j=`expr $j + 1`; 257 j=$(expr $j + 1);
258 if [ $j -eq $i ] 258 if [ $j -eq $i ]
259 then 259 then
260 install ${S}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR} 260 install ${S}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR}
@@ -277,7 +277,7 @@ do_deploy () {
277 fi 277 fi
278 278
279 279
280 if [ "x${UBOOT_ENV}" != "x" ] 280 if [ -n "${UBOOT_ENV}" ]
281 then 281 then
282 install ${WORKDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_IMAGE} 282 install ${WORKDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_IMAGE}
283 rm -f ${DEPLOYDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK} 283 rm -f ${DEPLOYDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK}