On 12/1/2022 11:40, Khem Raj wrote:
On Thu, Dec 1, 2022 at 6:36 AM Denys Dmytriyenko <[email protected]> wrote:

NAK

cmem is being removed:
https://patchwork.yoctoproject.org/project/ti/patch/[email protected]/

ti-unpack is being patched already:
https://patchwork.yoctoproject.org/project/ti/patch/[email protected]/

It's just getting longer to get the patches merged due to other breakages
in master...

Can we expedite these two fixes or atleast my cosmetic change ? this
will fix CI breakages for distros
living on master.

Just updated master-wip -> master.  So your issue should be fixed now.



--
Denys


On Wed, Nov 30, 2022 at 10:48:05PM -0800, Khem Raj wrote:
  datastore works dynamically we don't need the update_data calls
  anymore, so far they were no-ops, now bitbake has recently dropped this
  API and hence compile fails with core/master

  Fixes
   *** 0052:        bb.data.update_data(localdata)
      0053:
      0054:        cmem_dtsi.add(localdata.getVar('CMEM_DTSI'))
      0055:
      0056:    d.appendVar('SRC_URI', ' file://'.join(cmem_dtsi))
Exception: AttributeError: module 'bb.data' has no attribute 'update_data'

Signed-off-by: Khem Raj <[email protected]>
---
  meta-ti-bsp/recipes-kernel/linux/cmem.inc        | 2 --
  meta-ti-extras/recipes-ti/includes/ti-unpack.inc | 1 -
  2 files changed, 3 deletions(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/cmem.inc 
b/meta-ti-bsp/recipes-kernel/linux/cmem.inc
index fd913f6c..f560932c 100644
--- a/meta-ti-bsp/recipes-kernel/linux/cmem.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/cmem.inc
@@ -49,7 +49,6 @@ python do_unpack() {
          # Create copy of data for additional override
          localdata = bb.data.createCopy(d)
          localdata.setVar('OVERRIDES', '%s:%s' % (cmem_machine, old_overrides))
-        bb.data.update_data(localdata)

          cmem_dtsi.add(localdata.getVar('CMEM_DTSI'))

@@ -67,7 +66,6 @@ python do_setup_cmem() {
              # Create copy of data for additional override
              localdata = bb.data.createCopy(d)
              localdata.setVar('OVERRIDES', '%s:%s' % (cmem_machine, 
old_overrides))
-            bb.data.update_data(localdata)

              # Get source directory and dtsi filename
              src_dir  = localdata.getVar('WORKDIR')
diff --git a/meta-ti-extras/recipes-ti/includes/ti-unpack.inc 
b/meta-ti-extras/recipes-ti/includes/ti-unpack.inc
index 46bfb957..13068843 100644
--- a/meta-ti-extras/recipes-ti/includes/ti-unpack.inc
+++ b/meta-ti-extras/recipes-ti/includes/ti-unpack.inc
@@ -24,7 +24,6 @@ python ti_bin_do_unpack() {
          bb.fatal("TI installer requires 32bit glibc libraries for proper 
operation\nrun 'yum install glibc.i686' on Fedora or 'apt-get install libc6:i386' on 
Ubuntu/Debian")

      localdata = bb.data.createCopy(d)
-    bb.data.update_data(localdata)

      binfile  = localdata.getVar('BINFILE')
      binfile  = bb.data.expand(binfile, localdata)
--
2.38.1






--
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#15384): 
https://lists.yoctoproject.org/g/meta-ti/message/15384
Mute This Topic: https://lists.yoctoproject.org/mt/95376959/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to