| Message ID | 20230207234239.30720-4-afd@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master/kirkstone,1/8] ti-rtos-firmware: Use ti-k3-secdev if TI_SECURE_DEV_PKG_K3 not defined | expand |
On Tue, Feb 07, 2023 at 05:42:35PM -0600, Andrew Davis via lists.yoctoproject.org wrote: > If we rename files in the source directory the next time we need to rebuild > the original files will be gone and build will fail. Use symlinks instead. Just a question - will the install/deploy steps later dereference that symlink and install the file content or just a now broken symlink? Would a hardlink be better here and avoid uncertainty/confusion? > Signed-off-by: Andrew Davis <afd@ti.com> > --- > .../recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb > index c09f67b5..3c372b32 100644 > --- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb > +++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb > @@ -125,18 +125,18 @@ do_install:prepend:j721s2-hs-evm() { > # Update the am64xx ipc binaries to be consistent with other platforms > do_install:prepend:am64xx() { > ( cd ${RTOS_IPC_FW_DIR}; \ > - mv am64-main-r5f0_0-fw ipc_echo_test_mcu1_0_release_strip.xer5f; \ > - mv am64-main-r5f0_1-fw ipc_echo_test_mcu1_1_release_strip.xer5f; \ > - mv am64-main-r5f1_0-fw ipc_echo_test_mcu2_0_release_strip.xer5f; \ > - mv am64-main-r5f1_1-fw ipc_echo_test_mcu2_1_release_strip.xer5f; \ > - mv am64-mcu-m4f0_0-fw ipc_echo_test_mcu3_0_release_strip.xer5f; \ > + ln -s am64-main-r5f0_0-fw ipc_echo_test_mcu1_0_release_strip.xer5f; \ > + ln -s am64-main-r5f0_1-fw ipc_echo_test_mcu1_1_release_strip.xer5f; \ > + ln -s am64-main-r5f1_0-fw ipc_echo_test_mcu2_0_release_strip.xer5f; \ > + ln -s am64-main-r5f1_1-fw ipc_echo_test_mcu2_1_release_strip.xer5f; \ > + ln -s am64-mcu-m4f0_0-fw ipc_echo_test_mcu3_0_release_strip.xer5f; \ > ) > } > > # Update the am62xx ipc binaries to be consistent with other platforms > do_install:prepend:am62xx() { > ( cd ${RTOS_IPC_FW_DIR}; \ > - mv am62-mcu-m4f0_0-fw ipc_echo_test_mcu2_0_release_strip.xer5f; \ > + ln -s am62-mcu-m4f0_0-fw ipc_echo_test_mcu2_0_release_strip.xer5f; \ > ) > } > > -- > 2.39.1 >
On 2/10/23 3:07 PM, Denys Dmytriyenko wrote: > On Tue, Feb 07, 2023 at 05:42:35PM -0600, Andrew Davis via lists.yoctoproject.org wrote: >> If we rename files in the source directory the next time we need to rebuild >> the original files will be gone and build will fail. Use symlinks instead. > > Just a question - will the install/deploy steps later dereference that symlink > and install the file content or just a now broken symlink? Would a hardlink be > better here and avoid uncertainty/confusion? > I was thinking that also, in my testing the install dereferences the symlink correctly, but a hardlink would work just the same. Real fix is to just go into the firmware repo and fix these mixed names.. Andrew > >> Signed-off-by: Andrew Davis <afd@ti.com> >> --- >> .../recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 12 ++++++------ >> 1 file changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb >> index c09f67b5..3c372b32 100644 >> --- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb >> +++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb >> @@ -125,18 +125,18 @@ do_install:prepend:j721s2-hs-evm() { >> # Update the am64xx ipc binaries to be consistent with other platforms >> do_install:prepend:am64xx() { >> ( cd ${RTOS_IPC_FW_DIR}; \ >> - mv am64-main-r5f0_0-fw ipc_echo_test_mcu1_0_release_strip.xer5f; \ >> - mv am64-main-r5f0_1-fw ipc_echo_test_mcu1_1_release_strip.xer5f; \ >> - mv am64-main-r5f1_0-fw ipc_echo_test_mcu2_0_release_strip.xer5f; \ >> - mv am64-main-r5f1_1-fw ipc_echo_test_mcu2_1_release_strip.xer5f; \ >> - mv am64-mcu-m4f0_0-fw ipc_echo_test_mcu3_0_release_strip.xer5f; \ >> + ln -s am64-main-r5f0_0-fw ipc_echo_test_mcu1_0_release_strip.xer5f; \ >> + ln -s am64-main-r5f0_1-fw ipc_echo_test_mcu1_1_release_strip.xer5f; \ >> + ln -s am64-main-r5f1_0-fw ipc_echo_test_mcu2_0_release_strip.xer5f; \ >> + ln -s am64-main-r5f1_1-fw ipc_echo_test_mcu2_1_release_strip.xer5f; \ >> + ln -s am64-mcu-m4f0_0-fw ipc_echo_test_mcu3_0_release_strip.xer5f; \ >> ) >> } >> >> # Update the am62xx ipc binaries to be consistent with other platforms >> do_install:prepend:am62xx() { >> ( cd ${RTOS_IPC_FW_DIR}; \ >> - mv am62-mcu-m4f0_0-fw ipc_echo_test_mcu2_0_release_strip.xer5f; \ >> + ln -s am62-mcu-m4f0_0-fw ipc_echo_test_mcu2_0_release_strip.xer5f; \ >> ) >> } >> >> -- >> 2.39.1 >>
diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb index c09f67b5..3c372b32 100644 --- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb @@ -125,18 +125,18 @@ do_install:prepend:j721s2-hs-evm() { # Update the am64xx ipc binaries to be consistent with other platforms do_install:prepend:am64xx() { ( cd ${RTOS_IPC_FW_DIR}; \ - mv am64-main-r5f0_0-fw ipc_echo_test_mcu1_0_release_strip.xer5f; \ - mv am64-main-r5f0_1-fw ipc_echo_test_mcu1_1_release_strip.xer5f; \ - mv am64-main-r5f1_0-fw ipc_echo_test_mcu2_0_release_strip.xer5f; \ - mv am64-main-r5f1_1-fw ipc_echo_test_mcu2_1_release_strip.xer5f; \ - mv am64-mcu-m4f0_0-fw ipc_echo_test_mcu3_0_release_strip.xer5f; \ + ln -s am64-main-r5f0_0-fw ipc_echo_test_mcu1_0_release_strip.xer5f; \ + ln -s am64-main-r5f0_1-fw ipc_echo_test_mcu1_1_release_strip.xer5f; \ + ln -s am64-main-r5f1_0-fw ipc_echo_test_mcu2_0_release_strip.xer5f; \ + ln -s am64-main-r5f1_1-fw ipc_echo_test_mcu2_1_release_strip.xer5f; \ + ln -s am64-mcu-m4f0_0-fw ipc_echo_test_mcu3_0_release_strip.xer5f; \ ) } # Update the am62xx ipc binaries to be consistent with other platforms do_install:prepend:am62xx() { ( cd ${RTOS_IPC_FW_DIR}; \ - mv am62-mcu-m4f0_0-fw ipc_echo_test_mcu2_0_release_strip.xer5f; \ + ln -s am62-mcu-m4f0_0-fw ipc_echo_test_mcu2_0_release_strip.xer5f; \ ) }
If we rename files in the source directory the next time we need to rebuild the original files will be gone and build will fail. Use symlinks instead. Signed-off-by: Andrew Davis <afd@ti.com> --- .../recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)