u-boot: change ${PN} to u-boot when install/deploy u-boot-init-env
PATCH 1/1 u-boot: change ${PN} to u-boot when install/deploy u-boot-init-env
From: Ming Liu <[email protected]>
It's really inconvenient to have ${PN} as part of the name of u-boot-init-env, for instance, in BSP layers, it could be u-boot-fslc, u-boot-qoriq, u-boot-toradex, and so on.
Considerring there is only one virtual/bootloader for a build, we could replace ${PN} with u-boot to not have to distinguish different names when accessing it.
--- meta/recipes-bsp/u-boot/u-boot.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
meta/recipes-bsp/u-boot/u-boot.inc +14 -14
@@ -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}/${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 + 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 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}/${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 + 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 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}/${PN}-initial-env* \ + ${sysconfdir}/u-boot-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}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} + install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} cd ${DEPLOYDIR} - 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} + 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} 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}/${PN}-initial-env-${MACHINE}-${PV}-${PR} + install -D -m 644 ${B}/u-boot-initial-env ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} cd ${DEPLOYDIR} - ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} ${PN}-initial-env-${MACHINE} - ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} ${PN}-initial-env + 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 fi if [ -e ${WORKDIR}/fw_env.config ] ; then
Signature · 1 line
2.26.2
I know of a project which requires building multiple u-boot-versions within a single run (secure and not-secure) so this hardcoding esp. of the DEPLOY fragments doesn't work there and may lead to completely nondeterministic outputs in the DEPLOY dir. If you could extract the currently hardcoded file name to a var, which then could be overridden for the specific context, the patch could really be helpful
Quoted 88 lines · Ming Liu
From: Ming Liu <[email protected]>
It's really inconvenient to have ${PN} as part of the name of u-boot-init-env, for instance, in BSP layers, it could be u-boot-fslc, u-boot-qoriq, u-boot-toradex, and so on.
Considerring there is only one virtual/bootloader for a build, we could replace ${PN} with u-boot to not have to distinguish different names when accessing it.
Signed-off-by Ming Liu <[email protected]>--- meta/recipes-bsp/u-boot/u-boot.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)meta/recipes-bsp/u-boot/u-boot.inc +14
-14@@ -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}/${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 + 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 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}/${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 + 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 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}/${PN}-initial-env* \ + ${sysconfdir}/u-boot-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}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} + install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} cd ${DEPLOYDIR} - 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} + 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} 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}/${PN}-initial-env-${MACHINE}-${PV}-${PR} + install -D -m 644 ${B}/u-boot-initial-env ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} cd ${DEPLOYDIR} - ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} ${PN}-initial-env-${MACHINE} - ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} ${PN}-initial-env + 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 fi if [ -e ${WORKDIR}/fw_env.config ] ; then
Yes, that is a very good suggestion, will do that in V2.
//Ming Liu
I know of a project which requires building multiple u-boot-versions
Quoted 138 lines
within a single run (secure and not-secure) so this hardcoding esp. of the DEPLOY fragments doesn't work there and may lead to completely nondeterministic outputs in the DEPLOY dir.
If you could extract the currently hardcoded file name to a var, which then could be overridden for the specific context, the patch could really be helpfulQuoted 10 lines · Ming Liu
From: Ming Liu <[email protected]>
It's really inconvenient to have ${PN} as part of the name of u-boot-init-env, for instance, in BSP layers, it could be u-boot-fslc, u-boot-qoriq, u-boot-toradex, and so on.
Considerring there is only one virtual/bootloader for a build, we could replace ${PN} with u-boot to not have to distinguish different names when accessing it.
Review
Quoted 6 lines
Signed-off-by Ming Liu <[email protected]>--- meta/recipes-bsp/u-boot/u-boot.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)(quoted diff) +0
-0b/meta/recipes-bsp/u-boot/u-boot.inc
meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 156
Quoted 5 lines
index
80f828df52..188e5295cf100644meta/recipes-bsp/u-boot/u-boot.inc +0
-0@@ -156,10 +156,10 @@ do_install () { ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}${D}/boot/${UBOOT_BINARY}
meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 158
Quoted 3 lines
meta/recipes-bsp/u-boot/u-boot.inc +0
-1# Install the uboot-initial-env - install -D -m 644${B}/${config}/u-boot-initial-env-${type} ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 159
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0
-1- ln -sf${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}
meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 160
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0
-1- ln -sf${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
${D}/${sysconfdir}/${PN}-initial-env-${type}meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 161
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0
-1- ln -sf${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
${D}/${sysconfdir}/${PN}-initial-envmeta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 158
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1
-0+ install -D -m 644${B}/${config}/u-boot-initial-env-${type} ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 159
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1
-0+ ln -sfu-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}
meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 160
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1
-0+ ln -sfu-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
${D}/${sysconfdir}/u-boot-initial-env-${type}meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 161
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1
-0+ ln -sfu-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
${D}/${sysconfdir}/u-boot-initial-envmeta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 173
Quoted 8 lines
meta/recipes-bsp/u-boot/u-boot.inc +0
-1fi 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}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 174
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0
-1- ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}
meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 175
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0
-1- ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}${D}/${sysconfdir}/${PN}-initial-env
meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 173
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1
-0+ install -D -m 644 ${B}/u-boot-initial-env${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${PV}-${PR}
meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 174
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1
-0+ ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR}${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}
meta/recipes-bsp/u-boot/u-boot.inc do_install () { · line 175
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1
-0+ ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR}${D}/${sysconfdir}/u-boot-initial-env
Quoted 13 lines
meta/recipes-bsp/u-boot/u-boot.inc +1
-1fi if [ -n "${UBOOT_ELF}" ]@@ -245,7 +245,7 @@ PACKAGE_BEFORE_PN += "${PN}-env" RPROVIDES_${PN}-env += "u-boot-default-env" FILES_${PN}-env = " \ - ${sysconfdir}/${PN}-initial-env* \ + ${sysconfdir}/u-boot-initial-env* \ ${sysconfdir}/fw_env.config \ "meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 269
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0
-0@@ -269,10 +269,10 @@ do_deploy () { ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}${UBOOT_BINARY}
meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 271
Quoted 3 lines
meta/recipes-bsp/u-boot/u-boot.inc +0
-1# Deploy the uboot-initial-env - install -D -m 644${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 271
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1
-0+ install -D -m 644${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 273
Quoted 2 lines
meta/recipes-bsp/u-boot/u-boot.inc +0
-1cd ${DEPLOYDIR} - ln -sf${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
${PN}-initial-env-${MACHINE}-${type}meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 274
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0
-1- ln -sf${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${PN}-initial-env-${type}
meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 273
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1
-0+ ln -sfu-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
u-boot-initial-env-${MACHINE}-${type}meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 274
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1
-0+ ln -sfu-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} u-boot-initial-env-${type}
meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 290
Quoted 8 lines
meta/recipes-bsp/u-boot/u-boot.inc +0
-1fi 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}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 290
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1
-0+ install -D -m 644 ${B}/u-boot-initial-env${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR}
meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 292
Quoted 2 lines
meta/recipes-bsp/u-boot/u-boot.inc +0
-1cd ${DEPLOYDIR} - ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}${PN}-initial-env-${MACHINE}
meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 293
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +0
-1- ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}${PN}-initial-env
meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 292
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1
-0+ ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR}u-boot-initial-env-${MACHINE}
meta/recipes-bsp/u-boot/u-boot.inc do_deploy () { · line 293
Quoted 1 line
meta/recipes-bsp/u-boot/u-boot.inc +1
-0+ ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR}u-boot-initial-env
Quoted 7 lines
meta/recipes-bsp/u-boot/u-boot.inc +0
-0fi if [ -e ${WORKDIR}/fw_env.config ] ; then
Quoted 9 lines · Ming Liu
From: Ming Liu <[email protected]>
It's really inconvenient to have ${PN} as part of the name of u-boot-init-env, for instance, in BSP layers, it could be u-boot-fslc, u-boot-qoriq, u-boot-toradex, and so on.
Considerring there is only one virtual/bootloader for a build, we could replace ${PN} with u-boot to not have to distinguish different names when accessing it.
Have you tried git log?
Have you heard of multi-stage bootloaders and chain-loading? Assumption that there's a single u-boot per platform built is long since outdated - please don't break other's use cases for a tiny bit of convenience.
A better approach here would be:
1. make it completely optional to build/install/deploy this u-boot-initial-env
2. make it fully configurable with vars like UBOOT_BINARY, SPL_BINARY, UBOOT_ELF. UBOOT_ENV, etc.
Signature · 1 line
Denys
Quoted 79 lines
Signed-off-by Ming Liu <[email protected]>--- meta/recipes-bsp/u-boot/u-boot.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)meta/recipes-bsp/u-boot/u-boot.inc +14
-14@@ -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}/${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 + 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 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}/${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 + 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 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}/${PN}-initial-env* \ + ${sysconfdir}/u-boot-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}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} + install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} cd ${DEPLOYDIR} - 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} + 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} 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}/${PN}-initial-env-${MACHINE}-${PV}-${PR} + install -D -m 644 ${B}/u-boot-initial-env ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} cd ${DEPLOYDIR} - ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} ${PN}-initial-env-${MACHINE} - ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} ${PN}-initial-env + 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 fi if [ -e ${WORKDIR}/fw_env.config ] ; thenSignature · 1 line
2.26.2