summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2020-04-12 18:42:37 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-24 14:10:07 +0100
commit971ab23fa8ce2e8b5e743e6a7e79de8302dc51dc (patch)
tree42a3bb11e766c85db3b27a401588e72d8fa490ee
parenta44b8d2856a937ca3991cbf566788b0cd541d777 (diff)
downloadpoky-971ab23fa8ce2e8b5e743e6a7e79de8302dc51dc.tar.gz
u-boot.inc: install u-boot-initial-env as ${PN}-initial-env in $D and $DEPLOYDIR
The common u-boot.inc can be used by multiple recipes in the same build for different cores and/or multiple stages of the bootloader. Naming initial-env with ${PN} prefix avoids clashes in deploy and rootfs between those recipes. This fixes 69b3b093079c2ca2744d6c02747c5d1b5d3e7ecf that unconditionally builds, installs and deploys u-boot-initial-env in the common u-boot.inc. (From OE-Core rev: e0f697ea097f2eacc34f405ec22f9eef5c8e134d) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc28
1 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 188e5295cf..80f828df52 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -156,10 +156,10 @@ do_install () {
156 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} 156 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}
157 157
158 # Install the uboot-initial-env 158 # Install the uboot-initial-env
159 install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 159 install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
160 ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type} 160 ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}
161 ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/u-boot-initial-env-${type} 161 ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${PN}-initial-env-${type}
162 ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/u-boot-initial-env 162 ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${PN}-initial-env
163 fi 163 fi
164 done 164 done
165 unset j 165 unset j
@@ -170,9 +170,9 @@ do_install () {
170 ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} 170 ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
171 171
172 # Install the uboot-initial-env 172 # Install the uboot-initial-env
173 install -D -m 644 ${B}/u-boot-initial-env ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${PV}-${PR} 173 install -D -m 644 ${B}/u-boot-initial-env ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
174 ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE} 174 ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}
175 ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/u-boot-initial-env 175 ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${PN}-initial-env
176 fi 176 fi
177 177
178 if [ -n "${UBOOT_ELF}" ] 178 if [ -n "${UBOOT_ELF}" ]
@@ -245,7 +245,7 @@ PACKAGE_BEFORE_PN += "${PN}-env"
245 245
246RPROVIDES_${PN}-env += "u-boot-default-env" 246RPROVIDES_${PN}-env += "u-boot-default-env"
247FILES_${PN}-env = " \ 247FILES_${PN}-env = " \
248 ${sysconfdir}/u-boot-initial-env* \ 248 ${sysconfdir}/${PN}-initial-env* \
249 ${sysconfdir}/fw_env.config \ 249 ${sysconfdir}/fw_env.config \
250" 250"
251 251
@@ -269,10 +269,10 @@ do_deploy () {
269 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY} 269 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}
270 270
271 # Deploy the uboot-initial-env 271 # Deploy the uboot-initial-env
272 install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 272 install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
273 cd ${DEPLOYDIR} 273 cd ${DEPLOYDIR}
274 ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} u-boot-initial-env-${MACHINE}-${type} 274 ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${PN}-initial-env-${MACHINE}-${type}
275 ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} u-boot-initial-env-${type} 275 ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${PN}-initial-env-${type}
276 fi 276 fi
277 done 277 done
278 unset j 278 unset j
@@ -287,10 +287,10 @@ do_deploy () {
287 ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} 287 ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
288 288
289 # Deploy the uboot-initial-env 289 # Deploy the uboot-initial-env
290 install -D -m 644 ${B}/u-boot-initial-env ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} 290 install -D -m 644 ${B}/u-boot-initial-env ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
291 cd ${DEPLOYDIR} 291 cd ${DEPLOYDIR}
292 ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} u-boot-initial-env-${MACHINE} 292 ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} ${PN}-initial-env-${MACHINE}
293 ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} u-boot-initial-env 293 ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} ${PN}-initial-env
294 fi 294 fi
295 295
296 if [ -e ${WORKDIR}/fw_env.config ] ; then 296 if [ -e ${WORKDIR}/fw_env.config ] ; then