[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core][dunfell v2 01/14] u-boot.inc: install u-boot-initial-env as ${PN}-initial-env in $D and $D
From:       "Steve Sakoman" <steve () sakoman ! com>
Date:       2020-04-30 22:30:06
Message-ID: 78c55eac69dc4b6ae28d7e7911adb59430376b23.1588285073.git.steve () sakoman ! com
[Download RAW message or body]

From: Denys Dmytriyenko <denys@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 <denys@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 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 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 () {
                     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.17.1



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#137691): \
https://lists.openembedded.org/g/openembedded-core/message/137691 Mute This Topic: \
https://lists.openembedded.org/mt/73386667/4454766 Group Owner: \
                openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/leave/8023720/1801066118/xyzzy \
                [openembedded-core@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-



[prev in list] [next in list] [prev in thread] [next in thread]