| Message ID | 20221201064805.2094474-1-raj.khem@gmail.com |
|---|---|
| State | Rejected |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | linux-ti: Drop unneeded update_data calls | expand |
NAK cmem is being removed: https://patchwork.yoctoproject.org/project/ti/patch/20221104224653.1223044-51-denis@denix.org/ ti-unpack is being patched already: https://patchwork.yoctoproject.org/project/ti/patch/20221125230020.5316-1-reatmon@ti.com/ It's just getting longer to get the patches merged due to other breakages in master...
On Thu, Dec 1, 2022 at 6:36 AM Denys Dmytriyenko <denis@denix.org> wrote: > > NAK > > cmem is being removed: > https://patchwork.yoctoproject.org/project/ti/patch/20221104224653.1223044-51-denis@denix.org/ > > ti-unpack is being patched already: > https://patchwork.yoctoproject.org/project/ti/patch/20221125230020.5316-1-reatmon@ti.com/ > > 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. > > -- > 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 <raj.khem@gmail.com> > > --- > > 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 > >
On 12/1/2022 11:40, Khem Raj wrote: > On Thu, Dec 1, 2022 at 6:36 AM Denys Dmytriyenko <denis@denix.org> wrote: >> >> NAK >> >> cmem is being removed: >> https://patchwork.yoctoproject.org/project/ti/patch/20221104224653.1223044-51-denis@denix.org/ >> >> ti-unpack is being patched already: >> https://patchwork.yoctoproject.org/project/ti/patch/20221125230020.5316-1-reatmon@ti.com/ >> >> 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 <raj.khem@gmail.com> >>> --- >>> 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 >>> >>> >>> >>> -=-=-=-=-=-=-=-=-=-=-=- >>> 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: meta-ti+owner@lists.yoctoproject.org >>> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com] >>> -=-=-=-=-=-=-=-=-=-=-=- >>>
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 ? On Thu, Dec 1, 2022 at 12:48 PM Ryan Eatmon <reatmon@ti.com> wrote: > > > On 12/1/2022 11:40, Khem Raj wrote: > > On Thu, Dec 1, 2022 at 6:36 AM Denys Dmytriyenko <denis@denix.org> wrote: > >> > >> NAK > >> > >> cmem is being removed: > >> https://patchwork.yoctoproject.org/project/ti/patch/20221104224653.1223044-51-denis@denix.org/ > >> > >> ti-unpack is being patched already: > >> https://patchwork.yoctoproject.org/project/ti/patch/20221125230020.5316-1-reatmon@ti.com/ > >> > >> 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 <raj.khem@gmail.com> > >>> --- > >>> 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 > >>> > >>> > >>> > >>> -=-=-=-=-=-=-=-=-=-=-=- > >>> 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: meta-ti+owner@lists.yoctoproject.org > >>> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com] > >>> -=-=-=-=-=-=-=-=-=-=-=- > >>> > > -- > Ryan Eatmon reatmon@ti.com > ----------------------------------------- > Texas Instruments, Inc. - LCPD - MGTS
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. On 12/2/2022 12:57, Khem Raj wrote: > 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 ? > > On Thu, Dec 1, 2022 at 12:48 PM Ryan Eatmon <reatmon@ti.com> wrote: >> >> >> On 12/1/2022 11:40, Khem Raj wrote: >>> On Thu, Dec 1, 2022 at 6:36 AM Denys Dmytriyenko <denis@denix.org> wrote: >>>> >>>> NAK >>>> >>>> cmem is being removed: >>>> https://patchwork.yoctoproject.org/project/ti/patch/20221104224653.1223044-51-denis@denix.org/ >>>> >>>> ti-unpack is being patched already: >>>> https://patchwork.yoctoproject.org/project/ti/patch/20221125230020.5316-1-reatmon@ti.com/ >>>> >>>> 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 <raj.khem@gmail.com> >>>>> --- >>>>> 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 >>>>> >>>>> >>>>> >>>>> -=-=-=-=-=-=-=-=-=-=-=- >>>>> 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: meta-ti+owner@lists.yoctoproject.org >>>>> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com] >>>>> -=-=-=-=-=-=-=-=-=-=-=- >>>>> >> >> -- >> Ryan Eatmon reatmon@ti.com >> ----------------------------------------- >> Texas Instruments, Inc. - LCPD - MGTS
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)
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 <raj.khem@gmail.com> --- meta-ti-bsp/recipes-kernel/linux/cmem.inc | 2 -- meta-ti-extras/recipes-ti/includes/ti-unpack.inc | 1 - 2 files changed, 3 deletions(-)