-
Notifications
You must be signed in to change notification settings - Fork 725
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Drop PR = r0 is default.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
may I leave this line?
because I will use this variable later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For what? Nobody is doing manual PR bumps anymore, there is PRservice for that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't know about it.
Thanks!
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>
* Fix building documentation in build directory. Thanks Michael Tokarev * Updated the configure script for split openssl directories. * Fix for windows compile; asctime_r compat, search for inet_ntop in ws2_32, avoid double decl of inet_ntop, check for symlink call, include config.h in edns.c, have socket compare use correct signedness, add -u repo option to makewin.sh, fix quoting in makewin.sh and check return value of bind and connect in net.c for failure instead of a socket type. And fix to install .exe files. * Fix to compile with OpenSSL 3.2. Update acx_nlnetlabs.m4 to 48. * Fix to compile DLLs, and pick out of the lib64 dir, and include libssp-0.dll and ldns-config. * bugfix openembedded#237: Resolver uses nameserver commented out in /etc/resolv.conf. Thanks grembo. * Added RESINFO rrtype. * Added WALLET rrtype. * PR openembedded#241: Fix coverity cited problems. Thanks Enji Cooper. * PR openembedded#233: Several Python SWIG issues. Thanks Florian Weimer. * PR openembedded#231: const ldns_rdf * typemap fixes to support swig-4.2.0 Thanks William S Fulton * PR openembedded#227: keys.c: fix build with libressl >= 3.8.1 Thanks Fabrice Fontaine * PR openembedded#224: Portable executable progs don't underlink to libldns Thanks Ørjan Malde * PR openembedded#216: Update declaration for function with no argument Thanks Ed Maste * PR openembedded#214: fix the build in FreeBSD's base system Thanks Pierre Pronchery and Dag-Erling Smørgrav * PR openembedded#206: improve 'next-label' algorithm in ldns-walk Thanks Jelte Jansen * PR openembedded#205: Add functions to extract RFC 8914 extended errors Thanks Roland van Rijswijk-Deij * PR openembedded#203: Expand CI: Cygwin, BSDs, musl libc, 32-bit, and big-endian Thanks Felipe Gasper * PR openembedded#191: 16-unit-tests-edns: Fix leak & warnings Thanks Felipe Gasper * Added NXNAME rrtype. * PR openembedded#242: Openssl no engine improved support openembedded#242 Thanks Petr Menšík Detailed Changes [1] Fix buildpaths QA errors while here [1] NLnetLabs/ldns@1.8.3...1.8.4 Signed-off-by: Khem Raj <raj.khem@gmail.com>
Changelog: =========== - Merge branch 'stickz-throttle-increase' - Increase max throttle speed to 33 gigabits - Remove decision structure for popcount_wrapper - Merge branch 'kannibalox-feature/fast-delegation' - Fix double insert - Speed up delegating by returning multiple request assignments at once - Allow 10 gigabit speed throttles - Fix memory access crash with socket_address object - Add is_initialized() API - configure: Define _GNU_SOURCE when checking for pthread_setname_np - Create FUNDING.yml - Updated and cleaned up automake. (openembedded#224) - Removed obsolete files. - Added ipv6 options. - Detect ip address. - Added '--disable-execinfo' option to configure. - Fixed issue with multiple connections from NAT not working. - Improved backtrace error checking. - Added option to disable pthread_setname_np. - Replaced custom execinfo autoconf test. - Changes automake required files. - Refactor make process. (openembedded#207) - Consolidate make script to optimize build. (openembedded#206) - Fix log format so GCC can check it. (openembedded#205) - Fix compiler warnings. (openembedded#204) - Fix for inotify missing quickly renamed files (openembedded#203) - libtorrent.pc.in: add Libs.Private (openembedded#202) - Backport changes from feature-bind. (openembedded#200) - Merge pull request openembedded#195 from Nicholi/log_append - Removed log append function. Added append parameter with default value (false) to log_open_file functions. - Allow logs to be appended rather than overwritten. 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