Upgrade 3.9.6 -> 3.9.7 #205
Conversation
|
@kraj |
|
also commit msg should be |
|
@kraj |
|
thanks in master-next now |
|
Fails to build without meta-python2 see [1] |
|
then should I add below code? inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "distutils", "", d)}inherit distutils python() { if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')} |
|
perhaps in the code replace python with python3 explicitly |
|
@kraj, |
|
Thats not public repo and the logs for that build are gone. I should have pointed at errors.yp.org location. Let me see if I can cherry-pick it again and reporduce the error. |
|
This patch is still wrong, it should still check for meta-python2 presence as such it will fail meta-oe build when meta-py2 is not present, we do not have dependency on meta-py2 |
|
okay, then could you share error logs? |
|
@kraj |
|
I changed my PR. |
| LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" | ||
|
|
||
| PV = "3.9.7+git${SRCPV}" | ||
| PR = "r0" |
There was a problem hiding this comment.
may I leave this line?
because I will use this variable later.
There was a problem hiding this comment.
For what? Nobody is doing manual PR bumps anymore, there is PRservice for that.
There was a problem hiding this comment.
I didn't know about it.
Thanks!
iipeace
force-pushed
the
master
branch
2 times, most recently
from
48e18b1
to
8cde7e0
Compare
|
I have merged it now thanks for persisting :) |
|
@iipeace This new version looks much better without the dependency on meta-python2, but rewritting the git history of master branch broke guider recipe e.g. in zeus branch of meta-openembedded where it now fails to fetch: before re-write after: Please restore master branch as it was to fix released versions of meta-oe and implement new changes on top of that - and you really shouldn't be moving the tags.. |
|
@shr-project, |
|
I've created fork of your repo at: It doesn't have to be the latest version of master you had before re-writting the history - so just rebase whatever you have on top of this older revision - you should be also able to find your own old history in git reflog (which should show where you did the filter-branch), that would be more accurate and really the latest before re-write. It should be there, but depends on how long expire interval you're using or if you called git expire since the re-write. For tags you can use something like: |
|
@shr-project, is this right? |
|
These 3.8.0, 3.9.6, 3.9.7 tags look like what is currently on your github, not the old versions matching with commits in old master branch. Did you forget to run "git fetch --tags shr"? You can easily check with From meta-oe perspective it these 3 SRCREVs b433f3805674ef4588c1a161986c74eeac6a48e7 (zeus and warrior) fef25c41efb9bde0614ea477d0b90bd9565ae0b4 (dunfell) and c87269d6d4669d12c99a2a7b9b07c39a5dd24ac6 (master). The first 2 exist only in the "original" master. The c87269d6d4669d12c99a2a7b9b07c39a5dd24ac6 currently in master only in the re-written master, so the recipe in meta-oe will need and SRCREV update again once you push the rebased branch. |
|
@shr-project, ''' |
|
These tags match with what I wrote 3 comments above (#205 (comment)), so it's better because they match with the old ones. But it doesn't show anything about your new master branch. |
|
@shr-project, |
|
Yes, if you did it correctly (use "git branch --contains" to confirm as explained before) it will fix the build issues in warrior, zeus, dunfell branches. For master you will probably need to submit another SRCREV update to use corresponding SRCREV in the new branch. |
|
Please push this as new pull request |
|
@shr-project, @kraj, |
What? |
License-Update: Copyright year updated to 2022.
Changelog:
==========
Dropped support for legacy Pythons (2.7, 3.6 or older).
Switched CI to GitHub Actions.
Removed dependency on the py library (that was not properly specified as a dependency anyway).
Fix skipping test in test_utils.py if appropriate VCS not available. Also fix typo. Contributed by Sam James in openembedded#211.
Added support for pytest 7.2.0 by using pytest.hookimpl and pytest.hookspec to configure hooks. Contributed by Florian Bruhin in openembedded#224.
Now no save is attempted if --benchmark-disable is used. Fixes openembedded#205. Contributed by Friedrich Delgado in openembedded#207.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
License-Update: Copyright year updated to 2022.
Changelog:
==========
Dropped support for legacy Pythons (2.7, 3.6 or older).
Switched CI to GitHub Actions.
Removed dependency on the py library (that was not properly specified as a dependency anyway).
Fix skipping test in test_utils.py if appropriate VCS not available. Also fix typo. Contributed by Sam James in openembedded#211.
Added support for pytest 7.2.0 by using pytest.hookimpl and pytest.hookspec to configure hooks. Contributed by Florian Bruhin in openembedded#224.
Now no save is attempted if --benchmark-disable is used. Fixes openembedded#205. Contributed by Friedrich Delgado in openembedded#207.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
License-Update: Copyright year updated to 2022.
Changelog:
==========
Dropped support for legacy Pythons (2.7, 3.6 or older).
Switched CI to GitHub Actions.
Removed dependency on the py library (that was not properly specified as a dependency anyway).
Fix skipping test in test_utils.py if appropriate VCS not available. Also fix typo. Contributed by Sam James in openembedded#211.
Added support for pytest 7.2.0 by using pytest.hookimpl and pytest.hookspec to configure hooks. Contributed by Florian Bruhin in openembedded#224.
Now no save is attempted if --benchmark-disable is used. Fixes openembedded#205. Contributed by Friedrich Delgado in openembedded#207.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Peace Lee iipeace5@gmail.com