Message ID | 20241209213948.2377-1-mail@michael-fitzmayer.de |
---|---|
State | Under Review |
Headers | show |
Series | [meta-oe] canopenterm: fix number of arguments check in API function | expand |
the patch needs some tags added e.g. Upstream-Status, see https://valkyrie.yoctoproject.org/#/builders/81/builds/199/steps/14/logs/errors On Mon, Dec 9, 2024 at 1:40 PM Michael Fitzmayer via lists.openembedded.org <mail=michael-fitzmayer.de@lists.openembedded.org> wrote: > > Signed-off-by: Michael Fitzmayer <mail@michael-fitzmayer.de> > --- > ...r-of-arguments-check-in-API-function.patch | 23 +++++++++++++++++++ > .../canopenterm/canopenterm_1.0.10.bb | 4 +++- > 2 files changed, 26 insertions(+), 1 deletion(-) > create mode 100644 meta-oe/recipes-extended/canopenterm/canopenterm/0001-fix-number-of-arguments-check-in-API-function.patch > > diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm/0001-fix-number-of-arguments-check-in-API-function.patch b/meta-oe/recipes-extended/canopenterm/canopenterm/0001-fix-number-of-arguments-check-in-API-function.patch > new file mode 100644 > index 000000000..aba139ff5 > --- /dev/null > +++ b/meta-oe/recipes-extended/canopenterm/canopenterm/0001-fix-number-of-arguments-check-in-API-function.patch > @@ -0,0 +1,23 @@ > +From 02e8b19d4090809deee11bf6801c0444c38fe4d2 Mon Sep 17 00:00:00 2001 > +From: Michael Fitzmayer <mail@michael-fitzmayer.de> > +Date: Mon, 9 Dec 2024 22:30:03 +0100 > +Subject: [PATCH] canopenterm: fix number of arguments check in API function > + > +Signed-off-by: Michael Fitzmayer <mail@michael-fitzmayer.de> > +--- > + src/api/python_test_report.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/api/python_test_report.c b/src/api/python_test_report.c > +index ff7b31e..1b1fc4a 100644 > +--- a/src/api/python_test_report.c > ++++ b/src/api/python_test_report.c > +@@ -69,7 +69,7 @@ bool py_test_eds_file(int argc, py_Ref argv) > + (void)argc; > + (void)argv; > + > +- PY_CHECK_ARGC(2); > ++ PY_CHECK_ARGC(3); > + > + node_id = py_toint(py_arg(0)); > + file_name = py_tostr(py_arg(1)); > diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb > index b15a36330..81ba15fab 100644 > --- a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb > +++ b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb > @@ -15,7 +15,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=10e84ea70e8c3a1fbc462f5424806474" > > DEPENDS = "cjson libinih libsdl2 lua libsocketcan pocketpy" > > -SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main" > +SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main \ > + file://0001-fix-number-of-arguments-check-in-API-function.patch \ > + " > > SRCREV = "e0760b2e9657907e691be4df384ca7617109635d" > > -- > 2.39.5 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#114257): https://lists.openembedded.org/g/openembedded-devel/message/114257 > Mute This Topic: https://lists.openembedded.org/mt/110015092/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
The patch is upstream, and I'm actively working on the next version, expected in 2-4 weeks. This change is a minor fix for a non-critical bug noticed after I released the last tagged version.
I will have a look at it. But in hindsight, it would probably make more sense for me to finish the next release first.
Hopefully, I’ll have understood and integrated Ptest by then.
-----Original Message-----
From: Khem Raj <raj.khem@gmail.com>
Sent: 10 December 2024 22:43
To: mail@michael-fitzmayer.de
Cc: openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [meta-oe][PATCH] canopenterm: fix number of arguments check in API function
the patch needs some tags added e.g. Upstream-Status, see https://valkyrie.yoctoproject.org/#/builders/81/builds/199/steps/14/logs/errors
On Thu, Dec 12, 2024 at 11:57 AM Michael Fitzmayer via lists.openembedded.org <mail=michael-fitzmayer.de@lists.openembedded.org> wrote: > > The patch is upstream, and I'm actively working on the next version, expected in 2-4 weeks. This change is a minor fix for a non-critical bug noticed after I released the last tagged version. > > I will have a look at it. But in hindsight, it would probably make more sense for me to finish the next release first. Ok thats fine. I will drop this one for now. > > Hopefully, I’ll have understood and integrated Ptest by then. Even better. > > -----Original Message----- > From: Khem Raj <raj.khem@gmail.com> > Sent: 10 December 2024 22:43 > To: mail@michael-fitzmayer.de > Cc: openembedded-devel@lists.openembedded.org > Subject: Re: [oe] [meta-oe][PATCH] canopenterm: fix number of arguments check in API function > > the patch needs some tags added e.g. Upstream-Status, see https://valkyrie.yoctoproject.org/#/builders/81/builds/199/steps/14/logs/errors > > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#114299): https://lists.openembedded.org/g/openembedded-devel/message/114299 > Mute This Topic: https://lists.openembedded.org/mt/110015092/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm/0001-fix-number-of-arguments-check-in-API-function.patch b/meta-oe/recipes-extended/canopenterm/canopenterm/0001-fix-number-of-arguments-check-in-API-function.patch new file mode 100644 index 000000000..aba139ff5 --- /dev/null +++ b/meta-oe/recipes-extended/canopenterm/canopenterm/0001-fix-number-of-arguments-check-in-API-function.patch @@ -0,0 +1,23 @@ +From 02e8b19d4090809deee11bf6801c0444c38fe4d2 Mon Sep 17 00:00:00 2001 +From: Michael Fitzmayer <mail@michael-fitzmayer.de> +Date: Mon, 9 Dec 2024 22:30:03 +0100 +Subject: [PATCH] canopenterm: fix number of arguments check in API function + +Signed-off-by: Michael Fitzmayer <mail@michael-fitzmayer.de> +--- + src/api/python_test_report.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/api/python_test_report.c b/src/api/python_test_report.c +index ff7b31e..1b1fc4a 100644 +--- a/src/api/python_test_report.c ++++ b/src/api/python_test_report.c +@@ -69,7 +69,7 @@ bool py_test_eds_file(int argc, py_Ref argv) + (void)argc; + (void)argv; + +- PY_CHECK_ARGC(2); ++ PY_CHECK_ARGC(3); + + node_id = py_toint(py_arg(0)); + file_name = py_tostr(py_arg(1)); diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb index b15a36330..81ba15fab 100644 --- a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb +++ b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb @@ -15,7 +15,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=10e84ea70e8c3a1fbc462f5424806474" DEPENDS = "cjson libinih libsdl2 lua libsocketcan pocketpy" -SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main" +SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main \ + file://0001-fix-number-of-arguments-check-in-API-function.patch \ + " SRCREV = "e0760b2e9657907e691be4df384ca7617109635d"
Signed-off-by: Michael Fitzmayer <mail@michael-fitzmayer.de> --- ...r-of-arguments-check-in-API-function.patch | 23 +++++++++++++++++++ .../canopenterm/canopenterm_1.0.10.bb | 4 +++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/canopenterm/canopenterm/0001-fix-number-of-arguments-check-in-API-function.patch