Skip to contentSkip to conversation

linux-ti: Drop unneeded update_data calls

PATCH NAK Khem Raj 3 participants 6 messages Dec 1, 2022 – Dec 2, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 linux-ti: Drop unneeded update_data calls

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'

---
 meta-ti-bsp/recipes-kernel/linux/cmem.inc        | 2 --
 meta-ti-extras/recipes-ti/includes/ti-unpack.inc | 1 -
 2 files changed, 3 deletions(-)
meta-ti-bsp/recipes-kernel/linux/cmem.inc +0 -2
index fd913f6c..f560932c 100644
@@ -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')
meta-ti-extras/recipes-ti/includes/ti-unpack.inc +0 -1
index 46bfb957..13068843 100644
@@ -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)
Signature · 1 line
2.38.1
#1 lore raw

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...

Signature · 1 line
Denys
Quoted 53 lines · Khem Raj

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'

---
 meta-ti-bsp/recipes-kernel/linux/cmem.inc        | 2 --
 meta-ti-extras/recipes-ti/includes/ti-unpack.inc | 1 -
 2 files changed, 3 deletions(-)
meta-ti-bsp/recipes-kernel/linux/cmem.inc +0 -2
index fd913f6c..f560932c 100644
@@ -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')
meta-ti-extras/recipes-ti/includes/ti-unpack.inc +0 -1
index 46bfb957..13068843 100644
@@ -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)
Signature · 1 line
2.38.1
author
#2 lore raw
Quoted 11 lines · Denys Dmytriyenko

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.

Quoted 59 lines

--
Denys

Quoted 53 lines · Khem Raj

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'

---
 meta-ti-bsp/recipes-kernel/linux/cmem.inc        | 2 --
 meta-ti-extras/recipes-ti/includes/ti-unpack.inc | 1 -
 2 files changed, 3 deletions(-)
meta-ti-bsp/recipes-kernel/linux/cmem.inc +0 -2
index fd913f6c..f560932c 100644
@@ -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')
meta-ti-extras/recipes-ti/includes/ti-unpack.inc +0 -2
index 46bfb957..13068843 100644
@@ -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

#3 lore raw
Quoted 10 lines · Khem Raj
Quoted 9 lines · Denys Dmytriyenko

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]/

Quoted 6 lines
Quoted 2 lines

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.

Quoted 69 lines
Quoted 69 lines

--
Denys

Quoted 63 lines · Khem Raj

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'

---
  meta-ti-bsp/recipes-kernel/linux/cmem.inc        | 2 --
  meta-ti-extras/recipes-ti/includes/ti-unpack.inc | 1 -
  2 files changed, 3 deletions(-)
meta-ti-bsp/recipes-kernel/linux/cmem.inc +0 -2
index fd913f6c..f560932c 100644
@@ -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')
meta-ti-extras/recipes-ti/includes/ti-unpack.inc +0 -2
index 46bfb957..13068843 100644
@@ -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

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#15383): https://lists.yoctoproject.org/g/meta-ti/message/15383
Mute This Topic: https://lists.yoctoproject.org/mt/95376959/6551054
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
author
#4 lore raw

Ryan

Thanks for applying the fixes. I am seeing another issue

2022-12-02T17:26:17.8104311Z ERROR:
linux-ti-staging-5.10.145+gitAUTOINC+8b51d20b6e-0b do_patch: Fuzz
detected:
2022-12-02T17:26:17.8105197Z
2022-12-02T17:26:17.8106282Z Applying patch
init_disassemble_info-signature-changes-causes-compile-failures.patch
2022-12-02T17:26:17.8107676Z patching file tools/perf/util/annotate.c
2022-12-02T17:26:17.8108593Z Hunk #1 succeeded at 1685 with fuzz 2.
2022-12-02T17:26:17.8109470Z Hunk #2 succeeded at 1739 with fuzz 2.
2022-12-02T17:26:17.8109999Z
2022-12-02T17:26:17.8110016Z
2022-12-02T17:26:17.8110542Z The context lines in the patches can be
updated with devtool:
2022-12-02T17:26:17.8111180Z
2022-12-02T17:26:17.8117818Z     devtool modify linux-ti-staging
2022-12-02T17:26:17.8118351Z     devtool finish --force-patch-refresh
linux-ti-staging <layer_path>
2022-12-02T17:26:17.8118625Z
2022-12-02T17:26:17.8118872Z Don't forget to review changes done by devtool!
2022-12-02T17:26:17.8119097Z
2022-12-02T17:26:17.8126616Z ERROR:

