-
Notifications
You must be signed in to change notification settings - Fork 121
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
layer.conf: Fix the syntax for SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS #157
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
54 changes: 54 additions & 0 deletions
54
recipes-graphics/libegt/libegt/0001-check-for-reallocarray-before-using-it.patch
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| From 6f0aafeccb99b6c92a48ee1c775afdc0f16a1ce6 Mon Sep 17 00:00:00 2001 | ||
| From: Khem Raj <[email protected]> | ||
| Date: Fri, 13 Dec 2019 08:46:39 -0800 | ||
| Subject: [PATCH] check for reallocarray before using it | ||
|
|
||
| in kplot there is a runtime check for reallocarray which actually wont | ||
| work in cross compile mode, luckily it does check for HAVE_REALLOCARRAY | ||
| before usng the results of runtime check. So here add a configure time | ||
| check for presense of reallocarray | ||
|
|
||
| Fixes | ||
|
|
||
| TOPDIR/build/tmp/work/core2-32-yoe-linux/libegt/0.8-r0/recipe-sysroot/usr/include/stdlib.h:559:14: error: exception specification in declaration does not match previous declaration | ||
| extern void *reallocarray (void *__ptr, size_t __nmemb, size_t __size) | ||
| ^ | ||
| ../external/kplot/compat.h:24:7: note: previous declaration is here | ||
| void *reallocarray(void *optr, size_t nmemb, size_t size); | ||
| ^ | ||
|
|
||
| Upstream-Status: Submitted [https://github.com/linux4sam/egt/pull/2] | ||
| Signed-off-by: Khem Raj <[email protected]> | ||
| --- | ||
| configure.ac | 2 +- | ||
| src/chart.cpp | 1 + | ||
| 2 files changed, 2 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/configure.ac b/configure.ac | ||
| index 81410c78..65873d8b 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -210,7 +210,7 @@ AC_TYPE_UINT8_T | ||
|
|
||
| # Checks for library functions. | ||
| AC_FUNC_MMAP | ||
| -AC_CHECK_FUNCS([floor memmove memset munmap select setlocale sqrt strerror]) | ||
| +AC_CHECK_FUNCS([floor memmove memset munmap reallocarray select setlocale sqrt strerror]) | ||
|
|
||
| AX_PTHREAD([LIBS="$PTHREAD_LIBS $LIBS" | ||
| CFLAGS="$CFLAGS $PTHREAD_CFLAGS"], AC_MSG_ERROR(Can not find pthreads. This is required.)) | ||
| diff --git a/src/chart.cpp b/src/chart.cpp | ||
| index 7578ea29..0faf65e8 100644 | ||
| --- a/src/chart.cpp | ||
| +++ b/src/chart.cpp | ||
| @@ -3,6 +3,7 @@ | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| +#include "config.h" | ||
| #include "compat.h" | ||
| #include "egt/chart.h" | ||
| #include "egt/detail/meta.h" | ||
| -- | ||
| 2.24.1 | ||
|
|
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
54 changes: 54 additions & 0 deletions
54
recipes-graphics/libplanes/libplanes/0001-Use-python3-by-default.patch
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| From ba4cc0d7b08efecd2b2bfb04c7a70187d7056304 Mon Sep 17 00:00:00 2001 | ||
| From: Khem Raj <[email protected]> | ||
| Date: Tue, 26 Nov 2019 11:18:39 -0800 | ||
| Subject: [PATCH] Use python3 by default | ||
|
|
||
| python2 is on its way out | ||
|
|
||
| Upstream-Status: Submitted [https://github.com/linux4sam/libplanes/pull/3] | ||
| Signed-off-by: Khem Raj <[email protected]> | ||
| --- | ||
| configure.ac | 2 +- | ||
| python/Makefile.am | 2 +- | ||
| scripts/planes-loop.py | 2 +- | ||
| 3 files changed, 3 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/configure.ac b/configure.ac | ||
| index 69e9478..ba0d2e7 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -129,7 +129,7 @@ if test "x$PYTHON" = xyes; then | ||
|
|
||
| if test "x$have_python" = "xyes"; then | ||
| AC_MSG_CHECKING([for Python site-packages path]) | ||
| - PYTHON_VERSION='2.7' | ||
| + PYTHON_VERSION=`$PKG_CONFIG --modversion python3` | ||
| PYTHON_SITE_PKG=${prefix}/lib/python${PYTHON_VERSION}/site-packages | ||
| AC_MSG_RESULT([$PYTHON_SITE_PKG]) | ||
| AC_SUBST([PYTHON_SITE_PKG]) | ||
| diff --git a/python/Makefile.am b/python/Makefile.am | ||
| index 63c737f..015fc26 100644 | ||
| --- a/python/Makefile.am | ||
| +++ b/python/Makefile.am | ||
| @@ -4,7 +4,7 @@ if HAVE_PYTHON | ||
| SWIG_SRC = planes.i | ||
|
|
||
| SWIG=swig | ||
| -PYTHON=python | ||
| +PYTHON=python3 | ||
|
|
||
| SWIG_V_GEN = $(swig_v_GEN_$(V)) | ||
| swig_v_GEN_ = $(swig_v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
| diff --git a/scripts/planes-loop.py b/scripts/planes-loop.py | ||
| index ded88d4..4c6904e 100755 | ||
| --- a/scripts/planes-loop.py | ||
| +++ b/scripts/planes-loop.py | ||
| @@ -1,4 +1,4 @@ | ||
| -#!/usr/bin/env python | ||
| +#!/usr/bin/env python3 | ||
|
|
||
| from mpio import * | ||
| import glob | ||
| -- | ||
| 2.24.0 | ||
|
|
||
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
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
33 changes: 33 additions & 0 deletions
33
recipes-utils/9bit/9bit/0001-include-asm-generic-ioctls.h.patch
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| From f35a891637ced372fa6f8b2e74c2bc4327ac3761 Mon Sep 17 00:00:00 2001 | ||
| From: Khem Raj <[email protected]> | ||
| Date: Wed, 18 Dec 2019 18:24:03 -0800 | ||
| Subject: [PATCH] include asm-generic/ioctls.h | ||
|
|
||
| This helps in including definitions for TCGETS2 TCSETSW2 and TCSETSF2 | ||
|
|
||
| Fixes | ||
|
|
||
| custom_termios2.c:14:19: error: use of undeclared identifier 'TCGETS2' return ioctl(fd, TCGETS2, termios); ^ custom_termios2.c:24:9: error: use of undeclared identifier 'TCSETS2' cmd = TCSETS2; ^ custom_termios2.c:27:9: error: use of undeclared identifier 'TCSETSW2' cmd = TCSETSW2; ^ custom_termios2.c:30:9: error: use of undeclared identifier 'TCSETSF2' cmd = TCSETSF2; | ||
| ^ | ||
| Upstream-Status: Submitted [https://github.com/linux4sam/9bit/pull/1] | ||
|
|
||
| Signed-off-by: Khem Raj <[email protected]> | ||
| --- | ||
| custom_termios2.c | 1 + | ||
| 1 file changed, 1 insertion(+) | ||
|
|
||
| diff --git a/custom_termios2.c b/custom_termios2.c | ||
| index 3eb3049..ba0171a 100644 | ||
| --- a/custom_termios2.c | ||
| +++ b/custom_termios2.c | ||
| @@ -5,6 +5,7 @@ | ||
| */ | ||
| #include "custom_termios2.h" | ||
| #include <asm/ioctls.h> | ||
| +#include <asm-generic/ioctls.h> | ||
| #include <errno.h> | ||
| #include <sys/ioctl.h> | ||
|
|
||
| -- | ||
| 2.24.1 | ||
|
|
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
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.
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 feel that this patch would better go directly to https://github.com/linux4sam/libplanes . What do you think?
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.
already done linux4sam/libplanes#3
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.
Thanks! I can merge the first commit while the pull request on libplanes gets accepted...
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.
well, we need the second commit for it to work with master OE-Core/yocto since py2 is being thrown out next week. So I would suggest taking both. If libplane commit requires changes after review, I will update the patch here as well accordingly.
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.
We need to make more tests with python3 and see if everything is fine, so I will postpone your pull request until then.