From: Denys Dmytriyenko <de...@ti.com>
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.
Signed-off-by: Denys Dmytriyenko <de...@ti.com>
---
This is also late in the cycle, but it fixes the change mentioned above
that was merged last minute and broke existing use cases. This change is
meant to be least invasive and transparent.
meta/recipes-bsp/u-boot/u-boot.inc | 28 ++++++++++++++--------------
1 file 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 188e529..80f828d 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 () {
ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
${D}/boot/${UBOOT_BINARY}
# Install the uboot-initial-env
- install -D -m 644
${B}/${config}/u-boot-initial-env-${type}
${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
- ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}
- ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
${D}/${sysconfdir}/u-boot-initial-env-${type}
- ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
${D}/${sysconfdir}/u-boot-initial-env
+ install -D -m 644
${B}/${config}/u-boot-initial-env-${type}
${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
+ ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}
+ ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
${D}/${sysconfdir}/${PN}-initial-env-${type}
+ ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
${D}/${sysconfdir}/${PN}-initial-env
fi
done
unset j
@@ -170,9 +170,9 @@ do_install () {
ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
# Install the uboot-initial-env
- install -D -m 644 ${B}/u-boot-initial-env
${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${PV}-${PR}
- ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR}
${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}
- ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR}
${D}/${sysconfdir}/u-boot-initial-env
+ install -D -m 644 ${B}/u-boot-initial-env
${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
+ ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}
${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}
+ ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}
${D}/${sysconfdir}/${PN}-initial-env
fi
if [ -n "${UBOOT_ELF}" ]
@@ -245,7 +245,7 @@ PACKAGE_BEFORE_PN += "${PN}-env"
RPROVIDES_${PN}-env += "u-boot-default-env"
FILES_${PN}-env = " \
- ${sysconfdir}/u-boot-initial-env* \
+ ${sysconfdir}/${PN}-initial-env* \
${sysconfdir}/fw_env.config \
"
@@ -269,10 +269,10 @@ do_deploy () {
ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
${UBOOT_BINARY}
# Deploy the uboot-initial-env
- install -D -m 644
${B}/${config}/u-boot-initial-env-${type}
${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
+ install -D -m 644
${B}/${config}/u-boot-initial-env-${type}
${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
cd ${DEPLOYDIR}
- ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
u-boot-initial-env-${MACHINE}-${type}
- ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
u-boot-initial-env-${type}
+ ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
${PN}-initial-env-${MACHINE}-${type}
+ ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
${PN}-initial-env-${type}
fi
done
unset j
@@ -287,10 +287,10 @@ do_deploy () {
ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
# Deploy the uboot-initial-env
- install -D -m 644 ${B}/u-boot-initial-env
${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR}
+ install -D -m 644 ${B}/u-boot-initial-env
${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
cd ${DEPLOYDIR}
- ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR}
u-boot-initial-env-${MACHINE}
- ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} u-boot-initial-env
+ ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}
${PN}-initial-env-${MACHINE}
+ ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} ${PN}-initial-env
fi
if [ -e ${WORKDIR}/fw_env.config ] ; then
--
2.7.4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#137191):
https://lists.openembedded.org/g/openembedded-core/message/137191
Mute This Topic: https://lists.openembedded.org/mt/72975859/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
