* [PATCH 1/2] ipc-test-fw: add alternatives handling @ 2015-12-05 2:25 Denys Dmytriyenko 2015-12-05 2:25 ` [PATCH 2/2] opencl-monitor: fix " Denys Dmytriyenko 0 siblings, 1 reply; 7+ messages in thread From: Denys Dmytriyenko @ 2015-12-05 2:25 UTC (permalink / raw) To: meta-arago From: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com> --- .../ipc-test-fw/ipc-test-fw_3.21.00.02.bb | 23 +++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/meta-arago-distro/recipes-bsp/ipc-test-fw/ipc-test-fw_3.21.00.02.bb b/meta-arago-distro/recipes-bsp/ipc-test-fw/ipc-test-fw_3.21.00.02.bb index 55a6768..3093b53 100644 --- a/meta-arago-distro/recipes-bsp/ipc-test-fw/ipc-test-fw_3.21.00.02.bb +++ b/meta-arago-distro/recipes-bsp/ipc-test-fw/ipc-test-fw_3.21.00.02.bb @@ -2,10 +2,10 @@ DESCRIPTION = "Firmware images to test IPC" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb" -PACKAGE_ARCH = "${MACHINE_ARCH}" +inherit update-alternatives FWVER = "eng-4-gb9283b0" -PR = "r1+${FWVER}" +PR = "r2+${FWVER}" COMPATIBLE_MACHINE = "omap5-evm|dra7xx" @@ -23,14 +23,27 @@ do_compile() { : } -# Add a .test extension to the firmware files so that they do not conflict -# with the real firmware images do_install() { install -d ${D}${base_libdir}/firmware for f in *.xe* do - install -m 755 ${f} ${D}${base_libdir}/firmware/${f}.test + install -m 755 $f ${D}${base_libdir}/firmware/$f.${BPN} done } +ALTERNATIVE_${PN} = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66 dra7-ipu1-fw.xem4 dra7-ipu2-fw.xem4 ducati-m3-core0.xem3 tesla-dsp.xe64T" +ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66" +ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66.${BPN}" +ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66" +ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66.${BPN}" +ALTERNATIVE_LINK_NAME[dra7-ipu1-fw.xem4] = "${base_libdir}/firmware/dra7-ipu1-fw.xem4" +ALTERNATIVE_TARGET[dra7-ipu1-fw.xem4] = "${base_libdir}/firmware/dra7-ipu1-fw.xem4.${BPN}" +ALTERNATIVE_LINK_NAME[dra7-ipu2-fw.xem4] = "${base_libdir}/firmware/dra7-ipu2-fw.xem4" +ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${base_libdir}/firmware/dra7-ipu2-fw.xem4.${BPN}" +ALTERNATIVE_LINK_NAME[ducati-m3-core0.xem3] = "${base_libdir}/firmware/ducati-m3-core0.xem3" +ALTERNATIVE_TARGET[ducati-m3-core0.xem3] = "${base_libdir}/firmware/ducati-m3-core0.xem3.${BPN}" +ALTERNATIVE_LINK_NAME[tesla-dsp.xe64T] = "${base_libdir}/firmware/tesla-dsp.xe64T" +ALTERNATIVE_TARGET[tesla-dsp.xe64T] = "${base_libdir}/firmware/tesla-dsp.xe64T.${BPN}" +ALTERNATIVE_PRIORITY = "20" + FILES_${PN} += "${base_libdir}/firmware" -- 2.2.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] opencl-monitor: fix alternatives handling 2015-12-05 2:25 [PATCH 1/2] ipc-test-fw: add alternatives handling Denys Dmytriyenko @ 2015-12-05 2:25 ` Denys Dmytriyenko 2015-12-07 12:12 ` Jacob Stiffler 0 siblings, 1 reply; 7+ messages in thread From: Denys Dmytriyenko @ 2015-12-05 2:25 UTC (permalink / raw) To: meta-arago From: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com> --- meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb index fbc4949..6657ba8 100644 --- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb +++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb @@ -47,9 +47,15 @@ export GDB_SERVER_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/gdbc6x" export X86_LLVM_DIR = "${STAGING_DIR_NATIVE}/usr" export XDCPATH = "${S};${IPC_DIR}/packages;${BIOS_DIR}/packages;${EDMA3LLD_DIR}/packages;${FC_DIR}/packages;${XDAIS_DIR}/packages" +do_install_append() { + for i in 1 2; do mv ${D}${base_libdir}/firmware/dra7-dsp$i-fw.xe66 ${D}${base_libdir}/firmware/dra7-dsp$i-fw.xe66.${BPN}; done +} + ALTERNATIVE_${PN} = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66" -ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "/lib/firmware/dra7-dsp1-fw.xe66" -ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "/lib/firmware/dra7-dsp2-fw.xe66" +ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66" +ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66.${BPN}" +ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66" +ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66.${BPN}" ALTERNATIVE_PRIORITY = "100" MONITOR_FIRMWARE = "" -- 2.2.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] opencl-monitor: fix alternatives handling 2015-12-05 2:25 ` [PATCH 2/2] opencl-monitor: fix " Denys Dmytriyenko @ 2015-12-07 12:12 ` Jacob Stiffler 2015-12-07 14:58 ` Denys Dmytriyenko 0 siblings, 1 reply; 7+ messages in thread From: Jacob Stiffler @ 2015-12-07 12:12 UTC (permalink / raw) To: Denys Dmytriyenko, meta-arago NAK This breaks opencl-monitor for keystone as there is no dra7-dsp$i-fw.xe66. Why was this change necessary? According to the documentation, update-alternatives will automatically do this renaming. Frm openembedded-core/meta/classes/update-alternative.bbclass: >>> # NOTE: If the ALTERNATIVE_LINK_NAME and ALTERNATIVE_TARGET are the same, # ALTERNATIVE_TARGET will have '.{BPN}' appended to it. If the file # referenced has not been renamed, it will also be renamed. (This avoids # the need to rename alternative files in the do_install step, but still # supports it if necessary for some reason.) <<< - Jake On 12/4/2015 9:25 PM, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko <denys@ti.com> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com> > --- > meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb > index fbc4949..6657ba8 100644 > --- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb > +++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb > @@ -47,9 +47,15 @@ export GDB_SERVER_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/gdbc6x" > export X86_LLVM_DIR = "${STAGING_DIR_NATIVE}/usr" > export XDCPATH = "${S};${IPC_DIR}/packages;${BIOS_DIR}/packages;${EDMA3LLD_DIR}/packages;${FC_DIR}/packages;${XDAIS_DIR}/packages" > > +do_install_append() { > + for i in 1 2; do mv ${D}${base_libdir}/firmware/dra7-dsp$i-fw.xe66 ${D}${base_libdir}/firmware/dra7-dsp$i-fw.xe66.${BPN}; done > +} > + > ALTERNATIVE_${PN} = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66" > -ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "/lib/firmware/dra7-dsp1-fw.xe66" > -ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "/lib/firmware/dra7-dsp2-fw.xe66" > +ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66" > +ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66.${BPN}" > +ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66" > +ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66.${BPN}" > ALTERNATIVE_PRIORITY = "100" > > MONITOR_FIRMWARE = "" ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] opencl-monitor: fix alternatives handling 2015-12-07 12:12 ` Jacob Stiffler @ 2015-12-07 14:58 ` Denys Dmytriyenko 2015-12-07 15:15 ` Denys Dmytriyenko 0 siblings, 1 reply; 7+ messages in thread From: Denys Dmytriyenko @ 2015-12-07 14:58 UTC (permalink / raw) To: Jacob Stiffler; +Cc: meta-arago Looks like when you build just opencl-monitor directly, the renaming doesn't happen in the sysroots, but only for the packaging. So, even though the IPK gets files renamed with ${BPN} suffix, the same files in sysroots are installed w/o such suffix, leading to conflicts with dspdce-fw and also ipc-test-fw after it got update-alternatives added. BTW, do_install_append can be machine-speicfic to dra7xx... $ MACHINE=am57xx-evm bitbake opencl-monitor -c cleansstate $ MACHINE=am57xx-evm bitbake opencl-monitor $ ls ${TMPDIR}/sysroots/am57xx-evm/lib/firmware/dra7-dsp* ./sysroots/am57xx-evm/lib/firmware/dra7-dsp2-fw.xe66 ./sysroots/am57xx-evm/lib/firmware/dra7-dsp1-fw.xe66 Also, the error message looks like this: ERROR: The recipe dspdce-fw is trying to install files into a shared area when those files already exist. Those files and their manifest location are: .../sysroots/am57xx-evm/lib/firmware/dra7-dsp1-fw.xe66 Matched in manifest-am57xx-evm-opencl-monitor.populate_sysroot Please verify which recipe should provide the above files. The build has stopped as continuing in this scenario WILL break things, if not now, possibly in the future (we've seen builds fail several months later). If the system knew how to recover from this automatically it would however there are several different scenarios which can result in this and we don't know which one this is. It may be you have switched providers of something like virtual/kernel (e.g. from linux-yocto to linux-yocto-dev), in that case you need to execute the clean task for both recipes and it will resolve this error. It may be you changed DISTRO_FEATURES from systemd to udev or vice versa. Cleaning those recipes should again resolve this error however switching DISTRO_FEATURES on an existing build directory is not supported, you should really clean out tmp and rebuild (reusing sstate should be safe). It could be the overlapping files detected are harmless in which case adding them to SSTATE_DUPWHITELIST may be the correct solution. It could also be your build is including two different conflicting versions of things (e.g. bluez 4 and bluez 5 and the correct solution for that would be to resolve the conflict. If in doubt, please ask on the mailing list, sharing the error and filelist above. ERROR: If the above message is too much, the simpler version is you're advised to wipe out tmp and rebuild (reusing sstate is fine). That will likely fix things in most (but not all) cases. ERROR: Function failed: sstate_task_postfunc ERROR: Logfile of failure stored in: .../work/cortexa15hf-vfp-neon-linux-gnueabi/dspdce-fw/1.00.00.06-r1/temp/log.do_populate_sysroot.20654 ERROR: Task 3 (.../sources/meta-ti/recipes-bsp/dspdce-fw/dspdce-fw_git.bb, do_populate_sysroot) failed with exit code '1' On Mon, Dec 07, 2015 at 07:12:38AM -0500, Jacob Stiffler wrote: > NAK > > > This breaks opencl-monitor for keystone as there is no dra7-dsp$i-fw.xe66. > > Why was this change necessary? According to the documentation, > update-alternatives will automatically do this renaming. > > Frm openembedded-core/meta/classes/update-alternative.bbclass: > >>> > # NOTE: If the ALTERNATIVE_LINK_NAME and ALTERNATIVE_TARGET are the same, > # ALTERNATIVE_TARGET will have '.{BPN}' appended to it. If the file > # referenced has not been renamed, it will also be renamed. (This avoids > # the need to rename alternative files in the do_install step, but still > # supports it if necessary for some reason.) > <<< > > - Jake > > > On 12/4/2015 9:25 PM, Denys Dmytriyenko wrote: > >From: Denys Dmytriyenko <denys@ti.com> > > > >Signed-off-by: Denys Dmytriyenko <denys@ti.com> > >--- > > meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb | 10 ++++++++-- > > 1 file changed, 8 insertions(+), 2 deletions(-) > > > >diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb > >index fbc4949..6657ba8 100644 > >--- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb > >+++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb > >@@ -47,9 +47,15 @@ export GDB_SERVER_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/gdbc6x" > > export X86_LLVM_DIR = "${STAGING_DIR_NATIVE}/usr" > > export XDCPATH = "${S};${IPC_DIR}/packages;${BIOS_DIR}/packages;${EDMA3LLD_DIR}/packages;${FC_DIR}/packages;${XDAIS_DIR}/packages" > >+do_install_append() { > >+ for i in 1 2; do mv ${D}${base_libdir}/firmware/dra7-dsp$i-fw.xe66 ${D}${base_libdir}/firmware/dra7-dsp$i-fw.xe66.${BPN}; done > >+} > >+ > > ALTERNATIVE_${PN} = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66" > >-ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "/lib/firmware/dra7-dsp1-fw.xe66" > >-ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "/lib/firmware/dra7-dsp2-fw.xe66" > >+ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66" > >+ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66.${BPN}" > >+ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66" > >+ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66.${BPN}" > > ALTERNATIVE_PRIORITY = "100" > > MONITOR_FIRMWARE = "" > > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] opencl-monitor: fix alternatives handling 2015-12-07 14:58 ` Denys Dmytriyenko @ 2015-12-07 15:15 ` Denys Dmytriyenko 2015-12-07 15:18 ` Jacob Stiffler 0 siblings, 1 reply; 7+ messages in thread From: Denys Dmytriyenko @ 2015-12-07 15:15 UTC (permalink / raw) To: Jacob Stiffler; +Cc: meta-arago And BTW, building opencl-monitor for keystone is not in upstream, hence no issues in nightlies... Hint - please submit the necessary changes for opencl on keystone. On Mon, Dec 07, 2015 at 09:58:57AM -0500, Denys Dmytriyenko wrote: > Looks like when you build just opencl-monitor directly, the renaming doesn't > happen in the sysroots, but only for the packaging. So, even though the IPK > gets files renamed with ${BPN} suffix, the same files in sysroots are > installed w/o such suffix, leading to conflicts with dspdce-fw and also > ipc-test-fw after it got update-alternatives added. > > BTW, do_install_append can be machine-speicfic to dra7xx... > > > $ MACHINE=am57xx-evm bitbake opencl-monitor -c cleansstate > $ MACHINE=am57xx-evm bitbake opencl-monitor > $ ls ${TMPDIR}/sysroots/am57xx-evm/lib/firmware/dra7-dsp* > ./sysroots/am57xx-evm/lib/firmware/dra7-dsp2-fw.xe66 > ./sysroots/am57xx-evm/lib/firmware/dra7-dsp1-fw.xe66 > > Also, the error message looks like this: > > ERROR: The recipe dspdce-fw is trying to install files into a shared area when > those files already exist. Those files and their manifest location are: > .../sysroots/am57xx-evm/lib/firmware/dra7-dsp1-fw.xe66 > Matched in manifest-am57xx-evm-opencl-monitor.populate_sysroot > Please verify which recipe should provide the above files. > The build has stopped as continuing in this scenario WILL break things, if not > now, possibly in the future (we've seen builds fail several months later). If > the system knew how to recover from this automatically it would however there > are several different scenarios which can result in this and we don't know > which one this is. It may be you have switched providers of something like > virtual/kernel (e.g. from linux-yocto to linux-yocto-dev), in that case you > need to execute the clean task for both recipes and it will resolve this > error. It may be you changed DISTRO_FEATURES from systemd to udev or vice > versa. Cleaning those recipes should again resolve this error however > switching DISTRO_FEATURES on an existing build directory is not supported, you > should really clean out tmp and rebuild (reusing sstate should be safe). It > could be the overlapping files detected are harmless in which case adding them > to SSTATE_DUPWHITELIST may be the correct solution. It could also be your > build is including two different conflicting versions of things (e.g. bluez 4 > and bluez 5 and the correct solution for that would be to resolve the > conflict. If in doubt, please ask on the mailing list, sharing the error and > filelist above. > ERROR: If the above message is too much, the simpler version is you're advised > to wipe out tmp and rebuild (reusing sstate is fine). That will likely fix > things in most (but not all) cases. > ERROR: Function failed: sstate_task_postfunc > ERROR: Logfile of failure stored in: .../work/cortexa15hf-vfp-neon-linux-gnueabi/dspdce-fw/1.00.00.06-r1/temp/log.do_populate_sysroot.20654 > ERROR: Task 3 (.../sources/meta-ti/recipes-bsp/dspdce-fw/dspdce-fw_git.bb, do_populate_sysroot) failed with exit code '1' > > > On Mon, Dec 07, 2015 at 07:12:38AM -0500, Jacob Stiffler wrote: > > NAK > > > > > > This breaks opencl-monitor for keystone as there is no dra7-dsp$i-fw.xe66. > > > > Why was this change necessary? According to the documentation, > > update-alternatives will automatically do this renaming. > > > > Frm openembedded-core/meta/classes/update-alternative.bbclass: > > >>> > > # NOTE: If the ALTERNATIVE_LINK_NAME and ALTERNATIVE_TARGET are the same, > > # ALTERNATIVE_TARGET will have '.{BPN}' appended to it. If the file > > # referenced has not been renamed, it will also be renamed. (This avoids > > # the need to rename alternative files in the do_install step, but still > > # supports it if necessary for some reason.) > > <<< > > > > - Jake > > > > > > On 12/4/2015 9:25 PM, Denys Dmytriyenko wrote: > > >From: Denys Dmytriyenko <denys@ti.com> > > > > > >Signed-off-by: Denys Dmytriyenko <denys@ti.com> > > >--- > > > meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb | 10 ++++++++-- > > > 1 file changed, 8 insertions(+), 2 deletions(-) > > > > > >diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb > > >index fbc4949..6657ba8 100644 > > >--- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb > > >+++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb > > >@@ -47,9 +47,15 @@ export GDB_SERVER_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/gdbc6x" > > > export X86_LLVM_DIR = "${STAGING_DIR_NATIVE}/usr" > > > export XDCPATH = "${S};${IPC_DIR}/packages;${BIOS_DIR}/packages;${EDMA3LLD_DIR}/packages;${FC_DIR}/packages;${XDAIS_DIR}/packages" > > >+do_install_append() { > > >+ for i in 1 2; do mv ${D}${base_libdir}/firmware/dra7-dsp$i-fw.xe66 ${D}${base_libdir}/firmware/dra7-dsp$i-fw.xe66.${BPN}; done > > >+} > > >+ > > > ALTERNATIVE_${PN} = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66" > > >-ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "/lib/firmware/dra7-dsp1-fw.xe66" > > >-ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "/lib/firmware/dra7-dsp2-fw.xe66" > > >+ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66" > > >+ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66.${BPN}" > > >+ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66" > > >+ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66.${BPN}" > > > ALTERNATIVE_PRIORITY = "100" > > > MONITOR_FIRMWARE = "" > > > > _______________________________________________ > > meta-arago mailing list > > meta-arago@arago-project.org > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] opencl-monitor: fix alternatives handling 2015-12-07 15:15 ` Denys Dmytriyenko @ 2015-12-07 15:18 ` Jacob Stiffler 2015-12-07 16:10 ` Denys Dmytriyenko 0 siblings, 1 reply; 7+ messages in thread From: Jacob Stiffler @ 2015-12-07 15:18 UTC (permalink / raw) To: Denys Dmytriyenko; +Cc: meta-arago On 12/7/2015 10:15 AM, Denys Dmytriyenko wrote: > And BTW, building opencl-monitor for keystone is not in upstream, hence no > issues in nightlies... Hint - please submit the necessary changes for opencl > on keystone. Sources are still internal... > > On Mon, Dec 07, 2015 at 09:58:57AM -0500, Denys Dmytriyenko wrote: >> Looks like when you build just opencl-monitor directly, the renaming doesn't >> happen in the sysroots, but only for the packaging. So, even though the IPK >> gets files renamed with ${BPN} suffix, the same files in sysroots are >> installed w/o such suffix, leading to conflicts with dspdce-fw and also >> ipc-test-fw after it got update-alternatives added. I guess there are some gaps with udate-alternatives. ACK >> BTW, do_install_append can be machine-speicfic to dra7xx... >> >> >> $ MACHINE=am57xx-evm bitbake opencl-monitor -c cleansstate >> $ MACHINE=am57xx-evm bitbake opencl-monitor >> $ ls ${TMPDIR}/sysroots/am57xx-evm/lib/firmware/dra7-dsp* >> ./sysroots/am57xx-evm/lib/firmware/dra7-dsp2-fw.xe66 >> ./sysroots/am57xx-evm/lib/firmware/dra7-dsp1-fw.xe66 >> >> Also, the error message looks like this: >> >> ERROR: The recipe dspdce-fw is trying to install files into a shared area when >> those files already exist. Those files and their manifest location are: >> .../sysroots/am57xx-evm/lib/firmware/dra7-dsp1-fw.xe66 >> Matched in manifest-am57xx-evm-opencl-monitor.populate_sysroot >> Please verify which recipe should provide the above files. >> The build has stopped as continuing in this scenario WILL break things, if not >> now, possibly in the future (we've seen builds fail several months later). If >> the system knew how to recover from this automatically it would however there >> are several different scenarios which can result in this and we don't know >> which one this is. It may be you have switched providers of something like >> virtual/kernel (e.g. from linux-yocto to linux-yocto-dev), in that case you >> need to execute the clean task for both recipes and it will resolve this >> error. It may be you changed DISTRO_FEATURES from systemd to udev or vice >> versa. Cleaning those recipes should again resolve this error however >> switching DISTRO_FEATURES on an existing build directory is not supported, you >> should really clean out tmp and rebuild (reusing sstate should be safe). It >> could be the overlapping files detected are harmless in which case adding them >> to SSTATE_DUPWHITELIST may be the correct solution. It could also be your >> build is including two different conflicting versions of things (e.g. bluez 4 >> and bluez 5 and the correct solution for that would be to resolve the >> conflict. If in doubt, please ask on the mailing list, sharing the error and >> filelist above. >> ERROR: If the above message is too much, the simpler version is you're advised >> to wipe out tmp and rebuild (reusing sstate is fine). That will likely fix >> things in most (but not all) cases. >> ERROR: Function failed: sstate_task_postfunc >> ERROR: Logfile of failure stored in: .../work/cortexa15hf-vfp-neon-linux-gnueabi/dspdce-fw/1.00.00.06-r1/temp/log.do_populate_sysroot.20654 >> ERROR: Task 3 (.../sources/meta-ti/recipes-bsp/dspdce-fw/dspdce-fw_git.bb, do_populate_sysroot) failed with exit code '1' >> >> >> On Mon, Dec 07, 2015 at 07:12:38AM -0500, Jacob Stiffler wrote: >>> NAK >>> >>> >>> This breaks opencl-monitor for keystone as there is no dra7-dsp$i-fw.xe66. >>> >>> Why was this change necessary? According to the documentation, >>> update-alternatives will automatically do this renaming. >>> >>> Frm openembedded-core/meta/classes/update-alternative.bbclass: >>> # NOTE: If the ALTERNATIVE_LINK_NAME and ALTERNATIVE_TARGET are the same, >>> # ALTERNATIVE_TARGET will have '.{BPN}' appended to it. If the file >>> # referenced has not been renamed, it will also be renamed. (This avoids >>> # the need to rename alternative files in the do_install step, but still >>> # supports it if necessary for some reason.) >>> <<< >>> >>> - Jake >>> >>> >>> On 12/4/2015 9:25 PM, Denys Dmytriyenko wrote: >>>> From: Denys Dmytriyenko <denys@ti.com> >>>> >>>> Signed-off-by: Denys Dmytriyenko <denys@ti.com> >>>> --- >>>> meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb | 10 ++++++++-- >>>> 1 file changed, 8 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb >>>> index fbc4949..6657ba8 100644 >>>> --- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb >>>> +++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb >>>> @@ -47,9 +47,15 @@ export GDB_SERVER_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/gdbc6x" >>>> export X86_LLVM_DIR = "${STAGING_DIR_NATIVE}/usr" >>>> export XDCPATH = "${S};${IPC_DIR}/packages;${BIOS_DIR}/packages;${EDMA3LLD_DIR}/packages;${FC_DIR}/packages;${XDAIS_DIR}/packages" >>>> +do_install_append() { >>>> + for i in 1 2; do mv ${D}${base_libdir}/firmware/dra7-dsp$i-fw.xe66 ${D}${base_libdir}/firmware/dra7-dsp$i-fw.xe66.${BPN}; done >>>> +} >>>> + >>>> ALTERNATIVE_${PN} = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66" >>>> -ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "/lib/firmware/dra7-dsp1-fw.xe66" >>>> -ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "/lib/firmware/dra7-dsp2-fw.xe66" >>>> +ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66" >>>> +ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66.${BPN}" >>>> +ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66" >>>> +ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66.${BPN}" >>>> ALTERNATIVE_PRIORITY = "100" >>>> MONITOR_FIRMWARE = "" >>> _______________________________________________ >>> meta-arago mailing list >>> meta-arago@arago-project.org >>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago >> _______________________________________________ >> meta-arago mailing list >> meta-arago@arago-project.org >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] opencl-monitor: fix alternatives handling 2015-12-07 15:18 ` Jacob Stiffler @ 2015-12-07 16:10 ` Denys Dmytriyenko 0 siblings, 0 replies; 7+ messages in thread From: Denys Dmytriyenko @ 2015-12-07 16:10 UTC (permalink / raw) To: Jacob Stiffler; +Cc: meta-arago On Mon, Dec 07, 2015 at 10:18:47AM -0500, Jacob Stiffler wrote: > > > On 12/7/2015 10:15 AM, Denys Dmytriyenko wrote: > >And BTW, building opencl-monitor for keystone is not in upstream, hence no > >issues in nightlies... Hint - please submit the necessary changes for opencl > >on keystone. > > Sources are still internal... Any ETA? > >On Mon, Dec 07, 2015 at 09:58:57AM -0500, Denys Dmytriyenko wrote: > >>Looks like when you build just opencl-monitor directly, the renaming doesn't > >>happen in the sysroots, but only for the packaging. So, even though the IPK > >>gets files renamed with ${BPN} suffix, the same files in sysroots are > >>installed w/o such suffix, leading to conflicts with dspdce-fw and also > >>ipc-test-fw after it got update-alternatives added. > > I guess there are some gaps with udate-alternatives. Yeah, looks like it - I've submitted a bugreport upstream. > ACK > > >>BTW, do_install_append can be machine-speicfic to dra7xx... > >> > >> > >>$ MACHINE=am57xx-evm bitbake opencl-monitor -c cleansstate > >>$ MACHINE=am57xx-evm bitbake opencl-monitor > >>$ ls ${TMPDIR}/sysroots/am57xx-evm/lib/firmware/dra7-dsp* > >>./sysroots/am57xx-evm/lib/firmware/dra7-dsp2-fw.xe66 > >>./sysroots/am57xx-evm/lib/firmware/dra7-dsp1-fw.xe66 > >> > >>Also, the error message looks like this: > >> > >>ERROR: The recipe dspdce-fw is trying to install files into a shared area when > >>those files already exist. Those files and their manifest location are: > >> .../sysroots/am57xx-evm/lib/firmware/dra7-dsp1-fw.xe66 > >> Matched in manifest-am57xx-evm-opencl-monitor.populate_sysroot > >>Please verify which recipe should provide the above files. > >>The build has stopped as continuing in this scenario WILL break things, if not > >>now, possibly in the future (we've seen builds fail several months later). If > >>the system knew how to recover from this automatically it would however there > >>are several different scenarios which can result in this and we don't know > >>which one this is. It may be you have switched providers of something like > >>virtual/kernel (e.g. from linux-yocto to linux-yocto-dev), in that case you > >>need to execute the clean task for both recipes and it will resolve this > >>error. It may be you changed DISTRO_FEATURES from systemd to udev or vice > >>versa. Cleaning those recipes should again resolve this error however > >>switching DISTRO_FEATURES on an existing build directory is not supported, you > >>should really clean out tmp and rebuild (reusing sstate should be safe). It > >>could be the overlapping files detected are harmless in which case adding them > >>to SSTATE_DUPWHITELIST may be the correct solution. It could also be your > >>build is including two different conflicting versions of things (e.g. bluez 4 > >>and bluez 5 and the correct solution for that would be to resolve the > >>conflict. If in doubt, please ask on the mailing list, sharing the error and > >>filelist above. > >>ERROR: If the above message is too much, the simpler version is you're advised > >>to wipe out tmp and rebuild (reusing sstate is fine). That will likely fix > >>things in most (but not all) cases. > >>ERROR: Function failed: sstate_task_postfunc > >>ERROR: Logfile of failure stored in: .../work/cortexa15hf-vfp-neon-linux-gnueabi/dspdce-fw/1.00.00.06-r1/temp/log.do_populate_sysroot.20654 > >>ERROR: Task 3 (.../sources/meta-ti/recipes-bsp/dspdce-fw/dspdce-fw_git.bb, do_populate_sysroot) failed with exit code '1' > >> > >> > >>On Mon, Dec 07, 2015 at 07:12:38AM -0500, Jacob Stiffler wrote: > >>>NAK > >>> > >>> > >>>This breaks opencl-monitor for keystone as there is no dra7-dsp$i-fw.xe66. > >>> > >>>Why was this change necessary? According to the documentation, > >>>update-alternatives will automatically do this renaming. > >>> > >>>Frm openembedded-core/meta/classes/update-alternative.bbclass: > >>># NOTE: If the ALTERNATIVE_LINK_NAME and ALTERNATIVE_TARGET are the same, > >>># ALTERNATIVE_TARGET will have '.{BPN}' appended to it. If the file > >>># referenced has not been renamed, it will also be renamed. (This avoids > >>># the need to rename alternative files in the do_install step, but still > >>># supports it if necessary for some reason.) > >>><<< > >>> > >>>- Jake > >>> > >>> > >>>On 12/4/2015 9:25 PM, Denys Dmytriyenko wrote: > >>>>From: Denys Dmytriyenko <denys@ti.com> > >>>> > >>>>Signed-off-by: Denys Dmytriyenko <denys@ti.com> > >>>>--- > >>>> meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb | 10 ++++++++-- > >>>> 1 file changed, 8 insertions(+), 2 deletions(-) > >>>> > >>>>diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb > >>>>index fbc4949..6657ba8 100644 > >>>>--- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb > >>>>+++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb > >>>>@@ -47,9 +47,15 @@ export GDB_SERVER_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/gdbc6x" > >>>> export X86_LLVM_DIR = "${STAGING_DIR_NATIVE}/usr" > >>>> export XDCPATH = "${S};${IPC_DIR}/packages;${BIOS_DIR}/packages;${EDMA3LLD_DIR}/packages;${FC_DIR}/packages;${XDAIS_DIR}/packages" > >>>>+do_install_append() { > >>>>+ for i in 1 2; do mv ${D}${base_libdir}/firmware/dra7-dsp$i-fw.xe66 ${D}${base_libdir}/firmware/dra7-dsp$i-fw.xe66.${BPN}; done > >>>>+} > >>>>+ > >>>> ALTERNATIVE_${PN} = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66" > >>>>-ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "/lib/firmware/dra7-dsp1-fw.xe66" > >>>>-ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "/lib/firmware/dra7-dsp2-fw.xe66" > >>>>+ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66" > >>>>+ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66.${BPN}" > >>>>+ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66" > >>>>+ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66.${BPN}" > >>>> ALTERNATIVE_PRIORITY = "100" > >>>> MONITOR_FIRMWARE = "" > >>>_______________________________________________ > >>>meta-arago mailing list > >>>meta-arago@arago-project.org > >>>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > >>_______________________________________________ > >>meta-arago mailing list > >>meta-arago@arago-project.org > >>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-12-07 16:10 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-12-05 2:25 [PATCH 1/2] ipc-test-fw: add alternatives handling Denys Dmytriyenko 2015-12-05 2:25 ` [PATCH 2/2] opencl-monitor: fix " Denys Dmytriyenko 2015-12-07 12:12 ` Jacob Stiffler 2015-12-07 14:58 ` Denys Dmytriyenko 2015-12-07 15:15 ` Denys Dmytriyenko 2015-12-07 15:18 ` Jacob Stiffler 2015-12-07 16:10 ` Denys Dmytriyenko
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.