diff options
| author | Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> | 2021-09-01 12:29:51 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-02 12:12:07 +0100 |
| commit | a65d092ee378b772f2ea65859b65ee1deee8d364 (patch) | |
| tree | 02f1af1c8e6526eb6be1ed268620930339ecda6d /meta/recipes-bsp | |
| parent | 79147c27fd2f4c7c00e2cfe7cab7da691c07b5a5 (diff) | |
| download | poky-a65d092ee378b772f2ea65859b65ee1deee8d364.tar.gz | |
u-boot: Remove redundancy from installed and deployed SPL artifact names
Remove redundant parts from the deployed and installed SPL artifact
names of multi config configurations to match the other U-Boot artifact
names.
(From OE-Core rev: 74f1f84d09ec5b435942e2a83697834677055343)
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.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.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 971fdbb102..71febb6f43 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc | |||
| @@ -184,9 +184,9 @@ do_install () { | |||
| 184 | j=$(expr $j + 1); | 184 | j=$(expr $j + 1); |
| 185 | if [ $j -eq $i ] | 185 | if [ $j -eq $i ] |
| 186 | then | 186 | then |
| 187 | install -m 644 ${B}/${config}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}-${type}-${PV}-${PR} | 187 | install -m 644 ${B}/${config}/${SPL_BINARY} ${D}/boot/${SPL_BINARYNAME}-${type}-${PV}-${PR} |
| 188 | ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME}-${type} | 188 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME}-${type} |
| 189 | ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME} | 189 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME} |
| 190 | fi | 190 | fi |
| 191 | done | 191 | done |
| 192 | unset j | 192 | unset j |
| @@ -315,12 +315,12 @@ do_deploy () { | |||
| 315 | j=$(expr $j + 1); | 315 | j=$(expr $j + 1); |
| 316 | if [ $j -eq $i ] | 316 | if [ $j -eq $i ] |
| 317 | then | 317 | then |
| 318 | install -m 644 ${B}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR} | 318 | install -m 644 ${B}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_BINARYNAME}-${type}-${PV}-${PR} |
| 319 | rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} | 319 | rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} |
| 320 | ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARYNAME}-${type} | 320 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARYNAME}-${type} |
| 321 | ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARYNAME} | 321 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARYNAME} |
| 322 | ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} | 322 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} |
| 323 | ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK} | 323 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK} |
| 324 | fi | 324 | fi |
| 325 | done | 325 | done |
| 326 | unset j | 326 | unset j |