linux-ti-staging-5.10.145+gitAUTOINC+8b51d20b6e-0b do_patch: QA Issue:
Patch log indicates that patches do not apply cleanly. [patch-fuzz]

Do you have a patch for this too ?

Quoted 97 lines · Ryan Eatmon
Quoted 10 lines · Khem Raj
Quoted 9 lines · Denys Dmytriyenko

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]/

Quoted 6 lines
Quoted 2 lines

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.

Quoted 61 lines
Quoted 61 lines

--
Denys

Quoted 55 lines · Khem Raj

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'

---
  meta-ti-bsp/recipes-kernel/linux/cmem.inc        | 2 --
  meta-ti-extras/recipes-ti/includes/ti-unpack.inc | 1 -
  2 files changed, 3 deletions(-)
meta-ti-bsp/recipes-kernel/linux/cmem.inc +0 -2
index fd913f6c..f560932c 100644
@@ -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')
meta-ti-extras/recipes-ti/includes/ti-unpack.inc +0 -2
index 46bfb957..13068843 100644
@@ -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

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#15383): https://lists.yoctoproject.org/g/meta-ti/message/15383
Mute This Topic: https://lists.yoctoproject.org/mt/95376959/6551054
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

--
Ryan Eatmon [email protected]
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS

#5 lore raw

I saw those, but we don't have the QA issue for patch-fuzz turned on as an error. Just warnings. I'll take a look.

Quoted 129 lines · Khem Raj

Ryan

Thanks for applying the fixes. I am seeing another issue

2022-12-02T17:26:17.8104311Z ERROR:
linux-ti-staging-5.10.145+gitAUTOINC+8b51d20b6e-0b do_patch: Fuzz
detected:
2022-12-02T17:26:17.8105197Z
2022-12-02T17:26:17.8106282Z Applying patch
init_disassemble_info-signature-changes-causes-compile-failures.patch
2022-12-02T17:26:17.8107676Z patching file tools/perf/util/annotate.c
2022-12-02T17:26:17.8108593Z Hunk #1 succeeded at 1685 with fuzz 2.
2022-12-02T17:26:17.8109470Z Hunk #2 succeeded at 1739 with fuzz 2.
2022-12-02T17:26:17.8109999Z
2022-12-02T17:26:17.8110016Z
2022-12-02T17:26:17.8110542Z The context lines in the patches can be
updated with devtool:
2022-12-02T17:26:17.8111180Z
2022-12-02T17:26:17.8117818Z     devtool modify linux-ti-staging
2022-12-02T17:26:17.8118351Z     devtool finish --force-patch-refresh
linux-ti-staging <layer_path>
2022-12-02T17:26:17.8118625Z
2022-12-02T17:26:17.8118872Z Don't forget to review changes done by devtool!
2022-12-02T17:26:17.8119097Z
2022-12-02T17:26:17.8126616Z ERROR:

linux-ti-staging-5.10.145+gitAUTOINC+8b51d20b6e-0b do_patch: QA Issue:
Patch log indicates that patches do not apply cleanly. [patch-fuzz]

Do you have a patch for this too ?

Quoted 97 lines · Ryan Eatmon
Quoted 10 lines · Khem Raj
Quoted 9 lines · Denys Dmytriyenko

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]/

Quoted 6 lines
Quoted 2 lines

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.

Quoted 61 lines
Quoted 61 lines

--
Denys

Quoted 55 lines · Khem Raj
   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'

---
   meta-ti-bsp/recipes-kernel/linux/cmem.inc        | 2 --
   meta-ti-extras/recipes-ti/includes/ti-unpack.inc | 1 -
   2 files changed, 3 deletions(-)
meta-ti-bsp/recipes-kernel/linux/cmem.inc +0 -2
index fd913f6c..f560932c 100644
@@ -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')
meta-ti-extras/recipes-ti/includes/ti-unpack.inc +0 -2
index 46bfb957..13068843 100644
@@ -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

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#15383): https://lists.yoctoproject.org/g/meta-ti/message/15383
Mute This Topic: https://lists.yoctoproject.org/mt/95376959/6551054
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

--
Ryan Eatmon [email protected]
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS

Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS