Message ID | 20220422090602.21666-1-henning.schild@siemens.com |
---|---|
State | Accepted, archived |
Headers | show |
22.04.2022 12:05, Henning Schild wrote: > diff to v2: > add p2 before wic bump > > debian bookworm switched to python 3.10 recently, our versions of > bitbake and wic both have some issues with that new interpreter. All > these issues have been fixes in bitbake and OE, so all we need to do is > update the two tools in our tree. > > v1 was send as "[PATCH] bitbake: Update to 1.50.5 release", which is p1 > here, only later i found that wic also needs a bump to v2 added p2 > > If this series is applied we do not need "[PATCH] wic-img: use > python3.9 in bookworm", in case this one is applied before it should be > reverted after the version bumps. > > Henning Schild (3): > bitbake: Update to 1.50.5 release > wic: align our fork of common.wks.inc with wic version we carry > wic: Update to the latest revision > > bitbake/lib/bb/cache.py | 3 +- > bitbake/lib/bb/cooker.py | 30 +++++++- > bitbake/lib/bb/data_smart.py | 4 +- > bitbake/lib/bb/fetch2/__init__.py | 4 + > bitbake/lib/bb/fetch2/perforce.py | 2 +- > bitbake/lib/bb/fetch2/wget.py | 2 +- > bitbake/lib/bb/persist_data.py | 5 +- > bitbake/lib/bb/process.py | 2 +- > bitbake/lib/bb/runqueue.py | 34 ++++---- > bitbake/lib/bb/server/process.py | 2 +- > bitbake/lib/bb/tests/fetch.py | 35 +++++---- > bitbake/lib/bb/utils.py | 13 +++- > bitbake/lib/hashserv/server.py | 4 +- > bitbake/lib/toaster/tests/builds/buildtest.py | 2 +- > .../lib/wic/canned-wks/common-isar.wks.inc | 2 +- > .../wic/plugins/source/bootimg-efi-isar.py | 77 ++++++++++++++++--- > .../wic/plugins/source/bootimg-pcbios-isar.py | 6 +- > scripts/lib/wic/canned-wks/common.wks.inc | 2 +- > scripts/lib/wic/canned-wks/directdisk-gpt.wks | 2 +- > scripts/lib/wic/canned-wks/mkefidisk.wks | 2 +- > scripts/lib/wic/engine.py | 6 +- > scripts/lib/wic/help.py | 10 ++- > scripts/lib/wic/ksparser.py | 8 +- > scripts/lib/wic/misc.py | 4 +- > scripts/lib/wic/partition.py | 25 ++++-- > scripts/lib/wic/pluginbase.py | 8 +- > scripts/lib/wic/plugins/imager/direct.py | 11 ++- > scripts/lib/wic/plugins/source/bootimg-efi.py | 74 +++++++++++++++--- > .../lib/wic/plugins/source/bootimg-pcbios.py | 6 +- > scripts/lib/wic/plugins/source/rawcopy.py | 35 ++++++++- > scripts/lib/wic/plugins/source/rootfs.py | 2 +- > scripts/wic | 9 ++- > 32 files changed, 321 insertions(+), 110 deletions(-) Looks good, will perform CI tests and merge ASAP.
Am Fri, 22 Apr 2022 12:57:22 +0300 schrieb Anton Mikanovich <amikan@ilbers.de>: > 22.04.2022 12:05, Henning Schild wrote: > > diff to v2: > > add p2 before wic bump > > > > debian bookworm switched to python 3.10 recently, our versions of > > bitbake and wic both have some issues with that new interpreter. All > > these issues have been fixes in bitbake and OE, so all we need to > > do is update the two tools in our tree. > > > > v1 was send as "[PATCH] bitbake: Update to 1.50.5 release", which > > is p1 here, only later i found that wic also needs a bump to v2 > > added p2 > > > > If this series is applied we do not need "[PATCH] wic-img: use > > python3.9 in bookworm", in case this one is applied before it > > should be reverted after the version bumps. > > > > Henning Schild (3): > > bitbake: Update to 1.50.5 release > > wic: align our fork of common.wks.inc with wic version we carry > > wic: Update to the latest revision > > > > bitbake/lib/bb/cache.py | 3 +- > > bitbake/lib/bb/cooker.py | 30 +++++++- > > bitbake/lib/bb/data_smart.py | 4 +- > > bitbake/lib/bb/fetch2/__init__.py | 4 + > > bitbake/lib/bb/fetch2/perforce.py | 2 +- > > bitbake/lib/bb/fetch2/wget.py | 2 +- > > bitbake/lib/bb/persist_data.py | 5 +- > > bitbake/lib/bb/process.py | 2 +- > > bitbake/lib/bb/runqueue.py | 34 ++++---- > > bitbake/lib/bb/server/process.py | 2 +- > > bitbake/lib/bb/tests/fetch.py | 35 +++++---- > > bitbake/lib/bb/utils.py | 13 +++- > > bitbake/lib/hashserv/server.py | 4 +- > > bitbake/lib/toaster/tests/builds/buildtest.py | 2 +- > > .../lib/wic/canned-wks/common-isar.wks.inc | 2 +- > > .../wic/plugins/source/bootimg-efi-isar.py | 77 > > ++++++++++++++++--- .../wic/plugins/source/bootimg-pcbios-isar.py | > > 6 +- scripts/lib/wic/canned-wks/common.wks.inc | 2 +- > > scripts/lib/wic/canned-wks/directdisk-gpt.wks | 2 +- > > scripts/lib/wic/canned-wks/mkefidisk.wks | 2 +- > > scripts/lib/wic/engine.py | 6 +- > > scripts/lib/wic/help.py | 10 ++- > > scripts/lib/wic/ksparser.py | 8 +- > > scripts/lib/wic/misc.py | 4 +- > > scripts/lib/wic/partition.py | 25 ++++-- > > scripts/lib/wic/pluginbase.py | 8 +- > > scripts/lib/wic/plugins/imager/direct.py | 11 ++- > > scripts/lib/wic/plugins/source/bootimg-efi.py | 74 > > +++++++++++++++--- .../lib/wic/plugins/source/bootimg-pcbios.py | > > 6 +- scripts/lib/wic/plugins/source/rawcopy.py | 35 ++++++++- > > scripts/lib/wic/plugins/source/rootfs.py | 2 +- > > scripts/wic | 9 ++- > > 32 files changed, 321 insertions(+), 110 deletions(-) > > Looks good, will perform CI tests and merge ASAP. Cool, fingers crossed. At some point we should remove some if not all of the KFAIL, but that is a maintainers choice and another patch series. Henning
22.04.2022 12:05, Henning Schild wrote: > diff to v2: > add p2 before wic bump > > debian bookworm switched to python 3.10 recently, our versions of > bitbake and wic both have some issues with that new interpreter. All > these issues have been fixes in bitbake and OE, so all we need to do is > update the two tools in our tree. > > v1 was send as "[PATCH] bitbake: Update to 1.50.5 release", which is p1 > here, only later i found that wic also needs a bump to v2 added p2 > > If this series is applied we do not need "[PATCH] wic-img: use > python3.9 in bookworm", in case this one is applied before it should be > reverted after the version bumps. > > Henning Schild (3): > bitbake: Update to 1.50.5 release > wic: align our fork of common.wks.inc with wic version we carry > wic: Update to the latest revision > > bitbake/lib/bb/cache.py | 3 +- > bitbake/lib/bb/cooker.py | 30 +++++++- > bitbake/lib/bb/data_smart.py | 4 +- > bitbake/lib/bb/fetch2/__init__.py | 4 + > bitbake/lib/bb/fetch2/perforce.py | 2 +- > bitbake/lib/bb/fetch2/wget.py | 2 +- > bitbake/lib/bb/persist_data.py | 5 +- > bitbake/lib/bb/process.py | 2 +- > bitbake/lib/bb/runqueue.py | 34 ++++---- > bitbake/lib/bb/server/process.py | 2 +- > bitbake/lib/bb/tests/fetch.py | 35 +++++---- > bitbake/lib/bb/utils.py | 13 +++- > bitbake/lib/hashserv/server.py | 4 +- > bitbake/lib/toaster/tests/builds/buildtest.py | 2 +- > .../lib/wic/canned-wks/common-isar.wks.inc | 2 +- > .../wic/plugins/source/bootimg-efi-isar.py | 77 ++++++++++++++++--- > .../wic/plugins/source/bootimg-pcbios-isar.py | 6 +- > scripts/lib/wic/canned-wks/common.wks.inc | 2 +- > scripts/lib/wic/canned-wks/directdisk-gpt.wks | 2 +- > scripts/lib/wic/canned-wks/mkefidisk.wks | 2 +- > scripts/lib/wic/engine.py | 6 +- > scripts/lib/wic/help.py | 10 ++- > scripts/lib/wic/ksparser.py | 8 +- > scripts/lib/wic/misc.py | 4 +- > scripts/lib/wic/partition.py | 25 ++++-- > scripts/lib/wic/pluginbase.py | 8 +- > scripts/lib/wic/plugins/imager/direct.py | 11 ++- > scripts/lib/wic/plugins/source/bootimg-efi.py | 74 +++++++++++++++--- > .../lib/wic/plugins/source/bootimg-pcbios.py | 6 +- > scripts/lib/wic/plugins/source/rawcopy.py | 35 ++++++++- > scripts/lib/wic/plugins/source/rootfs.py | 2 +- > scripts/wic | 9 ++- > 32 files changed, 321 insertions(+), 110 deletions(-) Applied to next, thanks.