Merge mickledore to master for fully synchronized #195
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk>
…kledore (#176) * Mickledore support (#164) * conf/layer.conf: Add mickledore to LAYERSERIES_COMPAT Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> * mono: Fix early parsing errors for mono 4.x and 5.x versions Apparently, PV is unset when mono_workspace_version() is first used. Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> --------- Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> * msbuild: Depend on curl-native and ca-certificates-native (#165) * Msbuild replace libhostfxr with dotnet with fixes (#166) * CI_github: Update CI to Node 16 to remove warnings Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk> * CI_github: Update master build branch to langdale Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk> * Fix python3-pythonnet recipe build for langdale (#169) * Fix python3-pythonnet recipe build for langdale * Try to fix compiling task of python3-pythonnet * Refactoring pythonnet and clr_loader recipe * dotnet: add dotnet v7.0.202 (#167) Signed-off-by: Ben Fekih, Hichem <hichem.benfekih@ifm.com> * remove dotnet v3.1.11 and update dotnet 6 to 6.0.15 (#171) * CI_github: Add dotnet v7 to CI build matrix Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk> * Add summary for python3-pythonnet and python3-clr-loader recipes (#175) * Fix python3-pythonnet recipe build for langdale * Try to fix compiling task of python3-pythonnet * Refactoring pythonnet and clr_loader recipe * Add summary for python3-pythonnet and python3-clr-loader recipe * CI_github: Trigger on push to mickledore and build mickledore branch Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk> * Dummy commit to trigger a new CI build * Fix layer compatibility for mickledore --------- Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk> Signed-off-by: Ben Fekih, Hichem <hichem.benfekih@ifm.com> Co-authored-by: Zoltán Böszörményi <zboszor@gmail.com> Co-authored-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk> Co-authored-by: Hichem <hichem.benfekih@ifm.com>
* Mickledore support (#164) * conf/layer.conf: Add mickledore to LAYERSERIES_COMPAT Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> * mono: Fix early parsing errors for mono 4.x and 5.x versions Apparently, PV is unset when mono_workspace_version() is first used. Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> --------- Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> * msbuild: Depend on curl-native and ca-certificates-native (#165) * Msbuild replace libhostfxr with dotnet with fixes (#166) * CI_github: Update CI to Node 16 to remove warnings Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk> * CI_github: Update master build branch to langdale Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk> * Fix python3-pythonnet recipe build for langdale (#169) * Fix python3-pythonnet recipe build for langdale * Try to fix compiling task of python3-pythonnet * Refactoring pythonnet and clr_loader recipe * dotnet: add dotnet v7.0.202 (#167) Signed-off-by: Ben Fekih, Hichem <hichem.benfekih@ifm.com> * remove dotnet v3.1.11 and update dotnet 6 to 6.0.15 (#171) * CI_github: Add dotnet v7 to CI build matrix Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk> * Add summary for python3-pythonnet and python3-clr-loader recipes (#175) * Fix python3-pythonnet recipe build for langdale * Try to fix compiling task of python3-pythonnet * Refactoring pythonnet and clr_loader recipe * Add summary for python3-pythonnet and python3-clr-loader recipe * Fix mmap segfault on recent kernels (#183) * Add a patch to disable using MAP_32BIT to mmap() The patch was published at mono/mono#21651 (comment) It had to be slightly adapted to be applicable. Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> * Use oe_runmake for Mono 6.xx This allows parallel builds. Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> --------- Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> * 6.12.0.182 (#181) * mono: Add recipe for version 6.12.0.182 This is a recent stable release. Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> * Prefer version 6.12.0.182 Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> --------- Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> * Add msbuild 16.10.1 recipe (#184) * msbuild: Add recipe for version 16.10.1 Mono 6.12.0.182 needs the new msbuild version. Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> * conf/layer.conf: Prefer the newest msbuild version Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> * Bump CI to use Mono 6.12.0.182 Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> --------- Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> * libgdiplus: Use git:// SRC_URI (#186) * Update python3-pythonnet and python3-clr-loader (#187) * Update python3-pythonnet and python3-clr-loader * Fix sha256sum of python3-clr-loader and python3-pythonnet * Switch to using mickledore for master build (#188) Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk> * Prepare master to merge mickledore (#189) --------- Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk> Signed-off-by: Ben Fekih, Hichem <hichem.benfekih@ifm.com> Co-authored-by: Zoltán Böszörményi <zboszor@gmail.com> Co-authored-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk> Co-authored-by: Hichem <hichem.benfekih@ifm.com>
sync Mickledore to master
Master merge to mickledore finally
|
It won't let me merge commit I am afraid
|
|
Wtf, can you merge your |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge back mickledore to master to be fully synchronized. From now, it is recommended to commit any new things only in master then time to time should be merged to mickledore.
@ajlennon
I suggest to do not use squash merging just now, to avoid git crazy diffs analyzing between two branches.