Re: [OE-core] [PATCH v4] openssh: Add PACKAGECONFIG option to customize sshd mode
Hi Alex,
Thanks for your suggestion!
Both sshd.socket and sshd.service belong to openssh-sshd package, so using
SYSTEMD_AUTO_ENABLE can't enable one of them, it just can enable both or
disable both.
Thanks,
From: Alex Kiernan
Sent: Wednesday, December 6, 2023 18:37
To: Yu, Mingli
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH v4] openssh: Add PACKAGECONFIG option to
customize sshd mode
CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know
the content is safe.
On Wed, Dec 6, 2023 at 8:56 AM Yu, Mingli wrote:
>
> From: Mingli Yu
>
> Add systemd-sshd-socket-mode PACKAGECONFIG option to choose sshd.socket
> and systemd-sshd-service-mode PACKAGECONFIG option to choose installing
> sshd.service.
>
> The systemd-sshd-socket-mode PACKAGECONFIG option is enabled by default
> and user can customize the above two PACKAGECONFIG option to choose the
> sshd mode.
>
> Signed-off-by: Mingli Yu
> ---
> Changed in v3:
> rebase based on
> https://lore.kernel.org/all/20231201140947.792594-1-xiangyu.c...@eng.windriver.com/
>
> Changed in v4:
> make it possible to install both sshd.socket and sshd.service
I'm wondering if we should make SYSTEMD_AUTO_ENABLE settable per
service, so you could then install both and manage which one is active
with a preset.
> .../openssh/openssh_9.5p1.bb | 25 ++-
> 1 file changed, 19 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> index 2c1c821ea9..58dd030c64 100644
> --- a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> @@ -50,16 +50,20 @@ INITSCRIPT_NAME:${PN}-sshd = "sshd"
> INITSCRIPT_PARAMS:${PN}-sshd = "defaults 9"
>
> SYSTEMD_PACKAGES = "${PN}-sshd"
> -SYSTEMD_SERVICE:${PN}-sshd = "sshd.socket sshd.service"
> +SYSTEMD_SERVICE:${PN}-sshd =
> "${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','sshd.socket',
> '', d)}
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','sshd.service',
> '', d)}"
>
> inherit autotools-brokensep ptest pkgconfig
>
> -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> +# systemd-sshd-socket-mode means sshd.socket and systemd-sshd-service-mode
> +# corresponding to sshd.service
> +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}
> systemd-sshd-socket-mode"
> PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5"
> PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns"
> PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
> PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat"
> PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd"
> +PACKAGECONFIG[systemd-sshd-socket-mode] = ""
> +PACKAGECONFIG[systemd-sshd-service-mode] = ""
>
> EXTRA_AUTORECONF += "--exclude=aclocal"
>
> @@ -124,15 +128,24 @@ do_install:append () {
> echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >>
> ${D}${sysconfdir}/ssh/sshd_config_readonly
>
> install -d ${D}${systemd_system_unitdir}
> - install -c -m 0644 ${WORKDIR}/sshd.socket
> ${D}${systemd_system_unitdir}
> - install -c -m 0644 ${WORKDIR}/sshd.service
> ${D}${systemd_system_unitdir}
> - install -c -m 0644 ${WORKDIR}/sshd@.service
> ${D}${systemd_system_unitdir}
> + if
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','true','false',d)};
> then
> + install -c -m 0644 ${WORKDIR}/sshd.socket
> ${D}${systemd_system_unitdir}
> + install -c -m 0644 ${WORKDIR}/sshd@.service
> ${D}${systemd_system_unitdir}
> + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
> + -e 's,@SBINDIR@,${sbindir},g' \
> + -e 's,@BINDIR@,${bindir},g' \
> + -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
> +${D}${systemd_system_unitdir}/sshd.socket
> + fi
> + if
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','true','false',d)};
> then
> + install -c -m 0644 ${WORKDIR}/sshd.service
> ${D}${systemd_system_unitdir}
> + fi
> install -c -m 0644 ${WORKDIR}/sshdgenkeys.service
> ${D}${systemd_system_unitdir}
> sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
> -e 's,@SBINDIR@,${sbindir},g' \
> -e 's,@BINDIR@,${bindir},g' \
> -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
> - ${D}${systemd_system_unitdir}/sshd.socket
> ${D}${systemd_system_unitdir}/*.service
> + ${D}${systemd_system_unitdir}/*.service
>
> sed -i -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
> ${D}${sysconfdir}/init.d/sshd
> --
> 2.25.1
>
>
>
>
--
Alex Kiernan
Re: [OE-core] [PATCH v2] openssh: Add PACKAGECONFIG option to customize sshd mode
Hi Peter,
Thanks very much for your comments!
Please use v4([OE-core] [PATCH v4] openssh: Add PACKAGECONFIG option to
customize sshd mode) to track the series.
Thanks,
From: Peter Kjellerstedt
Sent: Thursday, December 7, 2023 06:34
To: Yu, Mingli ;
openembedded-core@lists.openembedded.org
Subject: RE: [OE-core] [PATCH v2] openssh: Add PACKAGECONFIG option to
customize sshd mode
CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know
the content is safe.
> -Original Message-
> From: openembedded-core@lists.openembedded.org
> On Behalf Of Yu, Mingli
> Sent: den 5 december 2023 06:52
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH v2] openssh: Add PACKAGECONFIG option to customize
> sshd mode
>
> From: Mingli Yu
>
> Add systemd-sshd-socket-mode PACKAGECONFIG option to choose sshd.socket
> and systemd-sshd-service-mode PACKAGECONFIG option to choose installing
> sshd.service.
>
> The systemd-sshd-socket-mode PACKAGECONFIG option is enabled by default
> and user can customize the above two PACKAGECONFIG option to choose the
> sshd mode.
>
> Signed-off-by: Mingli Yu
> ---
> .../openssh/openssh_9.5p1.bb | 24 ++-
> 1 file changed, 18 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> index bbb8fb091a..a10f5c5a61 100644
> --- a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> @@ -50,16 +50,20 @@ INITSCRIPT_NAME:${PN}-sshd = "sshd"
> INITSCRIPT_PARAMS:${PN}-sshd = "defaults 9"
>
> SYSTEMD_PACKAGES = "${PN}-sshd"
> -SYSTEMD_SERVICE:${PN}-sshd = "sshd.socket sshd.service"
> +SYSTEMD_SERVICE:${PN}-sshd =
> "${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','sshd.socket',
> '', d)}
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','sshd.service',
> '', d)}"
>
> inherit autotools-brokensep ptest pkgconfig
> DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd',
> '', d)}"
>
> -PACKAGECONFIG ??= ""
> +# systemd-sshd-socket-mode means sshd.socket and systemd-sshd-service-mode
> +# corresponding to sshd.service
> +PACKAGECONFIG ??= " systemd-sshd-socket-mode"
Unnecessary leading space after the first quote.
> PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5"
> PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns"
> PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
> PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat"
> +PACKAGECONFIG[systemd-sshd-socket-mode] = ""
> +PACKAGECONFIG[systemd-sshd-service-mode] = ""
>
> EXTRA_AUTORECONF += "--exclude=aclocal"
>
> @@ -125,15 +129,23 @@ do_install:append () {
> echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >>
> ${D}${sysconfdir}/ssh/sshd_config_readonly
>
> install -d ${D}${systemd_system_unitdir}
> - install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_system_unitdir}
> - install -c -m 0644 ${WORKDIR}/sshd.service ${D}${systemd_system_unitdir}
> - install -c -m 0644 ${WORKDIR}/sshd@.service
> ${D}${systemd_system_unitdir}
> + if
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','true','false',d)};
> then
> + install -c -m 0644 ${WORKDIR}/sshd.socket
> ${D}${systemd_system_unitdir}
> + install -c -m 0644 ${WORKDIR}/sshd@.service
> ${D}${systemd_system_unitdir}
> + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
> + -e 's,@SBINDIR@,${sbindir},g' \
> + -e 's,@BINDIR@,${bindir},g' \
> + -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
> +${D}${systemd_system_unitdir}/sshd.socket
There is no need to duplicate the sed command here. The original
command below would take care of all the files that are actually
installed.
> + elif
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','true','false',d)};
> then
Are the PACKAGECONFIGs mutually exclusive? The `elif` indicates
that this is the case. If so, they should be marked as mutually
exclusive by changing them to:
PACKAGECONFIG[systemd-sshd-socket-mode] = ", systemd-sshd-service-mode"
PACKAGECONFIG[systemd-sshd-service-mode] = ", systemd-sshd-socket-mode"
Alternatively, if it is useful to be able to install both the
sshd.socket file and the sshd.service file at the same time, then
the `elif` should be changed to a `fi` and an `if`.
> + install -c -m 0644 ${WORKDIR}/sshd.service
> ${D}${systemd_system_unitdir}
> + fi
> install -c -m 0644 ${WORKDIR}/sshdgenkeys.service
> ${D}${systemd_system_unitdir}
> sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
> -e 's,@SBINDIR@,${sbindir},g' \
> -e 's,@BINDIR@,${bindir},g' \
> -e
[OE-core] [PATCH 1/2] sanity.conf: Require bitbake 2.6.1 for recent runqueue change
Require the presence of a recent change in bitbake 2.6.1 for runqueue
setscene dependency handling improvements.
Signed-off-by: Richard Purdie
---
meta/conf/sanity.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf
index 593419921f5..ebe71c632b8 100644
--- a/meta/conf/sanity.conf
+++ b/meta/conf/sanity.conf
@@ -3,7 +3,7 @@
# See sanity.bbclass
#
# Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "2.3.1"
+BB_MIN_VERSION = "2.6.1"
SANITY_ABIFILE = "${TMPDIR}/abi_version"
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191938):
https://lists.openembedded.org/g/openembedded-core/message/191938
Mute This Topic: https://lists.openembedded.org/mt/103024737/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/2] sstate: Remove unneeded code from setscene_depvalid() related to useradd
With recent changes to runqueue in bitbake, this horrible hack is no longer
needed
and we can drop it.
Signed-off-by: Richard Purdie
---
meta/classes-global/sstate.bbclass | 5 -
1 file changed, 5 deletions(-)
diff --git a/meta/classes-global/sstate.bbclass
b/meta/classes-global/sstate.bbclass
index 5b27a1f0f98..95d5803f17d 100644
--- a/meta/classes-global/sstate.bbclass
+++ b/meta/classes-global/sstate.bbclass
@@ -1117,11 +1117,6 @@ def setscene_depvalid(task, taskdependees, notneeded, d,
log=None):
if isNativeCross(taskdependees[dep][0]) and taskdependees[dep][1] in
['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm',
'do_packagedata', 'do_package', 'do_package_qa']:
continue
-# This is due to the [depends] in useradd.bbclass complicating matters
-# The logic *is* reversed here due to the way hard setscene
dependencies are injected
-if (taskdependees[task][1] == 'do_package' or taskdependees[task][1]
== 'do_populate_sysroot') and taskdependees[dep][0].endswith(('shadow-native',
'shadow-sysroot', 'base-passwd', 'pseudo-native')) and taskdependees[dep][1] ==
'do_populate_sysroot':
-continue
-
# Consider sysroot depending on sysroot tasks
if taskdependees[task][1] == 'do_populate_sysroot' and
taskdependees[dep][1] == 'do_populate_sysroot':
# Allow excluding certain recursive dependencies. If a recipe
needs it should add a
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191939):
https://lists.openembedded.org/g/openembedded-core/message/191939
Mute This Topic: https://lists.openembedded.org/mt/103024738/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][PATCH 1/1] go: ignore CVE-2023-45283 and CVE-2023-45284
On Mon, 2023-12-04 at 03:36 +, Soumya via lists.openembedded.org wrote: > From: Soumya Sambu > > These CVEs affect path handling on Windows. > > References: > https://nvd.nist.gov/vuln/detail/CVE-2023-45283 > https://nvd.nist.gov/vuln/detail/CVE-2023-45284 > https://security-tracker.debian.org/tracker/CVE-2023-45283 > https://security-tracker.debian.org/tracker/CVE-2023-45284 > > Signed-off-by: Soumya Sambu > --- > meta/recipes-devtools/go/go-1.20.10.inc | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/meta/recipes-devtools/go/go-1.20.10.inc > b/meta/recipes-devtools/go/go-1.20.10.inc > index 39509ed986..b240da3f86 100644 > --- a/meta/recipes-devtools/go/go-1.20.10.inc > +++ b/meta/recipes-devtools/go/go-1.20.10.inc > @@ -16,3 +16,6 @@ SRC_URI += "\ > file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ > " > SRC_URI[main.sha256sum] = > "72d2f51805c47150066c103754c75fddb2c19d48c9219fa33d1e46696c841dbb" > + > +# Microsoft Windows specific CVEs > +CVE_CHECK_IGNORE += "CVE-2023-45283 CVE-2023-45284" This should be using CVE_STATUS instead for master. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191937): https://lists.openembedded.org/g/openembedded-core/message/191937 Mute This Topic: https://lists.openembedded.org/mt/102964687/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2] openssh: Add PACKAGECONFIG option to customize sshd mode
> -Original Message-
> From: openembedded-core@lists.openembedded.org
> On Behalf Of Yu, Mingli
> Sent: den 5 december 2023 06:52
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH v2] openssh: Add PACKAGECONFIG option to customize
> sshd mode
>
> From: Mingli Yu
>
> Add systemd-sshd-socket-mode PACKAGECONFIG option to choose sshd.socket
> and systemd-sshd-service-mode PACKAGECONFIG option to choose installing
> sshd.service.
>
> The systemd-sshd-socket-mode PACKAGECONFIG option is enabled by default
> and user can customize the above two PACKAGECONFIG option to choose the
> sshd mode.
>
> Signed-off-by: Mingli Yu
> ---
> .../openssh/openssh_9.5p1.bb | 24 ++-
> 1 file changed, 18 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> index bbb8fb091a..a10f5c5a61 100644
> --- a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> @@ -50,16 +50,20 @@ INITSCRIPT_NAME:${PN}-sshd = "sshd"
> INITSCRIPT_PARAMS:${PN}-sshd = "defaults 9"
>
> SYSTEMD_PACKAGES = "${PN}-sshd"
> -SYSTEMD_SERVICE:${PN}-sshd = "sshd.socket sshd.service"
> +SYSTEMD_SERVICE:${PN}-sshd =
> "${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','sshd.socket',
> '', d)}
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','sshd.service',
> '', d)}"
>
> inherit autotools-brokensep ptest pkgconfig
> DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd',
> '', d)}"
>
> -PACKAGECONFIG ??= ""
> +# systemd-sshd-socket-mode means sshd.socket and systemd-sshd-service-mode
> +# corresponding to sshd.service
> +PACKAGECONFIG ??= " systemd-sshd-socket-mode"
Unnecessary leading space after the first quote.
> PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5"
> PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns"
> PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
> PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat"
> +PACKAGECONFIG[systemd-sshd-socket-mode] = ""
> +PACKAGECONFIG[systemd-sshd-service-mode] = ""
>
> EXTRA_AUTORECONF += "--exclude=aclocal"
>
> @@ -125,15 +129,23 @@ do_install:append () {
> echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >>
> ${D}${sysconfdir}/ssh/sshd_config_readonly
>
> install -d ${D}${systemd_system_unitdir}
> - install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_system_unitdir}
> - install -c -m 0644 ${WORKDIR}/sshd.service ${D}${systemd_system_unitdir}
> - install -c -m 0644 ${WORKDIR}/sshd@.service
> ${D}${systemd_system_unitdir}
> + if
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','true','false',d)};
> then
> + install -c -m 0644 ${WORKDIR}/sshd.socket
> ${D}${systemd_system_unitdir}
> + install -c -m 0644 ${WORKDIR}/sshd@.service
> ${D}${systemd_system_unitdir}
> + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
> + -e 's,@SBINDIR@,${sbindir},g' \
> + -e 's,@BINDIR@,${bindir},g' \
> + -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
> +${D}${systemd_system_unitdir}/sshd.socket
There is no need to duplicate the sed command here. The original
command below would take care of all the files that are actually
installed.
> + elif
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','true','false',d)};
> then
Are the PACKAGECONFIGs mutually exclusive? The `elif` indicates
that this is the case. If so, they should be marked as mutually
exclusive by changing them to:
PACKAGECONFIG[systemd-sshd-socket-mode] = ", systemd-sshd-service-mode"
PACKAGECONFIG[systemd-sshd-service-mode] = ", systemd-sshd-socket-mode"
Alternatively, if it is useful to be able to install both the
sshd.socket file and the sshd.service file at the same time, then
the `elif` should be changed to a `fi` and an `if`.
> + install -c -m 0644 ${WORKDIR}/sshd.service
> ${D}${systemd_system_unitdir}
> + fi
> install -c -m 0644 ${WORKDIR}/sshdgenkeys.service
> ${D}${systemd_system_unitdir}
> sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
> -e 's,@SBINDIR@,${sbindir},g' \
> -e 's,@BINDIR@,${bindir},g' \
> -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
> - ${D}${systemd_system_unitdir}/sshd.socket
> ${D}${systemd_system_unitdir}/*.service
> + ${D}${systemd_system_unitdir}/*.service
Keep it as it was.
>
> sed -i -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
> ${D}${sysconfdir}/init.d/sshd
> --
> 2.25.1
//Peter
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191936):
https://lists.openembedded.org/g/openembedded-core/message/191936
Mute This Topic:
Re: [OE-core][PATCH] openssh: shrinking to a new PACKAGECONFIG line to set systemd readiness notification support
> -Original Message-
> From: openembedded-core@lists.openembedded.org c...@lists.openembedded.org> On Behalf Of Xiangyu Chen
> Sent: den 4 december 2023 08:07
> To: Khem Raj
> Cc: quaresma.j...@gmail.com; openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core][PATCH] openssh: shrinking to a new PACKAGECONFIG line
> to set systemd readiness notification support
>
> On 12/2/23 02:53, Khem Raj wrote:
> > CAUTION: This email comes from a non Wind River email account!
> > Do not click links or open attachments unless you recognize the sender and
> > know the content is safe.
> >
> > On Fri, Dec 1, 2023 at 6:14 AM Xiangyu Chen
> > wrote:
> >> From: Xiangyu Chen
> >>
> >> Using PACKAGECONFIG line to set the patch of systemd readiness notification
> >> support, it can make the .bb file more clearly.
> >>
> >> Signed-off-by: Xiangyu Chen
> >> ---
> >> meta/recipes-connectivity/openssh/openssh_9.5p1.bb | 5 ++---
> >> 1 file changed, 2 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> >> b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> >> index bbb8fb091a..2c1c821ea9 100644
> >> --- a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> >> +++ b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> >> @@ -53,13 +53,13 @@ SYSTEMD_PACKAGES = "${PN}-sshd"
> >> SYSTEMD_SERVICE:${PN}-sshd = "sshd.socket sshd.service"
> >>
> >> inherit autotools-brokensep ptest pkgconfig
> >> -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd',
> >> '', d)}"
> >>
> >> -PACKAGECONFIG ??= ""
> >> +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> > This makes sense if someone would like to disable systemd support when
> > using systemd init system
> > which does not seem very likely. Is there anything else other than
> > cleanup that you are targeting with it ?
>
> Ah, yes, this commit apply other thread's comment (oe-core maillist
> #190593), due to that
>
> thread was filtered to another mail folder, when I read that comment,
> the patch has already applied
>
> to the master branch, so I create this commit to make a cleanup.
>
> > If so, I think the status quo is better.
I disagree. This looks exactly like a cleanup I would like to see
happen if I saw a recipe with those spread out configurations that
can be simplified to a single PACKAGECONFIG.
The commit subject is a bit odd though. I would change it to
something like:
systemd: Simplify configuration of systemd support
> >> PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5"
> >> PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns"
> >> PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
> >> PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat"
> >> +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd"
> >>
> >> EXTRA_AUTORECONF += "--exclude=aclocal"
> >>
> >> @@ -71,7 +71,6 @@ EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
> >> --sysconfdir=${sysconfdir}/ssh \
> >> --with-xauth=${bindir}/xauth \
> >> --disable-strip \
> >> -${@bb.utils.contains('DISTRO_FEATURES', 'systemd',
> >> '--with-systemd', '--without-systemd', d)} \
> >> "
> >>
> >> # musl doesn't implement wtmp/utmp and logwtmp
> >> --
> >> 2.25.1
//Peter
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191935):
https://lists.openembedded.org/g/openembedded-core/message/191935
Mute This Topic: https://lists.openembedded.org/mt/102915607/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] ldconfig-native: Add usrmerge support
> -Original Message-
> From: openembedded-core@lists.openembedded.org
> On Behalf Of Johannes Pointner via
> lists.openembedded.org
> Sent: den 1 december 2023 11:54
> To: openembedded-core@lists.openembedded.org
> Cc: Johannes Pointner
> Subject: [OE-core] [PATCH] ldconfig-native: Add usrmerge support
>
> If DISTRO_FEATURE usrmerge is enabled, SLIBDIR is just a symlink to LIBDIR,
> therefore don't add SLIBDIR for parsing in this case.
>
> Signed-off-by: Johannes Pointner
> ---
> .../ldconfig-add-usrmerge-support.patch | 37 +++
> .../glibc/ldconfig-native_2.12.1.bb | 1 +
> 2 files changed, 38 insertions(+)
> create mode 100644
> meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
>
> diff --git
> a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
>
> b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> new file mode 100644
> index 00..3041d433fd
> --- /dev/null
> +++
> b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> @@ -0,0 +1,37 @@
> +From 6e543f39f6bec6eb2e02eea02029c7f4ec533b66 Mon Sep 17 00:00:00 2001
> +From: Johannes Pointner
> +Date: Fri, 1 Dec 2023 11:02:39 +0100
> +Subject: [PATCH] ldconfig: add usrmerge support
> +
> +Check whether SLIBDIR is a symlink, which is the case if usrmerge
> +is enabled, and if so, ignore it.
> +
> +Upstream-Status: Inappropriate [embedded specific]
> +
> +Signed-off-by: Johannes Pointner
> +---
> + ldconfig.c | 8 +++-
> + 1 file changed, 7 insertions(+), 1 deletion(-)
> +
> +diff --git a/ldconfig.c b/ldconfig.c
> +index e826410..72ac67b 100644
> +--- a/ldconfig.c
> b/ldconfig.c
> +@@ -1371,10 +1371,16 @@ main (int argc, char **argv)
> +
> + if (!opt_only_cline)
> + {
> ++ struct stat buf;
> ++ int ret;
> + parse_conf (config_file, true);
> +
> + /* Always add the standard search paths. */
> +- add_system_dir (SLIBDIR);
> ++ /* Check whether SLIBDIR is a symlink, which is the case if usrmerge
> ++ is enabled, and if so, ignore it. */
> ++ ret = lstat(SLIBDIR ,);
> ++ if(ret == -1 || !S_ISLNK(buf.st_mode))
> ++add_system_dir (SLIBDIR);
> + if (strcmp (SLIBDIR, LIBDIR))
> + add_system_dir (LIBDIR);
Rather than blindly assuming that SLIBDIR being a symbolic link
means it is a link to LIBDIR, I would recommend to change the
strcmp() above to compare the paths after running them through
realpath(). E.g., something like:
add_system_dir (LIBDIR);
if (strcmp (LIBDIR, SLIBDIR)) {
const char *libdir = realpath (LIBDIR, NULL);
const char *slibdir = realpath (SLIBDIR, NULL);
if (strcmp(libdir, slibdir))
add_system_dir (SLIBDIR);
free (slibdir);
free (libdir);
}
This of course assumes LIBDIR is not a symbolic link to SLIBDIR,
but I doubt anyone does that...
> + add_system_dir (SLIBDIR32);
> diff --git a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
> b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
> index 4db67c3ad4..85fc87257d 100644
> --- a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
> +++ b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
> @@ -16,6 +16,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
> file://add-64-bit-flag-for-ELF64-entries.patch \
> file://no-aux-cache.patch \
> file://add-riscv-support.patch \
> + file://ldconfig-add-usrmerge-support.patch \
> "
>
>
> --
> 2.43.0
//Peter
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191934):
https://lists.openembedded.org/g/openembedded-core/message/191934
Mute This Topic: https://lists.openembedded.org/mt/102912756/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [nanbield][PATCH] oeqa/selftest/tinfoil: Add tests that parse virtual recipes
From: Peter Kjellerstedt
Running `devtool search gcc` would result in errors for virtual recipes.
The reason was the newly introduced :layer- override.
When tinfoil parsed the recipes using the parseRecipeFile() function, it
failed to properly identify the layername for virtual recipes, which
resulted in the errors.
Add tests that exercise these code paths through parseRecipeFile().
Signed-off-by: Peter Kjellerstedt
Signed-off-by: Alexandre Belloni
Signed-off-by: Richard Purdie
---
This depends on the corresponding patch sent to the bitbake-devel
list.
meta/lib/oeqa/selftest/cases/tinfoil.py | 25 -
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/tinfoil.py
b/meta/lib/oeqa/selftest/cases/tinfoil.py
index dd13c20402..21c8686b2a 100644
--- a/meta/lib/oeqa/selftest/cases/tinfoil.py
+++ b/meta/lib/oeqa/selftest/cases/tinfoil.py
@@ -48,6 +48,17 @@ class TinfoilTests(OESelftestTestCase):
rd = tinfoil.parse_recipe_file(best[3])
self.assertEqual(testrecipe, rd.getVar('PN'))
+def test_parse_virtual_recipe(self):
+with bb.tinfoil.Tinfoil() as tinfoil:
+tinfoil.prepare(config_only=False, quiet=2)
+testrecipe = 'nativesdk-gcc'
+best = tinfoil.find_best_provider(testrecipe)
+if not best:
+self.fail('Unable to find recipe providing %s' % testrecipe)
+rd = tinfoil.parse_recipe_file(best[3])
+self.assertEqual(testrecipe, rd.getVar('PN'))
+self.assertIsNotNone(rd.getVar('FILE_LAYERNAME'))
+
def test_parse_recipe_copy_expand(self):
with bb.tinfoil.Tinfoil() as tinfoil:
tinfoil.prepare(config_only=False, quiet=2)
@@ -66,7 +77,7 @@ class TinfoilTests(OESelftestTestCase):
localdata.setVar('PN', 'hello')
self.assertEqual('hello', localdata.getVar('BPN'))
-# The config_data API tp parse_recipe_file is used by:
+# The config_data API to parse_recipe_file is used by:
# layerindex-web layerindex/update_layer.py
def test_parse_recipe_custom_data(self):
with bb.tinfoil.Tinfoil() as tinfoil:
@@ -80,6 +91,18 @@ class TinfoilTests(OESelftestTestCase):
rd = tinfoil.parse_recipe_file(best[3], config_data=localdata)
self.assertEqual("testval", rd.getVar('TESTVAR'))
+def test_parse_virtual_recipe_custom_data(self):
+with bb.tinfoil.Tinfoil() as tinfoil:
+tinfoil.prepare(config_only=False, quiet=2)
+localdata = bb.data.createCopy(tinfoil.config_data)
+localdata.setVar("TESTVAR", "testval")
+testrecipe = 'nativesdk-gcc'
+best = tinfoil.find_best_provider(testrecipe)
+if not best:
+self.fail('Unable to find recipe providing %s' % testrecipe)
+rd = tinfoil.parse_recipe_file(best[3], config_data=localdata)
+self.assertEqual("testval", rd.getVar('TESTVAR'))
+
def test_list_recipes(self):
with bb.tinfoil.Tinfoil() as tinfoil:
tinfoil.prepare(config_only=False, quiet=2)
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191933):
https://lists.openembedded.org/g/openembedded-core/message/191933
Mute This Topic: https://lists.openembedded.org/mt/103022151/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2 8/9] devtool: upgrade: Update all existing checksums for the SRC_URI
In addition to updating the sha256sum and removing the md5sum, update
all other existing checksums. If the only existing checksum is md5sum,
then replace it with the default expected checksums (currently only
sha256sum).
Signed-off-by: Peter Kjellerstedt
---
[PATCHv2] Updated the commit message to make it clear(er) that md5sum
is still being removed when updating recipes.
.../devtool/devtool-upgrade-test3_1.5.3.bb| 16 ++
.../devtool-upgrade-test3_1.5.3.bb.upgraded | 15 ++
.../devtool/devtool-upgrade-test4_1.5.3.bb| 22
.../devtool-upgrade-test4_1.5.3.bb.upgraded | 19 +++
meta/lib/oeqa/selftest/cases/devtool.py | 48 +
scripts/lib/devtool/upgrade.py| 51 ++-
6 files changed, 148 insertions(+), 23 deletions(-)
create mode 100644
meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
create mode 100644
meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
create mode 100644
meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
create mode 100644
meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
new file mode 100644
index 00..69c0d351ec
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
+LICENSE = "Artistic-2.0"
+LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
+
+SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
+UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
+RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
+
+SRC_URI[md5sum] = "9365d86bd884222b4bf1039b5a9ed1bd"
+
+S = "${WORKDIR}/pv-${PV}"
+
+EXCLUDE_FROM_WORLD = "1"
+
+inherit autotools
+
diff --git
a/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
new file mode 100644
index 00..3ce7e85e10
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
@@ -0,0 +1,15 @@
+SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
+LICENSE = "Artistic-2.0"
+LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
+
+SRC_URI[sha256sum] =
"9dd45391806b0ed215abee4c5ac1597d018c386fe9c1f5afd2f6bc3b07fd82c3"
+SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
+UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
+RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
+
+S = "${WORKDIR}/pv-${PV}"
+
+EXCLUDE_FROM_WORLD = "1"
+
+inherit autotools
+
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
new file mode 100644
index 00..9abf80e6ed
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
+LICENSE = "Artistic-2.0"
+LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
+
+SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
+UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
+RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
+
+SRC_URI[md5sum] = "9365d86bd884222b4bf1039b5a9ed1bd"
+SRC_URI[sha1sum] = "63a0801350e812541c7f8e9ad74e0d6b629d0b39"
+SRC_URI[sha256sum] =
"681bcca9784bf3cb2207e68236d1f68e2aa7b80f999b5750dc77dcd756e81fbc"
+SRC_URI[sha384sum] =
"5fff6390465ff23dbf573fcf39dfad3aed2f92074a35e6c02abe58b7678858d90fa6572ff4cb56df8b3e217c739cdbe3"
+SRC_URI[sha512sum] =
"32efe7071a363f547afc74e96774f711795edda1d2702823a347d0f9953e859b7d8c45b3e63e18ffb9e0d5ed5910be652d7d727c8676e81b6cb3aed0b13aec00"
+
+PR = "r5"
+
+S = "${WORKDIR}/pv-${PV}"
+
+EXCLUDE_FROM_WORLD = "1"
+
+inherit autotools
+
diff --git
a/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
new file mode 100644
index 00..cd2a0842f4
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
@@ -0,0 +1,19 @@
+SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
+LICENSE = "Artistic-2.0"
+LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
+
+SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
+UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
+RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
+
+SRC_URI[sha1sum] = "395ce62f4f3e035b86c77038f04b96c5aa233595"
+SRC_URI[sha256sum] =
[OE-core] [PATCHv2 0/9] Improvements for devtool/recipetool
The recent Yocto Project Summit and the devtool hands-on class triggered a couple of questions for me, and when I investigated them, I stumbled upon a number of problems. This series of patches solves them. The first four patches are needed for me to be able to execute the devtool and recipetool selftests in our environment. The next four patches improve the identification of the license(s) used by a recipe, and makes the SRC_URI checksums used by devtool and recipetool consistent. Finally, there is a patch to make `devtool --no-extract` work again (it regressed with the recent devtool changes that improved git submodule support). [PATCHv2] Update the commit message for patch 8/9 to make it clear(er) that md5sum is still being removed when updating recipes. //Peter Peter Kjellerstedt (9): oeqa/selftest/devtool: Correct git clone of local repository oeqa/selftest/devtool: Avoid global Git hooks when amending a patch oeqa/selftest/devtool: Make test_devtool_load_plugin more resilient oeqa/selftest/recipetool: Make test_recipetool_load_plugin more resilient lib/oe/recipeutils: Avoid wrapping any SRC_URI[sha*sum] variables recipetool: create: Improve identification of licenses recipetool: create: Only include the expected SRC_URI checksums devtool: upgrade: Update all existing checksums for the SRC_URI devtool: modify: Make --no-extract work again .../devtool/devtool-upgrade-test3_1.5.3.bb| 16 .../devtool-upgrade-test3_1.5.3.bb.upgraded | 15 +++ .../devtool/devtool-upgrade-test4_1.5.3.bb| 22 + .../devtool-upgrade-test4_1.5.3.bb.upgraded | 19 meta/lib/oe/recipeutils.py| 2 +- meta/lib/oeqa/selftest/cases/devtool.py | 77 +-- meta/lib/oeqa/selftest/cases/recipetool.py| 44 - scripts/lib/devtool/standard.py | 3 +- scripts/lib/devtool/upgrade.py| 51 +- scripts/lib/recipetool/create.py | 95 ++- 10 files changed, 241 insertions(+), 103 deletions(-) create mode 100644 meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb create mode 100644 meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded create mode 100644 meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb create mode 100644 meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191926): https://lists.openembedded.org/g/openembedded-core/message/191926 Mute This Topic: https://lists.openembedded.org/mt/103021960/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2 6/9] recipetool: create: Improve identification of licenses
Rather than having a static list of crunched MD5 checksums for some of
the most common licenses, calculate it for all common licenses. This
should improve the identification of license text variantions.
Signed-off-by: Peter Kjellerstedt
---
scripts/lib/recipetool/create.py | 91
1 file changed, 45 insertions(+), 46 deletions(-)
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 293198d1c8..66b985487a 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -1059,54 +1059,18 @@ def get_license_md5sums(d, static_only=False,
linenumbers=False):
return md5sums
-def crunch_license(licfile):
+def crunch_known_licenses(d):
'''
-Remove non-material text from a license file and then check
-its md5sum against a known list. This works well for licenses
-which contain a copyright statement, but is also a useful way
-to handle people's insistence upon reformatting the license text
-slightly (with no material difference to the text of the
-license).
+Calculate the MD5 checksums for the crunched versions of all common
+licenses. Also add additional known checksums.
'''
-
-import oe.utils
-
-# Note: these are carefully constructed!
-license_title_re = re.compile(r'^#*\(? *(This is )?([Tt]he )?.{0,15}
?[Ll]icen[sc]e( \(.{1,10}\))?\)?[:\.]? ?#*$')
-license_statement_re = re.compile(r'^((This (project|software)|.{1,10})
is( free software)? (released|licen[sc]ed)|(Released|Licen[cs]ed)) under the
.{1,10} [Ll]icen[sc]e:?$')
-copyright_re = re.compile('^ *[#\*]* *(Modified work |MIT LICENSED
)?Copyright ?(\([cC]\))? .*$')
-disclaimer_re = re.compile('^ *\*? ?All [Rr]ights [Rr]eserved\.$')
-email_re = re.compile('^.*<[\w\.-]*@[\w\.\-]*>$')
-header_re = re.compile('^(\/\**!?)? ?[\-=\*]* ?(\*\/)?$')
-tag_re = re.compile('^ *@?\(?([Ll]icense|MIT)\)?$')
-url_re = re.compile('^ *[#\*]* *https?:\/\/[\w\.\/\-]+$')
-
+
crunched_md5sums = {}
# common licenses
-crunched_md5sums['89f3bf322f30a1dcfe952e09945842f0'] = 'Apache-2.0'
-crunched_md5sums['13b6fe3075f8f42f2270a748965bf3a1'] = '0BSD'
-crunched_md5sums['ba87a7d7c20719c8df4b8beed9b78c43'] = 'BSD-2-Clause'
-crunched_md5sums['7f8892c03b72de419c27be4ebfa253f8'] = 'BSD-3-Clause'
-crunched_md5sums['21128c0790b23a8a9f9e260d5f6b3619'] = 'BSL-1.0'
-crunched_md5sums['975742a59ae1b8abdea63a97121f49f4'] = 'EDL-1.0'
-crunched_md5sums['5322cee4433d84fb3aafc9e253116447'] = 'EPL-1.0'
-crunched_md5sums['6922352e87de080f42419bed93063754'] = 'EPL-2.0'
-crunched_md5sums['793475baa22295cae1d3d4046a3a0ceb'] = 'GPL-2.0-only'
-crunched_md5sums['ff9047f969b02c20f0559470df5cb433'] = 'GPL-2.0-or-later'
-crunched_md5sums['ea6de5453fcadf534df246e6cdafadcd'] = 'GPL-3.0-only'
-crunched_md5sums['b419257d4d153a6fde92ddf96acf5b67'] = 'GPL-3.0-or-later'
-crunched_md5sums['228737f4c49d3ee75b8fb3706b090b84'] = 'ISC'
-crunched_md5sums['c6a782e826ca4e85bf7f8b89435a677d'] = 'LGPL-2.0-only'
-crunched_md5sums['32d8f758a066752f0db09bd7624b8090'] = 'LGPL-2.0-or-later'
-crunched_md5sums['4820937eb198b4f84c52217ed230be33'] = 'LGPL-2.1-only'
-crunched_md5sums['db13fe9f3a13af7adab2dc7a76f9e44a'] = 'LGPL-2.1-or-later'
-crunched_md5sums['d7a0f2e4e0950e837ac3eabf5bd1d246'] = 'LGPL-3.0-only'
-crunched_md5sums['abbf328e2b434f9153351f06b9f79d02'] = 'LGPL-3.0-or-later'
-crunched_md5sums['eecf6429523cbc9693547cf2db790b5c'] = 'MIT'
-crunched_md5sums['b218b0e94290b9b818c4be67c8e1cc82'] = 'MIT-0'
-crunched_md5sums['ddc18131d6748374f0f35a621c245b49'] = 'Unlicense'
-crunched_md5sums['51f9570ff32571fc0a443102285c5e33'] = 'WTFPL'
+crunched_md5sums['ad4e9d34a2e966dfe9837f18de03266d'] = 'GFDL-1.1-only'
+crunched_md5sums['d014fb11a34eb67dc717fdcfc97e60ed'] = 'GFDL-1.2-only'
+crunched_md5sums['e020ca655b06c112def28e597ab844f1'] = 'GFDL-1.3-only'
# The following two were gleaned from the "forever" npm package
crunched_md5sums['0a97f8e4cbaf889d6fa51f84b89a79f6'] = 'ISC'
@@ -1162,6 +1126,39 @@ def crunch_license(licfile):
# https://raw.githubusercontent.com/stackgl/gl-mat3/v2.0.0/LICENSE.md
crunched_md5sums['75512892d6f59dddb6d1c7e191957e9c'] = 'Zlib'
+commonlicdir = d.getVar('COMMON_LICENSE_DIR')
+for fn in sorted(os.listdir(commonlicdir)):
+md5value, lictext = crunch_license(os.path.join(commonlicdir, fn))
+if md5value not in crunched_md5sums:
+crunched_md5sums[md5value] = fn
+elif fn != crunched_md5sums[md5value]:
+bb.debug(2, "crunched_md5sums['%s'] is already set to '%s' rather
than '%s'" % (md5value, crunched_md5sums[md5value], fn))
+else:
+bb.debug(2, "crunched_md5sums['%s'] is already set to '%s'" %
(md5value, crunched_md5sums[md5value]))
+
+return crunched_md5sums
+
+def crunch_license(licfile):
+'''
+Remove
[OE-core] [PATCHv2 9/9] devtool: modify: Make --no-extract work again
This avoids the following error when using --no-extract, introduced in
commit 900129cbdf (devtool: add support for git submodules):
Traceback (most recent call last):
File ".../scripts/devtool", line 349, in
ret = main()
File ".../scripts/devtool", line 336, in main
ret = args.func(args, config, basepath, workspace)
File ".../scripts/lib/devtool/standard.py", line 995, in modify
for commit in commits[name]:
KeyError: '.'
Signed-off-by: Peter Kjellerstedt
---
scripts/lib/devtool/standard.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index ad6e346279..5b7ea6b886 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -991,7 +991,8 @@ def modify(args, config, basepath, workspace):
'}\n')
if initial_revs:
for name, rev in initial_revs.items():
-f.write('\n# initial_rev %s: %s\n' % (name, rev))
+f.write('\n# initial_rev %s: %s\n' % (name, rev))
+if name in commits:
for commit in commits[name]:
f.write('# commit %s: %s\n' % (name, commit))
if branch_patches:
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191930):
https://lists.openembedded.org/g/openembedded-core/message/191930
Mute This Topic: https://lists.openembedded.org/mt/103021964/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2 3/9] oeqa/selftest/devtool: Make test_devtool_load_plugin more resilient
* Avoid trying to write to read-only directories and file systems.
* Support symbolic links in BBPATH.
Signed-off-by: Peter Kjellerstedt
---
meta/lib/oeqa/selftest/cases/devtool.py | 25 -
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index 03d57cc30a..e01ab01869 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -4,6 +4,7 @@
# SPDX-License-Identifier: MIT
#
+import errno
import os
import re
import shutil
@@ -1900,7 +1901,15 @@ class DevtoolUpgradeTests(DevtoolBase):
for p in paths:
dstdir = os.path.join(dstdir, p)
if not os.path.exists(dstdir):
-os.makedirs(dstdir)
+try:
+os.makedirs(dstdir)
+except PermissionError:
+return False
+except OSError as e:
+if e.errno == errno.EROFS:
+return False
+else:
+raise e
if p == "lib":
# Can race with other tests
self.add_command_to_tearDown('rmdir
--ignore-fail-on-non-empty %s' % dstdir)
@@ -1908,8 +1917,12 @@ class DevtoolUpgradeTests(DevtoolBase):
self.track_for_cleanup(dstdir)
dstfile = os.path.join(dstdir, os.path.basename(srcfile))
if srcfile != dstfile:
-shutil.copy(srcfile, dstfile)
+try:
+shutil.copy(srcfile, dstfile)
+except PermissionError:
+return False
self.track_for_cleanup(dstfile)
+return True
def test_devtool_load_plugin(self):
"""Test that devtool loads only the first found plugin in BBPATH."""
@@ -1927,15 +1940,17 @@ class DevtoolUpgradeTests(DevtoolBase):
plugincontent = fh.readlines()
try:
self.assertIn('meta-selftest', srcfile, 'wrong bbpath plugin
found')
-for path in searchpath:
-self._copy_file_with_cleanup(srcfile, path, 'lib', 'devtool')
+searchpath = [
+path for path in searchpath
+if self._copy_file_with_cleanup(srcfile, path, 'lib',
'devtool')
+]
result = runCmd("devtool --quiet count")
self.assertEqual(result.output, '1')
result = runCmd("devtool --quiet multiloaded")
self.assertEqual(result.output, "no")
for path in searchpath:
result = runCmd("devtool --quiet bbdir")
-self.assertEqual(result.output, path)
+self.assertEqual(os.path.realpath(result.output),
os.path.realpath(path))
os.unlink(os.path.join(result.output, 'lib', 'devtool',
'bbpath.py'))
finally:
with open(srcfile, 'w') as fh:
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191927):
https://lists.openembedded.org/g/openembedded-core/message/191927
Mute This Topic: https://lists.openembedded.org/mt/103021961/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2 7/9] recipetool: create: Only include the expected SRC_URI checksums
Rather than including all SRC_URI checksums, include the ones that are
expected. These are the same as are output if no checksums are included
when building the recipe.
Signed-off-by: Peter Kjellerstedt
---
meta/lib/oeqa/selftest/cases/recipetool.py | 19 ---
scripts/lib/recipetool/create.py | 4 +++-
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 3a05343210..910bf0b4f6 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -349,7 +349,6 @@ class RecipetoolCreateTests(RecipetoolBase):
checkvars['LICENSE'] = 'GPL-2.0-only'
checkvars['LIC_FILES_CHKSUM'] =
'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'
checkvars['SRC_URI'] =
'https://github.com/logrotate/logrotate/releases/download/${PV}/logrotate-${PV}.tar.xz'
-checkvars['SRC_URI[md5sum]'] = 'a560c57fac87c45b2fc17406cdf79288'
checkvars['SRC_URI[sha256sum]'] =
'2e6a401cac9024db2288297e3be1a8ab60e7401ba8e91225218aaf4a27e82a07'
self._test_recipe_contents(recipefile, checkvars, [])
@@ -407,7 +406,6 @@ class RecipetoolCreateTests(RecipetoolBase):
checkvars = {}
checkvars['LICENSE'] = set(['LGPL-2.1-only', 'MPL-1.1-only'])
checkvars['SRC_URI'] =
'http://taglib.github.io/releases/taglib-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] = 'cee7be0ccfc892fa433d6c837df9522a'
checkvars['SRC_URI[sha256sum]'] =
'b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b'
checkvars['DEPENDS'] = set(['boost', 'zlib'])
inherits = ['cmake']
@@ -470,7 +468,6 @@ class RecipetoolCreateTests(RecipetoolBase):
checkvars['LICENSE'] = set(['MIT'])
checkvars['LIC_FILES_CHKSUM'] =
'file://LICENSE;md5=16a934f165e8c3245f241e77d401bb88'
checkvars['SRC_URI'] =
'https://files.pythonhosted.org/packages/84/30/80932401906eaf787f2e9bd86dc458f1d2e75b064b4c187341f29516945c/python-magic-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] = 'e384c95a47218f66c6501cd6dd45ff59'
checkvars['SRC_URI[sha256sum]'] =
'f3765c0f582d2dfc72c15f3b5a82aecfae9498bd29ca840d72f37d7bd38bfcd5'
inherits = ['setuptools3']
self._test_recipe_contents(recipefile, checkvars, inherits)
@@ -500,11 +497,7 @@ class RecipetoolCreateTests(RecipetoolBase):
checkvars['LICENSE'] = set(['BSD-3-Clause'])
checkvars['LIC_FILES_CHKSUM'] =
'file://LICENSE;md5=702b1ef12cf66832a88f24c8f2ee9c19'
checkvars['SRC_URI'] =
'https://files.pythonhosted.org/packages/a1/fb/f95560c6a5d4469d9c49e24cf1b5d4d21ffab5608251c6020a965fb7791c/webcolors-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] = 'c9be30c5b0cf1cad32e4cbacbb2229e9'
-checkvars['SRC_URI[sha1sum]'] =
'c90b84fb65eed9b4c9dea7f08c657bfac0e820a5'
checkvars['SRC_URI[sha256sum]'] =
'c225b674c83fa923be93d235330ce0300373d02885cef23238813b0d5668304a'
-checkvars['SRC_URI[sha384sum]'] =
'45652af349660f19f68d01361dd5bda287789e5ea63608f52a8cea526ac04465614db2ea236103fb8456b1fcaea96ed7'
-checkvars['SRC_URI[sha512sum]'] =
'074aaf135ac6b0025b88b731d1d6dfa4c539b4fff7195658cc58a4326bb9f0449a231685d312b4a1ec48ca535a838bfa5c680787fe0e61473a2a092c448937d0'
inherits = ['python_setuptools_build_meta']
self._test_recipe_contents(recipefile, checkvars, inherits)
@@ -534,11 +527,7 @@ class RecipetoolCreateTests(RecipetoolBase):
checkvars['LICENSE'] = set(['MIT'])
checkvars['LIC_FILES_CHKSUM'] =
'file://LICENSE;md5=aab31f2ef7ba214a5a341eaa47a7f367'
checkvars['SRC_URI'] =
'https://files.pythonhosted.org/packages/b9/f3/ef59cee614d5e0accf6fd0cbba025b93b272e626ca89fb70a3e9187c5d15/iso8601-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] = '6e33910eba87066b3be7fcf3d59d16b5'
-checkvars['SRC_URI[sha1sum]'] =
'efd225b2c9fa7d9e4a1ec6ad94f3295cee982e61'
checkvars['SRC_URI[sha256sum]'] =
'6b1d3829ee8921c4301998c909f7829fa9ed3cbdac0d3b16af2d743aed1ba8df'
-checkvars['SRC_URI[sha384sum]'] =
'255002433fe65c19adfd6b91494271b613cb25ef6a35ac77436de1e03d60cc07bf89fd716451b917f1435e4384860ef6'
-checkvars['SRC_URI[sha512sum]'] =
'db57ab2a25ef91e3bc479c8539d27e853cf1fbf60986820b8999ae15d7e566425a1e0cfba47d0f3b23aa703db0576db368e6c110ba2a2f46c9a34e8ee3611fb7'
inherits = ['python_poetry_core']
self._test_recipe_contents(recipefile, checkvars, inherits)
@@ -568,11 +557,7 @@ class RecipetoolCreateTests(RecipetoolBase):
checkvars['LICENSE'] = set(['PSF-2.0'])
checkvars['LIC_FILES_CHKSUM'] =
'file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2'
checkvars['SRC_URI'] =
'https://files.pythonhosted.org/packages/1f/7a/8b94bb016069caa12fc9f587b28080ac33b4fbb8ca369b98bc0a4828543e/typing_extensions-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] =
[OE-core] [PATCHv2 5/9] lib/oe/recipeutils: Avoid wrapping any SRC_URI[sha*sum] variables
Before, a variable such as SRC_URI[sha512sum] would end up as: SRC_URI[sha512sum] = "45ff3abce4dab24a8090409e6d7bb26afa7fa7812a51e067 \ 28c2aa47d5b4de610d97ba4609cf13d9173087bd909fdf377235eee988a6fdcf52abb7 \ 0341c40b5b" when updated by patch_recipe_lines(). Signed-off-by: Peter Kjellerstedt --- meta/lib/oe/recipeutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 25b159bc1b..5fb73e65d7 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -26,7 +26,7 @@ from bb.utils import vercmp_string # Help us to find places to insert values recipe_progression = ['SUMMARY', 'DESCRIPTION', 'HOMEPAGE', 'BUGTRACKER', 'SECTION', 'LICENSE', 'LICENSE_FLAGS', 'LIC_FILES_CHKSUM', 'PROVIDES', 'DEPENDS', 'PR', 'PV', 'SRCREV', 'SRC_URI', 'S', 'do_fetch()', 'do_unpack()', 'do_patch()', 'EXTRA_OECONF', 'EXTRA_OECMAKE', 'EXTRA_OESCONS', 'do_configure()', 'EXTRA_OEMAKE', 'do_compile()', 'do_install()', 'do_populate_sysroot()', 'INITSCRIPT', 'USERADD', 'GROUPADD', 'PACKAGES', 'FILES', 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RPROVIDES', 'RREPLACES', 'RCONFLICTS', 'ALLOW_EMPTY', 'populate_packages()', 'do_package()', 'do_deploy()', 'BBCLASSEXTEND'] # Variables that sometimes are a bit long but shouldn't be wrapped -nowrap_vars = ['SUMMARY', 'HOMEPAGE', 'BUGTRACKER', r'SRC_URI\[(.+\.)?md5sum\]', r'SRC_URI\[(.+\.)?sha256sum\]'] +nowrap_vars = ['SUMMARY', 'HOMEPAGE', 'BUGTRACKER', r'SRC_URI\[(.+\.)?md5sum\]', r'SRC_URI\[(.+\.)?sha[0-9]+sum\]'] list_vars = ['SRC_URI', 'LIC_FILES_CHKSUM'] meta_vars = ['SUMMARY', 'DESCRIPTION', 'HOMEPAGE', 'BUGTRACKER', 'SECTION'] -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191929): https://lists.openembedded.org/g/openembedded-core/message/191929 Mute This Topic: https://lists.openembedded.org/mt/103021963/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2 2/9] oeqa/selftest/devtool: Avoid global Git hooks when amending a patch
To avoid potential problems due to global Git hooks, add --no-verify to
a `git commit --amend` command.
Signed-off-by: Peter Kjellerstedt
---
meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index 55bfc24b7c..03d57cc30a 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1495,7 +1495,7 @@ class DevtoolUpdateTests(DevtoolBase):
# Modify one file
srctree = os.path.join(self.workspacedir, 'sources', testrecipe)
runCmd('echo "Another line" >> README', cwd=srctree)
-runCmd('git commit -a --amend --no-edit', cwd=srctree)
+runCmd('git commit -a --amend --no-edit --no-verify', cwd=srctree)
self.add_command_to_tearDown('cd %s; rm %s/*; git checkout %s %s' %
(os.path.dirname(recipefile), testrecipe, testrecipe,
os.path.basename(recipefile)))
result = runCmd('devtool update-recipe %s' % testrecipe)
expected_status = [(' M', '.*/%s/readme.patch.gz$' % testrecipe)]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191924):
https://lists.openembedded.org/g/openembedded-core/message/191924
Mute This Topic: https://lists.openembedded.org/mt/103021956/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2 1/9] oeqa/selftest/devtool: Correct git clone of local repository
If the build environment is setup using `repo`, then poky/.git/object
is a symbolic link rather than a directory. To clone such repositories,
the source path must be prefixed with "file://". This avoids the
following error:
fatal: failed to start iterator over '.../poky/.git/objects': Not a directory
Signed-off-by: Peter Kjellerstedt
---
meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index 2a11886e4b..55bfc24b7c 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -54,7 +54,7 @@ def setUpModule():
result = runCmd('git rev-parse --show-toplevel',
cwd=canonical_layerpath)
oldreporoot = result.output.rstrip()
newmetapath = os.path.join(corecopydir,
os.path.relpath(oldmetapath, oldreporoot))
-runCmd('git clone %s %s' % (oldreporoot, corecopydir),
cwd=templayerdir)
+runCmd('git clone file://%s %s' % (oldreporoot, corecopydir),
cwd=templayerdir)
# Now we need to copy any modified files
# You might ask "why not just copy the entire tree instead of
# cloning and doing this?" - well, the problem with that is
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191923):
https://lists.openembedded.org/g/openembedded-core/message/191923
Mute This Topic: https://lists.openembedded.org/mt/103021955/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2 4/9] oeqa/selftest/recipetool: Make test_recipetool_load_plugin more resilient
* Avoid trying to write to read-only directories and file systems.
* Support symbolic links in BBPATH.
Signed-off-by: Peter Kjellerstedt
---
meta/lib/oeqa/selftest/cases/recipetool.py | 25 +-
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 55cbba9ca7..3a05343210 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -4,6 +4,7 @@
# SPDX-License-Identifier: MIT
#
+import errno
import os
import shutil
import tempfile
@@ -860,7 +861,15 @@ class RecipetoolTests(RecipetoolBase):
for p in paths:
dstdir = os.path.join(dstdir, p)
if not os.path.exists(dstdir):
-os.makedirs(dstdir)
+try:
+os.makedirs(dstdir)
+except PermissionError:
+return False
+except OSError as e:
+if e.errno == errno.EROFS:
+return False
+else:
+raise e
if p == "lib":
# Can race with other tests
self.add_command_to_tearDown('rmdir
--ignore-fail-on-non-empty %s' % dstdir)
@@ -868,8 +877,12 @@ class RecipetoolTests(RecipetoolBase):
self.track_for_cleanup(dstdir)
dstfile = os.path.join(dstdir, os.path.basename(srcfile))
if srcfile != dstfile:
-shutil.copy(srcfile, dstfile)
+try:
+shutil.copy(srcfile, dstfile)
+except PermissionError:
+return False
self.track_for_cleanup(dstfile)
+return True
def test_recipetool_load_plugin(self):
"""Test that recipetool loads only the first found plugin in BBPATH."""
@@ -883,15 +896,17 @@ class RecipetoolTests(RecipetoolBase):
plugincontent = fh.readlines()
try:
self.assertIn('meta-selftest', srcfile, 'wrong bbpath plugin
found')
-for path in searchpath:
-self._copy_file_with_cleanup(srcfile, path, 'lib',
'recipetool')
+searchpath = [
+path for path in searchpath
+if self._copy_file_with_cleanup(srcfile, path, 'lib',
'recipetool')
+]
result = runCmd("recipetool --quiet count")
self.assertEqual(result.output, '1')
result = runCmd("recipetool --quiet multiloaded")
self.assertEqual(result.output, "no")
for path in searchpath:
result = runCmd("recipetool --quiet bbdir")
-self.assertEqual(result.output, path)
+self.assertEqual(os.path.realpath(result.output),
os.path.realpath(path))
os.unlink(os.path.join(result.output, 'lib', 'recipetool',
'bbpath.py'))
finally:
with open(srcfile, 'w') as fh:
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191925):
https://lists.openembedded.org/g/openembedded-core/message/191925
Mute This Topic: https://lists.openembedded.org/mt/103021957/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 8/9] devtool: upgrade: Update all existing checksums for the SRC_URI
I wonder if we should start using sha512sum along with sha256sum as
default with devtool upgrade and skip others.
On Wed, Dec 6, 2023 at 11:22 AM Peter Kjellerstedt
wrote:
>
> Rather than only updating the sha256sum and removing the md5sum, update
> all existing checksums. If the only existing checksum is md5sum, then
> replace it with the default expected checksums.
>
> Signed-off-by: Peter Kjellerstedt
> ---
> .../devtool/devtool-upgrade-test3_1.5.3.bb| 16 ++
> .../devtool-upgrade-test3_1.5.3.bb.upgraded | 15 ++
> .../devtool/devtool-upgrade-test4_1.5.3.bb| 22
> .../devtool-upgrade-test4_1.5.3.bb.upgraded | 19 +++
> meta/lib/oeqa/selftest/cases/devtool.py | 48 +
> scripts/lib/devtool/upgrade.py| 51 ++-
> 6 files changed, 148 insertions(+), 23 deletions(-)
> create mode 100644
> meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> create mode 100644
> meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> create mode 100644
> meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> create mode 100644
> meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
>
> diff --git
> a/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> new file mode 100644
> index 00..69c0d351ec
> --- /dev/null
> +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> @@ -0,0 +1,16 @@
> +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> +LICENSE = "Artistic-2.0"
> +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> +
> +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
> +RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade
> feature"
> +
> +SRC_URI[md5sum] = "9365d86bd884222b4bf1039b5a9ed1bd"
> +
> +S = "${WORKDIR}/pv-${PV}"
> +
> +EXCLUDE_FROM_WORLD = "1"
> +
> +inherit autotools
> +
> diff --git
> a/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> new file mode 100644
> index 00..3ce7e85e10
> --- /dev/null
> +++
> b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> @@ -0,0 +1,15 @@
> +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> +LICENSE = "Artistic-2.0"
> +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> +
> +SRC_URI[sha256sum] =
> "9dd45391806b0ed215abee4c5ac1597d018c386fe9c1f5afd2f6bc3b07fd82c3"
> +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
> +RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade
> feature"
> +
> +S = "${WORKDIR}/pv-${PV}"
> +
> +EXCLUDE_FROM_WORLD = "1"
> +
> +inherit autotools
> +
> diff --git
> a/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> new file mode 100644
> index 00..9abf80e6ed
> --- /dev/null
> +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> @@ -0,0 +1,22 @@
> +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> +LICENSE = "Artistic-2.0"
> +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> +
> +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
> +RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade
> feature"
> +
> +SRC_URI[md5sum] = "9365d86bd884222b4bf1039b5a9ed1bd"
> +SRC_URI[sha1sum] = "63a0801350e812541c7f8e9ad74e0d6b629d0b39"
> +SRC_URI[sha256sum] =
> "681bcca9784bf3cb2207e68236d1f68e2aa7b80f999b5750dc77dcd756e81fbc"
> +SRC_URI[sha384sum] =
> "5fff6390465ff23dbf573fcf39dfad3aed2f92074a35e6c02abe58b7678858d90fa6572ff4cb56df8b3e217c739cdbe3"
> +SRC_URI[sha512sum] =
> "32efe7071a363f547afc74e96774f711795edda1d2702823a347d0f9953e859b7d8c45b3e63e18ffb9e0d5ed5910be652d7d727c8676e81b6cb3aed0b13aec00"
> +
> +PR = "r5"
> +
> +S = "${WORKDIR}/pv-${PV}"
> +
> +EXCLUDE_FROM_WORLD = "1"
> +
> +inherit autotools
> +
> diff --git
> a/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
> b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
> new file mode 100644
> index 00..cd2a0842f4
> --- /dev/null
> +++
> b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
> @@ -0,0 +1,19 @@
> +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> +LICENSE = "Artistic-2.0"
> +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> +
> +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> +UPSTREAM_CHECK_URI
Re: [OE-core] [PATCH 8/9] devtool: upgrade: Update all existing checksums for the SRC_URI
On Wed, 6 Dec 2023 at 20:46, Peter Kjellerstedt wrote: > Will changing that to: > > In addition to updating the sha256sum and removing the md5sum, update > all other existing checksums. If the only existing checksum is md5sum, then > replace it with the default expected checksums (currently only sha256sum). > > make it clearer? Thanks, yes that is fine. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191921): https://lists.openembedded.org/g/openembedded-core/message/191921 Mute This Topic: https://lists.openembedded.org/mt/103019944/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [kirkstone][PATCH 2/4] base-passwd: Add PW_SUBDIR
Since I've seen Richard's reply and his reluctance to merge this,
this is mostly technical.
I would use either PW_DIR = "${sysconfdir}/pwdb" or PW_DIR:append = "/pwdb".
Using "/etc" (and other hardcoded paths) should be avoided wherever
possible.
//Peter
> -Original Message-
> From: Joakim Tjernlund
> Sent: den 29 november 2023 12:11
> To: openembedded-core@lists.openembedded.org; Peter Kjellerstedt
>
> Subject: Re: [OE-core] [kirkstone][PATCH 2/4] base-passwd: Add PW_SUBDIR
>
> Hi Peter :)
>
> All good comments, will fix accordingly. Not sure how PW_DIR ?=
> "${sysconfdir}" will work though.
>
> How do you envision one should set PW_DIR in distro .conf or layer.conf?
> Just PW_DIR = "/etc/pwdb" or PW_DIR = "${sysconfdir}/pwdb" ?
>
> Jocke
>
> On Sun, 2023-11-26 at 21:21 +, Peter Kjellerstedt wrote:
> > > -Original Message-
> > > From: openembedded-core@lists.openembedded.org c...@lists.openembedded.org> On Behalf Of Joakim Tjernlund via
> lists.openembedded.org
> > > Sent: den 24 november 2023 15:11
> > > To: openembedded-core@lists.openembedded.org
> > > Cc: Joakim Tjernlund
> > > Subject: [OE-core] [kirkstone][PATCH 2/4] base-passwd: Add PW_SUBDIR
> > >
> > > Add support for creating passwd files in a /etc subdir
> > > Set PW_SUBIR to pwdb to get passwd files in /etc/pwdb
> > >
> > > Signed-off-by: Joakim Tjernlund
> > > ---
> > > .../base-passwd/base-passwd_3.5.29.bb | 24 --
> -
> > > 1 file changed, 16 insertions(+), 8 deletions(-)
> > >
> > > diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
> b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
> > > index ef7792ae49..e453be0763 100644
> > > --- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
> > > +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
> > > @@ -20,6 +20,9 @@ SRC_URI =
> "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar
> > > SRC_URI[md5sum] = "6beccac48083fe8ae5048acd062e5421"
> > > SRC_URI[sha256sum] =
> "f0b66388b2c8e49c15692439d2bee63bcdd4bbbf7a782c7f64accc55986b6a36"
> > >
> > > +#Set PW_SUBDIR to pwdb to get passwd files in /etc/pwdb
> > > +PW_SUBDIR ?= ""
> > > +
> >
> > Rather than defining a subdirectory, I would recommend defining the full
> > path, e.g.:
> >
> > PW_DIR ?= "${sysconfdir}"
> >
> > This avoids generating a lot of "//" in the middle of paths for the
> majority
> > of us who do not use a subdirectory for the password files.
> >
> > > # the package is taken from launchpad; that source is static and goes
> stale
> > > # so we check the latest upstream from a directory that does get
> updated
> > > UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/"
> > > @@ -50,10 +53,11 @@ basepasswd_sysroot_postinst() {
> > > #!/bin/sh
> > >
> > > # Install passwd.master and group.master to sysconfdir
> > > -install -d -m 755 ${STAGING_DIR_TARGET}${sysconfdir}
> > > +install -d -m 755 ${STAGING_DIR_TARGET}${sysconfdir}/${PW_SUBDIR}
> > > for i in passwd group; do
> > > install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-
> passwd/\$i.master \
> > > - ${STAGING_DIR_TARGET}${sysconfdir}/\$i
> > > + ${STAGING_DIR_TARGET}${sysconfdir}/${PW_SUBDIR}/\$i
> > > + [ -n "${PW_SUBDIR}" ] && ln -fs ${PW_SUBDIR}/\$i
> ${STAGING_DIR_TARGET}${sysconfdir}/\$i
> >
> > I generally recommended to use `[ ! ... ] || ...` instead of `[ ... ] &&
> ...`:
> >
> > [ -z "${PW_SUBDIR}" ] || ln -fs ${PW_SUBDIR}/\$i
> ${STAGING_DIR_TARGET}${sysconfdir}/\$i
> >
> > Or, assuming my recommendation above is followed:
> >
> > [ "${PW_DIR}" = "${sysconfdir}" ] ||
> > ln -fsr ${STAGING_DIR_TARGET}${PW_DIR}/\$i
> ${STAGING_DIR_TARGET}${sysconfdir}/\$i
> >
> > The reason is that the return status ($?) of `[ ... ] && ...` is 1 if
> the
> > test fails, while it is 0 for `[ ! ... ] || ...` when the test succeeds.
> >
> > > done
> > >
> > > # Run any useradd postinsts
> > > @@ -89,15 +93,19 @@ python populate_packages:prepend() {
> > > f.close()
> > >
> > > preinst = """#!/bin/sh
> > > -mkdir -p $D${sysconfdir}
> > > -if [ ! -e $D${sysconfdir}/passwd ]; then
> > > -\tcat << 'EOF' > $D${sysconfdir}/passwd
> > > +mkdir -p $D${sysconfdir}/${PW_SUBDIR}
> > > +if [ ! -e $D${sysconfdir}/${PW_SUBDIR}/passwd ]; then
> > > +\tcat << 'EOF' > $D${sysconfdir}/${PW_SUBDIR}/passwd
> > > """ + passwd + """EOF
> > > fi
> > > -if [ ! -e $D${sysconfdir}/group ]; then
> > > -\tcat << 'EOF' > $D${sysconfdir}/group
> > > +if [ ! -e $D${sysconfdir}/${PW_SUBDIR}/group ]; then
> > > +\tcat << 'EOF' > $D${sysconfdir}/${PW_SUBDIR}/group
> > > """ + group + """EOF
> > > fi
> > > +if [ -n "${PW_SUBDIR}" ]; then
> > > +ln -fs ${PW_SUBDIR}/passwd $D${sysconfdir}/passwd
> > > +ln -fs ${PW_SUBDIR}/group $D${sysconfdir}/group
> >
> > Use \t to indent the above two lines like the code before.
> >
> > > +fi
> > > """
> > > d.setVar(d.expand('pkg_preinst:${PN}'), preinst)
> > > }
> > > @@ -114,5 +122,5
Re: [OE-core] [PATCH 8/9] devtool: upgrade: Update all existing checksums for the SRC_URI
> -Original Message-
> From: Alexander Kanavin
> Sent: den 6 december 2023 20:26
> To: Peter Kjellerstedt
> Cc: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 8/9] devtool: upgrade: Update all existing
> checksums for the SRC_URI
>
> I mean, what possible reason there could be to keep them? None as far
> as I can see.
>
> Alex
>
> On Wed, 6 Dec 2023 at 20:25, Alexander Kanavin
> wrote:
> >
> > We've been relying on this to actually remove md5sums on version
> > updates, so please do not regress that.
Sorry, if it was unclear in the commit message, but the code still of
course removes md5sum.
> >
> > Alex
> >
> > On Wed, 6 Dec 2023 at 20:22, Peter Kjellerstedt
> > wrote:
> > >
> > > Rather than only updating the sha256sum and removing the md5sum, update
> > > all existing checksums. If the only existing checksum is md5sum, then
> > > replace it with the default expected checksums.
Will changing that to:
In addition to updating the sha256sum and removing the md5sum, update
all other existing checksums. If the only existing checksum is md5sum, then
replace it with the default expected checksums (currently only sha256sum).
make it clearer?
//Peter
> > >
> > > Signed-off-by: Peter Kjellerstedt
> > > ---
> > > .../devtool/devtool-upgrade-test3_1.5.3.bb| 16 ++
> > > .../devtool-upgrade-test3_1.5.3.bb.upgraded | 15 ++
> > > .../devtool/devtool-upgrade-test4_1.5.3.bb| 22
> > > .../devtool-upgrade-test4_1.5.3.bb.upgraded | 19 +++
> > > meta/lib/oeqa/selftest/cases/devtool.py | 48 +
> > > scripts/lib/devtool/upgrade.py| 51 ++
> -
> > > 6 files changed, 148 insertions(+), 23 deletions(-)
> > > create mode 100644
> > > meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> > > create mode 100644
> > > meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> > > create mode 100644
> > > meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> > > create mode 100644
> > > meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
> > >
> > > diff --git
> > > a/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> > > b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> > > new file mode 100644
> > > index 00..69c0d351ec
> > > --- /dev/null
> > > +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> > > @@ -0,0 +1,16 @@
> > > +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> > > +LICENSE = "Artistic-2.0"
> > > +LIC_FILES_CHKSUM =
> > > "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> > > +
> > > +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> > > +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
> > > +RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade
> > > feature"
> > > +
> > > +SRC_URI[md5sum] = "9365d86bd884222b4bf1039b5a9ed1bd"
> > > +
> > > +S = "${WORKDIR}/pv-${PV}"
> > > +
> > > +EXCLUDE_FROM_WORLD = "1"
> > > +
> > > +inherit autotools
> > > +
> > > diff --git
> > > a/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> > >
> > > b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> > > new file mode 100644
> > > index 00..3ce7e85e10
> > > --- /dev/null
> > > +++
> > > b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> > > @@ -0,0 +1,15 @@
> > > +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> > > +LICENSE = "Artistic-2.0"
> > > +LIC_FILES_CHKSUM =
> > > "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> > > +
> > > +SRC_URI[sha256sum] =
> > > "9dd45391806b0ed215abee4c5ac1597d018c386fe9c1f5afd2f6bc3b07fd82c3"
> > > +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> > > +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
> > > +RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade
> > > feature"
> > > +
> > > +S = "${WORKDIR}/pv-${PV}"
> > > +
> > > +EXCLUDE_FROM_WORLD = "1"
> > > +
> > > +inherit autotools
> > > +
> > > diff --git
> > > a/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> > > b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> > > new file mode 100644
> > > index 00..9abf80e6ed
> > > --- /dev/null
> > > +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> > > @@ -0,0 +1,22 @@
> > > +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> > > +LICENSE = "Artistic-2.0"
> > > +LIC_FILES_CHKSUM =
> > > "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> > > +
> > > +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> > > +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
> > > +RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade
> > > feature"
> > > +
> > >
Re: [OE-core] [PATCH 8/9] devtool: upgrade: Update all existing checksums for the SRC_URI
I mean, what possible reason there could be to keep them? None as far
as I can see.
Alex
On Wed, 6 Dec 2023 at 20:25, Alexander Kanavin wrote:
>
> We've been relying on this to actually remove md5sums on version
> updates, so please do not regress that.
>
> Alex
>
> On Wed, 6 Dec 2023 at 20:22, Peter Kjellerstedt
> wrote:
> >
> > Rather than only updating the sha256sum and removing the md5sum, update
> > all existing checksums. If the only existing checksum is md5sum, then
> > replace it with the default expected checksums.
> >
> > Signed-off-by: Peter Kjellerstedt
> > ---
> > .../devtool/devtool-upgrade-test3_1.5.3.bb| 16 ++
> > .../devtool-upgrade-test3_1.5.3.bb.upgraded | 15 ++
> > .../devtool/devtool-upgrade-test4_1.5.3.bb| 22
> > .../devtool-upgrade-test4_1.5.3.bb.upgraded | 19 +++
> > meta/lib/oeqa/selftest/cases/devtool.py | 48 +
> > scripts/lib/devtool/upgrade.py| 51 ++-
> > 6 files changed, 148 insertions(+), 23 deletions(-)
> > create mode 100644
> > meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> > create mode 100644
> > meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> > create mode 100644
> > meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> > create mode 100644
> > meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
> >
> > diff --git
> > a/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> > b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> > new file mode 100644
> > index 00..69c0d351ec
> > --- /dev/null
> > +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> > @@ -0,0 +1,16 @@
> > +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> > +LICENSE = "Artistic-2.0"
> > +LIC_FILES_CHKSUM =
> > "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> > +
> > +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> > +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
> > +RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade
> > feature"
> > +
> > +SRC_URI[md5sum] = "9365d86bd884222b4bf1039b5a9ed1bd"
> > +
> > +S = "${WORKDIR}/pv-${PV}"
> > +
> > +EXCLUDE_FROM_WORLD = "1"
> > +
> > +inherit autotools
> > +
> > diff --git
> > a/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> >
> > b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> > new file mode 100644
> > index 00..3ce7e85e10
> > --- /dev/null
> > +++
> > b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> > @@ -0,0 +1,15 @@
> > +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> > +LICENSE = "Artistic-2.0"
> > +LIC_FILES_CHKSUM =
> > "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> > +
> > +SRC_URI[sha256sum] =
> > "9dd45391806b0ed215abee4c5ac1597d018c386fe9c1f5afd2f6bc3b07fd82c3"
> > +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> > +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
> > +RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade
> > feature"
> > +
> > +S = "${WORKDIR}/pv-${PV}"
> > +
> > +EXCLUDE_FROM_WORLD = "1"
> > +
> > +inherit autotools
> > +
> > diff --git
> > a/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> > b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> > new file mode 100644
> > index 00..9abf80e6ed
> > --- /dev/null
> > +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> > @@ -0,0 +1,22 @@
> > +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> > +LICENSE = "Artistic-2.0"
> > +LIC_FILES_CHKSUM =
> > "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> > +
> > +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> > +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
> > +RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade
> > feature"
> > +
> > +SRC_URI[md5sum] = "9365d86bd884222b4bf1039b5a9ed1bd"
> > +SRC_URI[sha1sum] = "63a0801350e812541c7f8e9ad74e0d6b629d0b39"
> > +SRC_URI[sha256sum] =
> > "681bcca9784bf3cb2207e68236d1f68e2aa7b80f999b5750dc77dcd756e81fbc"
> > +SRC_URI[sha384sum] =
> > "5fff6390465ff23dbf573fcf39dfad3aed2f92074a35e6c02abe58b7678858d90fa6572ff4cb56df8b3e217c739cdbe3"
> > +SRC_URI[sha512sum] =
> > "32efe7071a363f547afc74e96774f711795edda1d2702823a347d0f9953e859b7d8c45b3e63e18ffb9e0d5ed5910be652d7d727c8676e81b6cb3aed0b13aec00"
> > +
> > +PR = "r5"
> > +
> > +S = "${WORKDIR}/pv-${PV}"
> > +
> > +EXCLUDE_FROM_WORLD = "1"
> > +
> > +inherit autotools
> > +
> > diff --git
> > a/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
> >
> > b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
> > new file mode 100644
> > index
Re: [OE-core] [PATCH 8/9] devtool: upgrade: Update all existing checksums for the SRC_URI
We've been relying on this to actually remove md5sums on version
updates, so please do not regress that.
Alex
On Wed, 6 Dec 2023 at 20:22, Peter Kjellerstedt
wrote:
>
> Rather than only updating the sha256sum and removing the md5sum, update
> all existing checksums. If the only existing checksum is md5sum, then
> replace it with the default expected checksums.
>
> Signed-off-by: Peter Kjellerstedt
> ---
> .../devtool/devtool-upgrade-test3_1.5.3.bb| 16 ++
> .../devtool-upgrade-test3_1.5.3.bb.upgraded | 15 ++
> .../devtool/devtool-upgrade-test4_1.5.3.bb| 22
> .../devtool-upgrade-test4_1.5.3.bb.upgraded | 19 +++
> meta/lib/oeqa/selftest/cases/devtool.py | 48 +
> scripts/lib/devtool/upgrade.py| 51 ++-
> 6 files changed, 148 insertions(+), 23 deletions(-)
> create mode 100644
> meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> create mode 100644
> meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> create mode 100644
> meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> create mode 100644
> meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
>
> diff --git
> a/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> new file mode 100644
> index 00..69c0d351ec
> --- /dev/null
> +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
> @@ -0,0 +1,16 @@
> +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> +LICENSE = "Artistic-2.0"
> +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> +
> +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
> +RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade
> feature"
> +
> +SRC_URI[md5sum] = "9365d86bd884222b4bf1039b5a9ed1bd"
> +
> +S = "${WORKDIR}/pv-${PV}"
> +
> +EXCLUDE_FROM_WORLD = "1"
> +
> +inherit autotools
> +
> diff --git
> a/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> new file mode 100644
> index 00..3ce7e85e10
> --- /dev/null
> +++
> b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
> @@ -0,0 +1,15 @@
> +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> +LICENSE = "Artistic-2.0"
> +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> +
> +SRC_URI[sha256sum] =
> "9dd45391806b0ed215abee4c5ac1597d018c386fe9c1f5afd2f6bc3b07fd82c3"
> +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
> +RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade
> feature"
> +
> +S = "${WORKDIR}/pv-${PV}"
> +
> +EXCLUDE_FROM_WORLD = "1"
> +
> +inherit autotools
> +
> diff --git
> a/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> new file mode 100644
> index 00..9abf80e6ed
> --- /dev/null
> +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
> @@ -0,0 +1,22 @@
> +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> +LICENSE = "Artistic-2.0"
> +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> +
> +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
> +RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade
> feature"
> +
> +SRC_URI[md5sum] = "9365d86bd884222b4bf1039b5a9ed1bd"
> +SRC_URI[sha1sum] = "63a0801350e812541c7f8e9ad74e0d6b629d0b39"
> +SRC_URI[sha256sum] =
> "681bcca9784bf3cb2207e68236d1f68e2aa7b80f999b5750dc77dcd756e81fbc"
> +SRC_URI[sha384sum] =
> "5fff6390465ff23dbf573fcf39dfad3aed2f92074a35e6c02abe58b7678858d90fa6572ff4cb56df8b3e217c739cdbe3"
> +SRC_URI[sha512sum] =
> "32efe7071a363f547afc74e96774f711795edda1d2702823a347d0f9953e859b7d8c45b3e63e18ffb9e0d5ed5910be652d7d727c8676e81b6cb3aed0b13aec00"
> +
> +PR = "r5"
> +
> +S = "${WORKDIR}/pv-${PV}"
> +
> +EXCLUDE_FROM_WORLD = "1"
> +
> +inherit autotools
> +
> diff --git
> a/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
> b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
> new file mode 100644
> index 00..cd2a0842f4
> --- /dev/null
> +++
> b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
> @@ -0,0 +1,19 @@
> +SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
> +LICENSE = "Artistic-2.0"
> +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
> +
> +SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
> +UPSTREAM_CHECK_URI =
[OE-core] [PATCH 1/9] oeqa/selftest/devtool: Correct git clone of local repository
If the build environment is setup using `repo`, then poky/.git/object
is a symbolic link rather than a directory. To clone such repositories,
the source path must be prefixed with "file://". This avoids the
following error:
fatal: failed to start iterator over '.../poky/.git/objects': Not a directory
Signed-off-by: Peter Kjellerstedt
---
meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index 2a11886e4b..55bfc24b7c 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -54,7 +54,7 @@ def setUpModule():
result = runCmd('git rev-parse --show-toplevel',
cwd=canonical_layerpath)
oldreporoot = result.output.rstrip()
newmetapath = os.path.join(corecopydir,
os.path.relpath(oldmetapath, oldreporoot))
-runCmd('git clone %s %s' % (oldreporoot, corecopydir),
cwd=templayerdir)
+runCmd('git clone file://%s %s' % (oldreporoot, corecopydir),
cwd=templayerdir)
# Now we need to copy any modified files
# You might ask "why not just copy the entire tree instead of
# cloning and doing this?" - well, the problem with that is
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191908):
https://lists.openembedded.org/g/openembedded-core/message/191908
Mute This Topic: https://lists.openembedded.org/mt/103019938/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/9] oeqa/selftest/devtool: Avoid global Git hooks when amending a patch
To avoid potential problems due to global Git hooks, add --no-verify to
a `git commit --amend` command.
Signed-off-by: Peter Kjellerstedt
---
meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index 55bfc24b7c..03d57cc30a 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1495,7 +1495,7 @@ class DevtoolUpdateTests(DevtoolBase):
# Modify one file
srctree = os.path.join(self.workspacedir, 'sources', testrecipe)
runCmd('echo "Another line" >> README', cwd=srctree)
-runCmd('git commit -a --amend --no-edit', cwd=srctree)
+runCmd('git commit -a --amend --no-edit --no-verify', cwd=srctree)
self.add_command_to_tearDown('cd %s; rm %s/*; git checkout %s %s' %
(os.path.dirname(recipefile), testrecipe, testrecipe,
os.path.basename(recipefile)))
result = runCmd('devtool update-recipe %s' % testrecipe)
expected_status = [(' M', '.*/%s/readme.patch.gz$' % testrecipe)]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191907):
https://lists.openembedded.org/g/openembedded-core/message/191907
Mute This Topic: https://lists.openembedded.org/mt/103019937/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 4/9] oeqa/selftest/recipetool: Make test_recipetool_load_plugin more resilient
* Avoid trying to write to read-only directories and file systems.
* Support symbolic links in BBPATH.
Signed-off-by: Peter Kjellerstedt
---
meta/lib/oeqa/selftest/cases/recipetool.py | 25 +-
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 55cbba9ca7..3a05343210 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -4,6 +4,7 @@
# SPDX-License-Identifier: MIT
#
+import errno
import os
import shutil
import tempfile
@@ -860,7 +861,15 @@ class RecipetoolTests(RecipetoolBase):
for p in paths:
dstdir = os.path.join(dstdir, p)
if not os.path.exists(dstdir):
-os.makedirs(dstdir)
+try:
+os.makedirs(dstdir)
+except PermissionError:
+return False
+except OSError as e:
+if e.errno == errno.EROFS:
+return False
+else:
+raise e
if p == "lib":
# Can race with other tests
self.add_command_to_tearDown('rmdir
--ignore-fail-on-non-empty %s' % dstdir)
@@ -868,8 +877,12 @@ class RecipetoolTests(RecipetoolBase):
self.track_for_cleanup(dstdir)
dstfile = os.path.join(dstdir, os.path.basename(srcfile))
if srcfile != dstfile:
-shutil.copy(srcfile, dstfile)
+try:
+shutil.copy(srcfile, dstfile)
+except PermissionError:
+return False
self.track_for_cleanup(dstfile)
+return True
def test_recipetool_load_plugin(self):
"""Test that recipetool loads only the first found plugin in BBPATH."""
@@ -883,15 +896,17 @@ class RecipetoolTests(RecipetoolBase):
plugincontent = fh.readlines()
try:
self.assertIn('meta-selftest', srcfile, 'wrong bbpath plugin
found')
-for path in searchpath:
-self._copy_file_with_cleanup(srcfile, path, 'lib',
'recipetool')
+searchpath = [
+path for path in searchpath
+if self._copy_file_with_cleanup(srcfile, path, 'lib',
'recipetool')
+]
result = runCmd("recipetool --quiet count")
self.assertEqual(result.output, '1')
result = runCmd("recipetool --quiet multiloaded")
self.assertEqual(result.output, "no")
for path in searchpath:
result = runCmd("recipetool --quiet bbdir")
-self.assertEqual(result.output, path)
+self.assertEqual(os.path.realpath(result.output),
os.path.realpath(path))
os.unlink(os.path.join(result.output, 'lib', 'recipetool',
'bbpath.py'))
finally:
with open(srcfile, 'w') as fh:
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191910):
https://lists.openembedded.org/g/openembedded-core/message/191910
Mute This Topic: https://lists.openembedded.org/mt/103019940/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 9/9] devtool: modify: Make --no-extract work again
This avoids the following error when using --no-extract, introduced in
commit 900129cbdf (devtool: add support for git submodules):
Traceback (most recent call last):
File ".../scripts/devtool", line 349, in
ret = main()
File ".../scripts/devtool", line 336, in main
ret = args.func(args, config, basepath, workspace)
File ".../scripts/lib/devtool/standard.py", line 995, in modify
for commit in commits[name]:
KeyError: '.'
Signed-off-by: Peter Kjellerstedt
---
scripts/lib/devtool/standard.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index ad6e346279..5b7ea6b886 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -991,7 +991,8 @@ def modify(args, config, basepath, workspace):
'}\n')
if initial_revs:
for name, rev in initial_revs.items():
-f.write('\n# initial_rev %s: %s\n' % (name, rev))
+f.write('\n# initial_rev %s: %s\n' % (name, rev))
+if name in commits:
for commit in commits[name]:
f.write('# commit %s: %s\n' % (name, commit))
if branch_patches:
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191915):
https://lists.openembedded.org/g/openembedded-core/message/191915
Mute This Topic: https://lists.openembedded.org/mt/103019946/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 7/9] recipetool: create: Only include the expected SRC_URI checksums
Rather than including all SRC_URI checksums, include the ones that are
expected. These are the same as are output if no checksums are included
when building the recipe.
Signed-off-by: Peter Kjellerstedt
---
meta/lib/oeqa/selftest/cases/recipetool.py | 19 ---
scripts/lib/recipetool/create.py | 4 +++-
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 3a05343210..910bf0b4f6 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -349,7 +349,6 @@ class RecipetoolCreateTests(RecipetoolBase):
checkvars['LICENSE'] = 'GPL-2.0-only'
checkvars['LIC_FILES_CHKSUM'] =
'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'
checkvars['SRC_URI'] =
'https://github.com/logrotate/logrotate/releases/download/${PV}/logrotate-${PV}.tar.xz'
-checkvars['SRC_URI[md5sum]'] = 'a560c57fac87c45b2fc17406cdf79288'
checkvars['SRC_URI[sha256sum]'] =
'2e6a401cac9024db2288297e3be1a8ab60e7401ba8e91225218aaf4a27e82a07'
self._test_recipe_contents(recipefile, checkvars, [])
@@ -407,7 +406,6 @@ class RecipetoolCreateTests(RecipetoolBase):
checkvars = {}
checkvars['LICENSE'] = set(['LGPL-2.1-only', 'MPL-1.1-only'])
checkvars['SRC_URI'] =
'http://taglib.github.io/releases/taglib-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] = 'cee7be0ccfc892fa433d6c837df9522a'
checkvars['SRC_URI[sha256sum]'] =
'b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b'
checkvars['DEPENDS'] = set(['boost', 'zlib'])
inherits = ['cmake']
@@ -470,7 +468,6 @@ class RecipetoolCreateTests(RecipetoolBase):
checkvars['LICENSE'] = set(['MIT'])
checkvars['LIC_FILES_CHKSUM'] =
'file://LICENSE;md5=16a934f165e8c3245f241e77d401bb88'
checkvars['SRC_URI'] =
'https://files.pythonhosted.org/packages/84/30/80932401906eaf787f2e9bd86dc458f1d2e75b064b4c187341f29516945c/python-magic-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] = 'e384c95a47218f66c6501cd6dd45ff59'
checkvars['SRC_URI[sha256sum]'] =
'f3765c0f582d2dfc72c15f3b5a82aecfae9498bd29ca840d72f37d7bd38bfcd5'
inherits = ['setuptools3']
self._test_recipe_contents(recipefile, checkvars, inherits)
@@ -500,11 +497,7 @@ class RecipetoolCreateTests(RecipetoolBase):
checkvars['LICENSE'] = set(['BSD-3-Clause'])
checkvars['LIC_FILES_CHKSUM'] =
'file://LICENSE;md5=702b1ef12cf66832a88f24c8f2ee9c19'
checkvars['SRC_URI'] =
'https://files.pythonhosted.org/packages/a1/fb/f95560c6a5d4469d9c49e24cf1b5d4d21ffab5608251c6020a965fb7791c/webcolors-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] = 'c9be30c5b0cf1cad32e4cbacbb2229e9'
-checkvars['SRC_URI[sha1sum]'] =
'c90b84fb65eed9b4c9dea7f08c657bfac0e820a5'
checkvars['SRC_URI[sha256sum]'] =
'c225b674c83fa923be93d235330ce0300373d02885cef23238813b0d5668304a'
-checkvars['SRC_URI[sha384sum]'] =
'45652af349660f19f68d01361dd5bda287789e5ea63608f52a8cea526ac04465614db2ea236103fb8456b1fcaea96ed7'
-checkvars['SRC_URI[sha512sum]'] =
'074aaf135ac6b0025b88b731d1d6dfa4c539b4fff7195658cc58a4326bb9f0449a231685d312b4a1ec48ca535a838bfa5c680787fe0e61473a2a092c448937d0'
inherits = ['python_setuptools_build_meta']
self._test_recipe_contents(recipefile, checkvars, inherits)
@@ -534,11 +527,7 @@ class RecipetoolCreateTests(RecipetoolBase):
checkvars['LICENSE'] = set(['MIT'])
checkvars['LIC_FILES_CHKSUM'] =
'file://LICENSE;md5=aab31f2ef7ba214a5a341eaa47a7f367'
checkvars['SRC_URI'] =
'https://files.pythonhosted.org/packages/b9/f3/ef59cee614d5e0accf6fd0cbba025b93b272e626ca89fb70a3e9187c5d15/iso8601-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] = '6e33910eba87066b3be7fcf3d59d16b5'
-checkvars['SRC_URI[sha1sum]'] =
'efd225b2c9fa7d9e4a1ec6ad94f3295cee982e61'
checkvars['SRC_URI[sha256sum]'] =
'6b1d3829ee8921c4301998c909f7829fa9ed3cbdac0d3b16af2d743aed1ba8df'
-checkvars['SRC_URI[sha384sum]'] =
'255002433fe65c19adfd6b91494271b613cb25ef6a35ac77436de1e03d60cc07bf89fd716451b917f1435e4384860ef6'
-checkvars['SRC_URI[sha512sum]'] =
'db57ab2a25ef91e3bc479c8539d27e853cf1fbf60986820b8999ae15d7e566425a1e0cfba47d0f3b23aa703db0576db368e6c110ba2a2f46c9a34e8ee3611fb7'
inherits = ['python_poetry_core']
self._test_recipe_contents(recipefile, checkvars, inherits)
@@ -568,11 +557,7 @@ class RecipetoolCreateTests(RecipetoolBase):
checkvars['LICENSE'] = set(['PSF-2.0'])
checkvars['LIC_FILES_CHKSUM'] =
'file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2'
checkvars['SRC_URI'] =
'https://files.pythonhosted.org/packages/1f/7a/8b94bb016069caa12fc9f587b28080ac33b4fbb8ca369b98bc0a4828543e/typing_extensions-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] =
[OE-core] [PATCH 5/9] lib/oe/recipeutils: Avoid wrapping any SRC_URI[sha*sum] variables
Before, a variable such as SRC_URI[sha512sum] would end up as: SRC_URI[sha512sum] = "45ff3abce4dab24a8090409e6d7bb26afa7fa7812a51e067 \ 28c2aa47d5b4de610d97ba4609cf13d9173087bd909fdf377235eee988a6fdcf52abb7 \ 0341c40b5b" when updated by patch_recipe_lines(). Signed-off-by: Peter Kjellerstedt --- meta/lib/oe/recipeutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 25b159bc1b..5fb73e65d7 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -26,7 +26,7 @@ from bb.utils import vercmp_string # Help us to find places to insert values recipe_progression = ['SUMMARY', 'DESCRIPTION', 'HOMEPAGE', 'BUGTRACKER', 'SECTION', 'LICENSE', 'LICENSE_FLAGS', 'LIC_FILES_CHKSUM', 'PROVIDES', 'DEPENDS', 'PR', 'PV', 'SRCREV', 'SRC_URI', 'S', 'do_fetch()', 'do_unpack()', 'do_patch()', 'EXTRA_OECONF', 'EXTRA_OECMAKE', 'EXTRA_OESCONS', 'do_configure()', 'EXTRA_OEMAKE', 'do_compile()', 'do_install()', 'do_populate_sysroot()', 'INITSCRIPT', 'USERADD', 'GROUPADD', 'PACKAGES', 'FILES', 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RPROVIDES', 'RREPLACES', 'RCONFLICTS', 'ALLOW_EMPTY', 'populate_packages()', 'do_package()', 'do_deploy()', 'BBCLASSEXTEND'] # Variables that sometimes are a bit long but shouldn't be wrapped -nowrap_vars = ['SUMMARY', 'HOMEPAGE', 'BUGTRACKER', r'SRC_URI\[(.+\.)?md5sum\]', r'SRC_URI\[(.+\.)?sha256sum\]'] +nowrap_vars = ['SUMMARY', 'HOMEPAGE', 'BUGTRACKER', r'SRC_URI\[(.+\.)?md5sum\]', r'SRC_URI\[(.+\.)?sha[0-9]+sum\]'] list_vars = ['SRC_URI', 'LIC_FILES_CHKSUM'] meta_vars = ['SUMMARY', 'DESCRIPTION', 'HOMEPAGE', 'BUGTRACKER', 'SECTION'] -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191912): https://lists.openembedded.org/g/openembedded-core/message/191912 Mute This Topic: https://lists.openembedded.org/mt/103019943/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 8/9] devtool: upgrade: Update all existing checksums for the SRC_URI
Rather than only updating the sha256sum and removing the md5sum, update
all existing checksums. If the only existing checksum is md5sum, then
replace it with the default expected checksums.
Signed-off-by: Peter Kjellerstedt
---
.../devtool/devtool-upgrade-test3_1.5.3.bb| 16 ++
.../devtool-upgrade-test3_1.5.3.bb.upgraded | 15 ++
.../devtool/devtool-upgrade-test4_1.5.3.bb| 22
.../devtool-upgrade-test4_1.5.3.bb.upgraded | 19 +++
meta/lib/oeqa/selftest/cases/devtool.py | 48 +
scripts/lib/devtool/upgrade.py| 51 ++-
6 files changed, 148 insertions(+), 23 deletions(-)
create mode 100644
meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
create mode 100644
meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
create mode 100644
meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
create mode 100644
meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
new file mode 100644
index 00..69c0d351ec
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
+LICENSE = "Artistic-2.0"
+LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
+
+SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
+UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
+RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
+
+SRC_URI[md5sum] = "9365d86bd884222b4bf1039b5a9ed1bd"
+
+S = "${WORKDIR}/pv-${PV}"
+
+EXCLUDE_FROM_WORLD = "1"
+
+inherit autotools
+
diff --git
a/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
new file mode 100644
index 00..3ce7e85e10
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded
@@ -0,0 +1,15 @@
+SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
+LICENSE = "Artistic-2.0"
+LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
+
+SRC_URI[sha256sum] =
"9dd45391806b0ed215abee4c5ac1597d018c386fe9c1f5afd2f6bc3b07fd82c3"
+SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
+UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
+RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
+
+S = "${WORKDIR}/pv-${PV}"
+
+EXCLUDE_FROM_WORLD = "1"
+
+inherit autotools
+
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
new file mode 100644
index 00..9abf80e6ed
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
+LICENSE = "Artistic-2.0"
+LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
+
+SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
+UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
+RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
+
+SRC_URI[md5sum] = "9365d86bd884222b4bf1039b5a9ed1bd"
+SRC_URI[sha1sum] = "63a0801350e812541c7f8e9ad74e0d6b629d0b39"
+SRC_URI[sha256sum] =
"681bcca9784bf3cb2207e68236d1f68e2aa7b80f999b5750dc77dcd756e81fbc"
+SRC_URI[sha384sum] =
"5fff6390465ff23dbf573fcf39dfad3aed2f92074a35e6c02abe58b7678858d90fa6572ff4cb56df8b3e217c739cdbe3"
+SRC_URI[sha512sum] =
"32efe7071a363f547afc74e96774f711795edda1d2702823a347d0f9953e859b7d8c45b3e63e18ffb9e0d5ed5910be652d7d727c8676e81b6cb3aed0b13aec00"
+
+PR = "r5"
+
+S = "${WORKDIR}/pv-${PV}"
+
+EXCLUDE_FROM_WORLD = "1"
+
+inherit autotools
+
diff --git
a/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
new file mode 100644
index 00..cd2a0842f4
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded
@@ -0,0 +1,19 @@
+SUMMARY = "Pipe viewer test recipe for devtool upgrade test"
+LICENSE = "Artistic-2.0"
+LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
+
+SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.gz;
+UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml;
+RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
+
+SRC_URI[sha1sum] = "395ce62f4f3e035b86c77038f04b96c5aa233595"
+SRC_URI[sha256sum] =
"9dd45391806b0ed215abee4c5ac1597d018c386fe9c1f5afd2f6bc3b07fd82c3"
+SRC_URI[sha384sum] =
"218c8d2d097aeba5310be759bc20573f18ffa0b11701eac6dd2e7e14ddf13c6e0e094ca7ca026eaa05ef92a056402e36"
+SRC_URI[sha512sum] =
[OE-core] [PATCH 3/9] oeqa/selftest/devtool: Make test_devtool_load_plugin more resilient
* Avoid trying to write to read-only directories and file systems.
* Support symbolic links in BBPATH.
Signed-off-by: Peter Kjellerstedt
---
meta/lib/oeqa/selftest/cases/devtool.py | 25 -
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index 03d57cc30a..e01ab01869 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -4,6 +4,7 @@
# SPDX-License-Identifier: MIT
#
+import errno
import os
import re
import shutil
@@ -1900,7 +1901,15 @@ class DevtoolUpgradeTests(DevtoolBase):
for p in paths:
dstdir = os.path.join(dstdir, p)
if not os.path.exists(dstdir):
-os.makedirs(dstdir)
+try:
+os.makedirs(dstdir)
+except PermissionError:
+return False
+except OSError as e:
+if e.errno == errno.EROFS:
+return False
+else:
+raise e
if p == "lib":
# Can race with other tests
self.add_command_to_tearDown('rmdir
--ignore-fail-on-non-empty %s' % dstdir)
@@ -1908,8 +1917,12 @@ class DevtoolUpgradeTests(DevtoolBase):
self.track_for_cleanup(dstdir)
dstfile = os.path.join(dstdir, os.path.basename(srcfile))
if srcfile != dstfile:
-shutil.copy(srcfile, dstfile)
+try:
+shutil.copy(srcfile, dstfile)
+except PermissionError:
+return False
self.track_for_cleanup(dstfile)
+return True
def test_devtool_load_plugin(self):
"""Test that devtool loads only the first found plugin in BBPATH."""
@@ -1927,15 +1940,17 @@ class DevtoolUpgradeTests(DevtoolBase):
plugincontent = fh.readlines()
try:
self.assertIn('meta-selftest', srcfile, 'wrong bbpath plugin
found')
-for path in searchpath:
-self._copy_file_with_cleanup(srcfile, path, 'lib', 'devtool')
+searchpath = [
+path for path in searchpath
+if self._copy_file_with_cleanup(srcfile, path, 'lib',
'devtool')
+]
result = runCmd("devtool --quiet count")
self.assertEqual(result.output, '1')
result = runCmd("devtool --quiet multiloaded")
self.assertEqual(result.output, "no")
for path in searchpath:
result = runCmd("devtool --quiet bbdir")
-self.assertEqual(result.output, path)
+self.assertEqual(os.path.realpath(result.output),
os.path.realpath(path))
os.unlink(os.path.join(result.output, 'lib', 'devtool',
'bbpath.py'))
finally:
with open(srcfile, 'w') as fh:
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191914):
https://lists.openembedded.org/g/openembedded-core/message/191914
Mute This Topic: https://lists.openembedded.org/mt/103019945/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 6/9] recipetool: create: Improve identification of licenses
Rather than having a static list of crunched MD5 checksums for some of
the most common licenses, calculate it for all common licenses. This
should improve the identification of license text variantions.
Signed-off-by: Peter Kjellerstedt
---
scripts/lib/recipetool/create.py | 91
1 file changed, 45 insertions(+), 46 deletions(-)
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 293198d1c8..66b985487a 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -1059,54 +1059,18 @@ def get_license_md5sums(d, static_only=False,
linenumbers=False):
return md5sums
-def crunch_license(licfile):
+def crunch_known_licenses(d):
'''
-Remove non-material text from a license file and then check
-its md5sum against a known list. This works well for licenses
-which contain a copyright statement, but is also a useful way
-to handle people's insistence upon reformatting the license text
-slightly (with no material difference to the text of the
-license).
+Calculate the MD5 checksums for the crunched versions of all common
+licenses. Also add additional known checksums.
'''
-
-import oe.utils
-
-# Note: these are carefully constructed!
-license_title_re = re.compile(r'^#*\(? *(This is )?([Tt]he )?.{0,15}
?[Ll]icen[sc]e( \(.{1,10}\))?\)?[:\.]? ?#*$')
-license_statement_re = re.compile(r'^((This (project|software)|.{1,10})
is( free software)? (released|licen[sc]ed)|(Released|Licen[cs]ed)) under the
.{1,10} [Ll]icen[sc]e:?$')
-copyright_re = re.compile('^ *[#\*]* *(Modified work |MIT LICENSED
)?Copyright ?(\([cC]\))? .*$')
-disclaimer_re = re.compile('^ *\*? ?All [Rr]ights [Rr]eserved\.$')
-email_re = re.compile('^.*<[\w\.-]*@[\w\.\-]*>$')
-header_re = re.compile('^(\/\**!?)? ?[\-=\*]* ?(\*\/)?$')
-tag_re = re.compile('^ *@?\(?([Ll]icense|MIT)\)?$')
-url_re = re.compile('^ *[#\*]* *https?:\/\/[\w\.\/\-]+$')
-
+
crunched_md5sums = {}
# common licenses
-crunched_md5sums['89f3bf322f30a1dcfe952e09945842f0'] = 'Apache-2.0'
-crunched_md5sums['13b6fe3075f8f42f2270a748965bf3a1'] = '0BSD'
-crunched_md5sums['ba87a7d7c20719c8df4b8beed9b78c43'] = 'BSD-2-Clause'
-crunched_md5sums['7f8892c03b72de419c27be4ebfa253f8'] = 'BSD-3-Clause'
-crunched_md5sums['21128c0790b23a8a9f9e260d5f6b3619'] = 'BSL-1.0'
-crunched_md5sums['975742a59ae1b8abdea63a97121f49f4'] = 'EDL-1.0'
-crunched_md5sums['5322cee4433d84fb3aafc9e253116447'] = 'EPL-1.0'
-crunched_md5sums['6922352e87de080f42419bed93063754'] = 'EPL-2.0'
-crunched_md5sums['793475baa22295cae1d3d4046a3a0ceb'] = 'GPL-2.0-only'
-crunched_md5sums['ff9047f969b02c20f0559470df5cb433'] = 'GPL-2.0-or-later'
-crunched_md5sums['ea6de5453fcadf534df246e6cdafadcd'] = 'GPL-3.0-only'
-crunched_md5sums['b419257d4d153a6fde92ddf96acf5b67'] = 'GPL-3.0-or-later'
-crunched_md5sums['228737f4c49d3ee75b8fb3706b090b84'] = 'ISC'
-crunched_md5sums['c6a782e826ca4e85bf7f8b89435a677d'] = 'LGPL-2.0-only'
-crunched_md5sums['32d8f758a066752f0db09bd7624b8090'] = 'LGPL-2.0-or-later'
-crunched_md5sums['4820937eb198b4f84c52217ed230be33'] = 'LGPL-2.1-only'
-crunched_md5sums['db13fe9f3a13af7adab2dc7a76f9e44a'] = 'LGPL-2.1-or-later'
-crunched_md5sums['d7a0f2e4e0950e837ac3eabf5bd1d246'] = 'LGPL-3.0-only'
-crunched_md5sums['abbf328e2b434f9153351f06b9f79d02'] = 'LGPL-3.0-or-later'
-crunched_md5sums['eecf6429523cbc9693547cf2db790b5c'] = 'MIT'
-crunched_md5sums['b218b0e94290b9b818c4be67c8e1cc82'] = 'MIT-0'
-crunched_md5sums['ddc18131d6748374f0f35a621c245b49'] = 'Unlicense'
-crunched_md5sums['51f9570ff32571fc0a443102285c5e33'] = 'WTFPL'
+crunched_md5sums['ad4e9d34a2e966dfe9837f18de03266d'] = 'GFDL-1.1-only'
+crunched_md5sums['d014fb11a34eb67dc717fdcfc97e60ed'] = 'GFDL-1.2-only'
+crunched_md5sums['e020ca655b06c112def28e597ab844f1'] = 'GFDL-1.3-only'
# The following two were gleaned from the "forever" npm package
crunched_md5sums['0a97f8e4cbaf889d6fa51f84b89a79f6'] = 'ISC'
@@ -1162,6 +1126,39 @@ def crunch_license(licfile):
# https://raw.githubusercontent.com/stackgl/gl-mat3/v2.0.0/LICENSE.md
crunched_md5sums['75512892d6f59dddb6d1c7e191957e9c'] = 'Zlib'
+commonlicdir = d.getVar('COMMON_LICENSE_DIR')
+for fn in sorted(os.listdir(commonlicdir)):
+md5value, lictext = crunch_license(os.path.join(commonlicdir, fn))
+if md5value not in crunched_md5sums:
+crunched_md5sums[md5value] = fn
+elif fn != crunched_md5sums[md5value]:
+bb.debug(2, "crunched_md5sums['%s'] is already set to '%s' rather
than '%s'" % (md5value, crunched_md5sums[md5value], fn))
+else:
+bb.debug(2, "crunched_md5sums['%s'] is already set to '%s'" %
(md5value, crunched_md5sums[md5value]))
+
+return crunched_md5sums
+
+def crunch_license(licfile):
+'''
+Remove
[OE-core] [PATCH 0/9] Improvements for devtool/recipetool
The recent Yocto Project Summit and the devtool hands-on class triggered a couple of questions for me, and when I investigated them, I stumbled upon a number of problems. This series of patches solves them. The first four patches are needed for me to be able to execute the devtool and recipetool selftests in our environment. The next four patches improve the identification of the license(s) used by a recipe, and makes the SRC_URI checksums used by devtool and recipetool consistent. Finally, there is a patch to make `devtool --no-extract` work again (it regressed with the recent devtool changes that improved git submodule support). //Peter Peter Kjellerstedt (9): oeqa/selftest/devtool: Correct git clone of local repository oeqa/selftest/devtool: Avoid global Git hooks when amending a patch oeqa/selftest/devtool: Make test_devtool_load_plugin more resilient oeqa/selftest/recipetool: Make test_recipetool_load_plugin more resilient lib/oe/recipeutils: Avoid wrapping any SRC_URI[sha*sum] variables recipetool: create: Improve identification of licenses recipetool: create: Only include the expected SRC_URI checksums devtool: upgrade: Update all existing checksums for the SRC_URI devtool: modify: Make --no-extract work again .../devtool/devtool-upgrade-test3_1.5.3.bb| 16 .../devtool-upgrade-test3_1.5.3.bb.upgraded | 15 +++ .../devtool/devtool-upgrade-test4_1.5.3.bb| 22 + .../devtool-upgrade-test4_1.5.3.bb.upgraded | 19 meta/lib/oe/recipeutils.py| 2 +- meta/lib/oeqa/selftest/cases/devtool.py | 77 +-- meta/lib/oeqa/selftest/cases/recipetool.py| 44 - scripts/lib/devtool/standard.py | 3 +- scripts/lib/devtool/upgrade.py| 51 +- scripts/lib/recipetool/create.py | 95 ++- 10 files changed, 241 insertions(+), 103 deletions(-) create mode 100644 meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb create mode 100644 meta-selftest/recipes-test/devtool/devtool-upgrade-test3_1.5.3.bb.upgraded create mode 100644 meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb create mode 100644 meta-selftest/recipes-test/devtool/devtool-upgrade-test4_1.5.3.bb.upgraded -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191909): https://lists.openembedded.org/g/openembedded-core/message/191909 Mute This Topic: https://lists.openembedded.org/mt/103019939/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] wic/DirectPlugin: don't update fstab if --no-fstab-update
From: Jörg Sommer
The function `update_fstab` should not touch the fstab for partitions with
`--no-fstab-update`.
Signed-off-by: Jörg Sommer
---
scripts/lib/wic/plugins/imager/direct.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/lib/wic/plugins/imager/direct.py
b/scripts/lib/wic/plugins/imager/direct.py
index 9b619e41c1..013aa4255f 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -116,7 +116,7 @@ class DirectPlugin(ImagerPlugin):
updated = False
for part in self.parts:
-if not part.realnum or not part.mountpoint \
+if not part.realnum or not part.mountpoint or part.no_fstab_update
\
or part.mountpoint == "/" or not
(part.mountpoint.startswith('/') or part.mountpoint == "swap"):
continue
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191906):
https://lists.openembedded.org/g/openembedded-core/message/191906
Mute This Topic: https://lists.openembedded.org/mt/103018986/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2 2/2] go: update 1.20.11 -> 1.20.12
Upgrade to latest 1.20.x release [1]:
$ git log --oneline go1.20.11..go1.20.12
97c8ff8d53 (tag: go1.20.12, origin/release-branch.go1.20)
[release-branch.go1.20] go1.20.12
6446af942e [release-branch.go1.20] net/http: limit chunked data overhead
77397ffcb2 [release-branch.go1.20] crypto/rand,runtime: revert "switch
RtlGenRandom for ProcessPrng"
d77307f855 [release-branch.go1.20] cmd/compile: fix findIndVar so it does not
match disjointed loop headers
1bd76576fe [release-branch.go1.20] crypto/rand,runtime: switch RtlGenRandom for
ProcessPrng
1b59b017db [release-branch.go1.20] path/filepath: consider \\?\c: as a volume
on Windows
46bc33819a [release-branch.go1.20] cmd/go/internal/vcs: error out if the
requested repo does not support a secure protocol
e1dc209be8 [release-branch.go1.20] cmd/go/internal/modfetch/codehost: set
core.longpaths in Git repos on Windows
[1] https://github.com/golang/go/compare/go1.20.11...go1.20.12
Signed-off-by: Jose Quaresma
---
v2: add the missing 1.20.12 files
meta/recipes-devtools/go/{go-1.20.11.inc => go-1.20.12.inc} | 2 +-
...binary-native_1.20.11.bb => go-binary-native_1.20.12.bb} | 6 +++---
...oss-canadian_1.20.11.bb => go-cross-canadian_1.20.12.bb} | 0
.../go/{go-cross_1.20.11.bb => go-cross_1.20.12.bb} | 0
.../go/{go-crosssdk_1.20.11.bb => go-crosssdk_1.20.12.bb} | 0
.../go/{go-native_1.20.11.bb => go-native_1.20.12.bb} | 0
.../go/{go-runtime_1.20.11.bb => go-runtime_1.20.12.bb} | 0
meta/recipes-devtools/go/{go_1.20.11.bb => go_1.20.12.bb} | 0
8 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/go/{go-1.20.11.inc => go-1.20.12.inc} (89%)
rename meta/recipes-devtools/go/{go-binary-native_1.20.11.bb =>
go-binary-native_1.20.12.bb} (78%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.20.11.bb =>
go-cross-canadian_1.20.12.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.20.11.bb => go-cross_1.20.12.bb}
(100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.20.11.bb =>
go-crosssdk_1.20.12.bb} (100%)
rename meta/recipes-devtools/go/{go-native_1.20.11.bb => go-native_1.20.12.bb}
(100%)
rename meta/recipes-devtools/go/{go-runtime_1.20.11.bb =>
go-runtime_1.20.12.bb} (100%)
rename meta/recipes-devtools/go/{go_1.20.11.bb => go_1.20.12.bb} (100%)
diff --git a/meta/recipes-devtools/go/go-1.20.11.inc
b/meta/recipes-devtools/go/go-1.20.12.inc
similarity index 89%
rename from meta/recipes-devtools/go/go-1.20.11.inc
rename to meta/recipes-devtools/go/go-1.20.12.inc
index 2f510b1791..9be56c6707 100644
--- a/meta/recipes-devtools/go/go-1.20.11.inc
+++ b/meta/recipes-devtools/go/go-1.20.12.inc
@@ -15,4 +15,4 @@ SRC_URI += "\
file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \
"
-SRC_URI[main.sha256sum] =
"d355c5ae3a8f7763c9ec9dc25153aae373958cbcb60dd09e91a8b56c7621b2fc"
+SRC_URI[main.sha256sum] =
"c5bf934751d31c315c1d0bb5fb02296545fa6d08923566f7a5afec81f2ed27d6"
diff --git a/meta/recipes-devtools/go/go-binary-native_1.20.11.bb
b/meta/recipes-devtools/go/go-binary-native_1.20.12.bb
similarity index 78%
rename from meta/recipes-devtools/go/go-binary-native_1.20.11.bb
rename to meta/recipes-devtools/go/go-binary-native_1.20.12.bb
index bf91067971..e555412a19 100644
--- a/meta/recipes-devtools/go/go-binary-native_1.20.11.bb
+++ b/meta/recipes-devtools/go/go-binary-native_1.20.12.bb
@@ -9,9 +9,9 @@ PROVIDES = "go-native"
# Checksums available at https://go.dev/dl/
SRC_URI =
"https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE};
-SRC_URI[go_linux_amd64.sha256sum] =
"ef79a11aa095a08772d2a69e4f152f897c4e96ee297b0dc20264b7dec2961abe"
-SRC_URI[go_linux_arm64.sha256sum] =
"7908a49c6ce9d48af9b5ba76ccaa0769da45d8b635259a01065b3739acef4ada"
-SRC_URI[go_linux_ppc64le.sha256sum] =
"e04676e1aeafe7c415176f330322d43a4be5ea6deb14aca49905bd1449dc7072"
+SRC_URI[go_linux_amd64.sha256sum] =
"9c5d48c54dd8b0a3b2ef91b0f92a1190aa01f11d26e98033efa64c46a30bba7b"
+SRC_URI[go_linux_arm64.sha256sum] =
"8afe8e3fb6972eaa2179ef0a71678c67f26509fab4f0f67c4b00f4cdfa92dc87"
+SRC_URI[go_linux_ppc64le.sha256sum] =
"2ae0ec3736216dfbd7b01ff679842dc1bed365e53a024d522645bcffd01c7328"
UPSTREAM_CHECK_URI = "https://golang.org/dl/;
UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux"
diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.20.11.bb
b/meta/recipes-devtools/go/go-cross-canadian_1.20.12.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross-canadian_1.20.11.bb
rename to meta/recipes-devtools/go/go-cross-canadian_1.20.12.bb
diff --git a/meta/recipes-devtools/go/go-cross_1.20.11.bb
b/meta/recipes-devtools/go/go-cross_1.20.12.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross_1.20.11.bb
rename to meta/recipes-devtools/go/go-cross_1.20.12.bb
diff --git a/meta/recipes-devtools/go/go-crosssdk_1.20.11.bb
[OE-core] [PATCH v2 1/2] go: update 1.20.10 -> 1.20.11
Upgrade to latest 1.20.x release [1]:
$ git log --oneline go1.20.10..go1.20.11
1d0d4b149c (tag: go1.20.11) [release-branch.go1.20] go1.20.11
46fb781685 [release-branch.go1.20] path/filepath: fix various issues in parsing
Windows paths
998fdce3ae [release-branch.go1.20] net/http: pull http2 underflow fix from
x/net/http2
d48639094b [release-branch.go1.20] cmd/link: split text sections for arm 32-bit
c8fdffb790 [release-branch.go1.20] all: tidy dependency versioning after release
[1] https://github.com/golang/go/compare/go1.20.10...go1.20.11
Signed-off-by: Jose Quaresma
---
meta/recipes-devtools/go/{go-1.20.10.inc => go-1.20.11.inc} | 2 +-
...binary-native_1.20.10.bb => go-binary-native_1.20.11.bb} | 6 +++---
...oss-canadian_1.20.10.bb => go-cross-canadian_1.20.11.bb} | 0
.../go/{go-cross_1.20.10.bb => go-cross_1.20.11.bb} | 0
.../go/{go-crosssdk_1.20.10.bb => go-crosssdk_1.20.11.bb} | 0
.../go/{go-native_1.20.10.bb => go-native_1.20.11.bb} | 0
.../go/{go-runtime_1.20.10.bb => go-runtime_1.20.11.bb} | 0
meta/recipes-devtools/go/{go_1.20.10.bb => go_1.20.11.bb} | 0
8 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/go/{go-1.20.10.inc => go-1.20.11.inc} (89%)
rename meta/recipes-devtools/go/{go-binary-native_1.20.10.bb =>
go-binary-native_1.20.11.bb} (78%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.20.10.bb =>
go-cross-canadian_1.20.11.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.20.10.bb => go-cross_1.20.11.bb}
(100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.20.10.bb =>
go-crosssdk_1.20.11.bb} (100%)
rename meta/recipes-devtools/go/{go-native_1.20.10.bb => go-native_1.20.11.bb}
(100%)
rename meta/recipes-devtools/go/{go-runtime_1.20.10.bb =>
go-runtime_1.20.11.bb} (100%)
rename meta/recipes-devtools/go/{go_1.20.10.bb => go_1.20.11.bb} (100%)
diff --git a/meta/recipes-devtools/go/go-1.20.10.inc
b/meta/recipes-devtools/go/go-1.20.11.inc
similarity index 89%
rename from meta/recipes-devtools/go/go-1.20.10.inc
rename to meta/recipes-devtools/go/go-1.20.11.inc
index 39509ed986..2f510b1791 100644
--- a/meta/recipes-devtools/go/go-1.20.10.inc
+++ b/meta/recipes-devtools/go/go-1.20.11.inc
@@ -15,4 +15,4 @@ SRC_URI += "\
file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \
"
-SRC_URI[main.sha256sum] =
"72d2f51805c47150066c103754c75fddb2c19d48c9219fa33d1e46696c841dbb"
+SRC_URI[main.sha256sum] =
"d355c5ae3a8f7763c9ec9dc25153aae373958cbcb60dd09e91a8b56c7621b2fc"
diff --git a/meta/recipes-devtools/go/go-binary-native_1.20.10.bb
b/meta/recipes-devtools/go/go-binary-native_1.20.11.bb
similarity index 78%
rename from meta/recipes-devtools/go/go-binary-native_1.20.10.bb
rename to meta/recipes-devtools/go/go-binary-native_1.20.11.bb
index 691670c31e..bf91067971 100644
--- a/meta/recipes-devtools/go/go-binary-native_1.20.10.bb
+++ b/meta/recipes-devtools/go/go-binary-native_1.20.11.bb
@@ -9,9 +9,9 @@ PROVIDES = "go-native"
# Checksums available at https://go.dev/dl/
SRC_URI =
"https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE};
-SRC_URI[go_linux_amd64.sha256sum] =
"80d34f1fd74e382d86c2d6102e0e60d4318461a7c2f457ec1efc4042752d4248"
-SRC_URI[go_linux_arm64.sha256sum] =
"fb3c7e15fc4413c5b81eb9f26dbd7cd4faedd5c720b30fa8e2ff77457f74cab6"
-SRC_URI[go_linux_ppc64le.sha256sum] =
"ebac6e713810174f9ffd7f48c17c373fbf359d50d8e6233b1dfbbdebd524fd1c"
+SRC_URI[go_linux_amd64.sha256sum] =
"ef79a11aa095a08772d2a69e4f152f897c4e96ee297b0dc20264b7dec2961abe"
+SRC_URI[go_linux_arm64.sha256sum] =
"7908a49c6ce9d48af9b5ba76ccaa0769da45d8b635259a01065b3739acef4ada"
+SRC_URI[go_linux_ppc64le.sha256sum] =
"e04676e1aeafe7c415176f330322d43a4be5ea6deb14aca49905bd1449dc7072"
UPSTREAM_CHECK_URI = "https://golang.org/dl/;
UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux"
diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.20.10.bb
b/meta/recipes-devtools/go/go-cross-canadian_1.20.11.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross-canadian_1.20.10.bb
rename to meta/recipes-devtools/go/go-cross-canadian_1.20.11.bb
diff --git a/meta/recipes-devtools/go/go-cross_1.20.10.bb
b/meta/recipes-devtools/go/go-cross_1.20.11.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross_1.20.10.bb
rename to meta/recipes-devtools/go/go-cross_1.20.11.bb
diff --git a/meta/recipes-devtools/go/go-crosssdk_1.20.10.bb
b/meta/recipes-devtools/go/go-crosssdk_1.20.11.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-crosssdk_1.20.10.bb
rename to meta/recipes-devtools/go/go-crosssdk_1.20.11.bb
diff --git a/meta/recipes-devtools/go/go-native_1.20.10.bb
b/meta/recipes-devtools/go/go-native_1.20.11.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-native_1.20.10.bb
rename to meta/recipes-devtools/go/go-native_1.20.11.bb
diff --git
[OE-core] [PATCH 2/2] go: update 1.20.11 -> 1.20.12
Upgrade to latest 1.20.x release [1]:
$ git log --oneline go1.20.11..go1.20.12
97c8ff8d53 (tag: go1.20.12, origin/release-branch.go1.20)
[release-branch.go1.20] go1.20.12
6446af942e [release-branch.go1.20] net/http: limit chunked data overhead
77397ffcb2 [release-branch.go1.20] crypto/rand,runtime: revert "switch
RtlGenRandom for ProcessPrng"
d77307f855 [release-branch.go1.20] cmd/compile: fix findIndVar so it does not
match disjointed loop headers
1bd76576fe [release-branch.go1.20] crypto/rand,runtime: switch RtlGenRandom for
ProcessPrng
1b59b017db [release-branch.go1.20] path/filepath: consider \\?\c: as a volume
on Windows
46bc33819a [release-branch.go1.20] cmd/go/internal/vcs: error out if the
requested repo does not support a secure protocol
e1dc209be8 [release-branch.go1.20] cmd/go/internal/modfetch/codehost: set
core.longpaths in Git repos on Windows
[1] https://github.com/golang/go/compare/go1.20.11...go1.20.12
Signed-off-by: Jose Quaresma
---
meta/recipes-devtools/go/go-1.20.11.inc | 18 --
.../go/go-binary-native_1.20.11.bb| 50
.../go/go-cross-canadian_1.20.11.bb | 2 -
meta/recipes-devtools/go/go-cross_1.20.11.bb | 2 -
.../go/go-crosssdk_1.20.11.bb | 2 -
meta/recipes-devtools/go/go-native_1.20.11.bb | 58 ---
.../recipes-devtools/go/go-runtime_1.20.11.bb | 3 -
meta/recipes-devtools/go/go_1.20.11.bb| 18 --
8 files changed, 153 deletions(-)
delete mode 100644 meta/recipes-devtools/go/go-1.20.11.inc
delete mode 100644 meta/recipes-devtools/go/go-binary-native_1.20.11.bb
delete mode 100644 meta/recipes-devtools/go/go-cross-canadian_1.20.11.bb
delete mode 100644 meta/recipes-devtools/go/go-cross_1.20.11.bb
delete mode 100644 meta/recipes-devtools/go/go-crosssdk_1.20.11.bb
delete mode 100644 meta/recipes-devtools/go/go-native_1.20.11.bb
delete mode 100644 meta/recipes-devtools/go/go-runtime_1.20.11.bb
delete mode 100644 meta/recipes-devtools/go/go_1.20.11.bb
diff --git a/meta/recipes-devtools/go/go-1.20.11.inc
b/meta/recipes-devtools/go/go-1.20.11.inc
deleted file mode 100644
index 2f510b1791..00
--- a/meta/recipes-devtools/go/go-1.20.11.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-require go-common.inc
-
-FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go:"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
-
-SRC_URI += "\
-file://0001-cmd-go-make-content-based-hash-generation-less-pedan.patch \
-file://0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch \
-file://0003-ld-add-soname-to-shareable-objects.patch \
-file://0004-make.bash-override-CC-when-building-dist-and-go_boot.patch \
-file://0005-cmd-dist-separate-host-and-target-builds.patch \
-file://0006-cmd-go-make-GOROOT-precious-by-default.patch \
-file://0007-exec.go-do-not-write-linker-flags-into-buildids.patch \
-file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
-file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \
-"
-SRC_URI[main.sha256sum] =
"d355c5ae3a8f7763c9ec9dc25153aae373958cbcb60dd09e91a8b56c7621b2fc"
diff --git a/meta/recipes-devtools/go/go-binary-native_1.20.11.bb
b/meta/recipes-devtools/go/go-binary-native_1.20.11.bb
deleted file mode 100644
index bf91067971..00
--- a/meta/recipes-devtools/go/go-binary-native_1.20.11.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-# This recipe is for bootstrapping our go-cross from a prebuilt binary of Go
from golang.org.
-
-SUMMARY = "Go programming language compiler (upstream binary for bootstrap)"
-HOMEPAGE = " http://golang.org/;
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
-
-PROVIDES = "go-native"
-
-# Checksums available at https://go.dev/dl/
-SRC_URI =
"https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE};
-SRC_URI[go_linux_amd64.sha256sum] =
"ef79a11aa095a08772d2a69e4f152f897c4e96ee297b0dc20264b7dec2961abe"
-SRC_URI[go_linux_arm64.sha256sum] =
"7908a49c6ce9d48af9b5ba76ccaa0769da45d8b635259a01065b3739acef4ada"
-SRC_URI[go_linux_ppc64le.sha256sum] =
"e04676e1aeafe7c415176f330322d43a4be5ea6deb14aca49905bd1449dc7072"
-
-UPSTREAM_CHECK_URI = "https://golang.org/dl/;
-UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux"
-
-CVE_PRODUCT = "go"
-
-S = "${WORKDIR}/go"
-
-inherit goarch native
-
-do_compile() {
-:
-}
-
-make_wrapper() {
- rm -f ${D}${bindir}/$1
- cat <${D}${bindir}/$1
-#!/bin/bash
-here=\`dirname \$0\`
-export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go\`}"
-\$here/../lib/go/bin/$1 "\$@"
-END
- chmod +x ${D}${bindir}/$1
-}
-
-do_install() {
-find ${S} -depth -type d -name testdata -exec rm -rf {} +
-
- install -d ${D}${bindir} ${D}${libdir}/go
- cp --preserve=mode,timestamps -R ${S}/ ${D}${libdir}/
-
- for f in ${S}/bin/*
- do
- make_wrapper `basename $f`
- done
-}
diff --git
[OE-core] [PATCH 1/2] go: update 1.20.10 -> 1.20.11
Upgrade to latest 1.20.x release [1]:
$ git log --oneline go1.20.10..go1.20.11
1d0d4b149c (tag: go1.20.11) [release-branch.go1.20] go1.20.11
46fb781685 [release-branch.go1.20] path/filepath: fix various issues in parsing
Windows paths
998fdce3ae [release-branch.go1.20] net/http: pull http2 underflow fix from
x/net/http2
d48639094b [release-branch.go1.20] cmd/link: split text sections for arm 32-bit
c8fdffb790 [release-branch.go1.20] all: tidy dependency versioning after release
[1] https://github.com/golang/go/compare/go1.20.10...go1.20.11
Signed-off-by: Jose Quaresma
---
meta/recipes-devtools/go/{go-1.20.10.inc => go-1.20.11.inc} | 2 +-
...binary-native_1.20.10.bb => go-binary-native_1.20.11.bb} | 6 +++---
...oss-canadian_1.20.10.bb => go-cross-canadian_1.20.11.bb} | 0
.../go/{go-cross_1.20.10.bb => go-cross_1.20.11.bb} | 0
.../go/{go-crosssdk_1.20.10.bb => go-crosssdk_1.20.11.bb} | 0
.../go/{go-native_1.20.10.bb => go-native_1.20.11.bb} | 0
.../go/{go-runtime_1.20.10.bb => go-runtime_1.20.11.bb} | 0
meta/recipes-devtools/go/{go_1.20.10.bb => go_1.20.11.bb} | 0
8 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/go/{go-1.20.10.inc => go-1.20.11.inc} (89%)
rename meta/recipes-devtools/go/{go-binary-native_1.20.10.bb =>
go-binary-native_1.20.11.bb} (78%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.20.10.bb =>
go-cross-canadian_1.20.11.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.20.10.bb => go-cross_1.20.11.bb}
(100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.20.10.bb =>
go-crosssdk_1.20.11.bb} (100%)
rename meta/recipes-devtools/go/{go-native_1.20.10.bb => go-native_1.20.11.bb}
(100%)
rename meta/recipes-devtools/go/{go-runtime_1.20.10.bb =>
go-runtime_1.20.11.bb} (100%)
rename meta/recipes-devtools/go/{go_1.20.10.bb => go_1.20.11.bb} (100%)
diff --git a/meta/recipes-devtools/go/go-1.20.10.inc
b/meta/recipes-devtools/go/go-1.20.11.inc
similarity index 89%
rename from meta/recipes-devtools/go/go-1.20.10.inc
rename to meta/recipes-devtools/go/go-1.20.11.inc
index 39509ed986..2f510b1791 100644
--- a/meta/recipes-devtools/go/go-1.20.10.inc
+++ b/meta/recipes-devtools/go/go-1.20.11.inc
@@ -15,4 +15,4 @@ SRC_URI += "\
file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \
"
-SRC_URI[main.sha256sum] =
"72d2f51805c47150066c103754c75fddb2c19d48c9219fa33d1e46696c841dbb"
+SRC_URI[main.sha256sum] =
"d355c5ae3a8f7763c9ec9dc25153aae373958cbcb60dd09e91a8b56c7621b2fc"
diff --git a/meta/recipes-devtools/go/go-binary-native_1.20.10.bb
b/meta/recipes-devtools/go/go-binary-native_1.20.11.bb
similarity index 78%
rename from meta/recipes-devtools/go/go-binary-native_1.20.10.bb
rename to meta/recipes-devtools/go/go-binary-native_1.20.11.bb
index 691670c31e..bf91067971 100644
--- a/meta/recipes-devtools/go/go-binary-native_1.20.10.bb
+++ b/meta/recipes-devtools/go/go-binary-native_1.20.11.bb
@@ -9,9 +9,9 @@ PROVIDES = "go-native"
# Checksums available at https://go.dev/dl/
SRC_URI =
"https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE};
-SRC_URI[go_linux_amd64.sha256sum] =
"80d34f1fd74e382d86c2d6102e0e60d4318461a7c2f457ec1efc4042752d4248"
-SRC_URI[go_linux_arm64.sha256sum] =
"fb3c7e15fc4413c5b81eb9f26dbd7cd4faedd5c720b30fa8e2ff77457f74cab6"
-SRC_URI[go_linux_ppc64le.sha256sum] =
"ebac6e713810174f9ffd7f48c17c373fbf359d50d8e6233b1dfbbdebd524fd1c"
+SRC_URI[go_linux_amd64.sha256sum] =
"ef79a11aa095a08772d2a69e4f152f897c4e96ee297b0dc20264b7dec2961abe"
+SRC_URI[go_linux_arm64.sha256sum] =
"7908a49c6ce9d48af9b5ba76ccaa0769da45d8b635259a01065b3739acef4ada"
+SRC_URI[go_linux_ppc64le.sha256sum] =
"e04676e1aeafe7c415176f330322d43a4be5ea6deb14aca49905bd1449dc7072"
UPSTREAM_CHECK_URI = "https://golang.org/dl/;
UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux"
diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.20.10.bb
b/meta/recipes-devtools/go/go-cross-canadian_1.20.11.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross-canadian_1.20.10.bb
rename to meta/recipes-devtools/go/go-cross-canadian_1.20.11.bb
diff --git a/meta/recipes-devtools/go/go-cross_1.20.10.bb
b/meta/recipes-devtools/go/go-cross_1.20.11.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-cross_1.20.10.bb
rename to meta/recipes-devtools/go/go-cross_1.20.11.bb
diff --git a/meta/recipes-devtools/go/go-crosssdk_1.20.10.bb
b/meta/recipes-devtools/go/go-crosssdk_1.20.11.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-crosssdk_1.20.10.bb
rename to meta/recipes-devtools/go/go-crosssdk_1.20.11.bb
diff --git a/meta/recipes-devtools/go/go-native_1.20.10.bb
b/meta/recipes-devtools/go/go-native_1.20.11.bb
similarity index 100%
rename from meta/recipes-devtools/go/go-native_1.20.10.bb
rename to meta/recipes-devtools/go/go-native_1.20.11.bb
diff --git
[OE-core][RESEND][PATCH] zstd: fix LICENSE statement
From: Massimiliano Minella zstd is dual-licensed under BSD _OR_ GPLv2. License wording in the README for v1.5.5 is misleading, but license headers in the code clearly state that there is a choice between the two licenses. Signed-off-by: Massimiliano Minella --- meta/recipes-extended/zstd/zstd_1.5.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/zstd/zstd_1.5.5.bb b/meta/recipes-extended/zstd/zstd_1.5.5.bb index 5c5fb5e734..2d72af50a4 100644 --- a/meta/recipes-extended/zstd/zstd_1.5.5.bb +++ b/meta/recipes-extended/zstd/zstd_1.5.5.bb @@ -5,7 +5,7 @@ It's backed by a very fast entropy stage, provided by Huff0 and FSE library." HOMEPAGE = "http://www.zstd.net/; SECTION = "console/utils" -LICENSE = "BSD-3-Clause & GPL-2.0-only" +LICENSE = "BSD-3-Clause | GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=0822a32f7acdbe013606746641746ee8 \ file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0 \ " -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191901): https://lists.openembedded.org/g/openembedded-core/message/191901 Mute This Topic: https://lists.openembedded.org/mt/103015386/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: Patchtest results for [OE-core][dunfell 05/11] epiphany: fix CVE-2022-29536
On Wed, Dec 6, 2023 at 4:02 AM wrote: > > Thank you for your submission. Patchtest identified one > or more issues with the patch. Please see the log below for > more information: > > --- > Testing patch > /home/patchtest/share/mboxes/dunfell-05-11-epiphany-fix-CVE-2022-29536.patch > > FAIL: test CVE tag format: Missing or incorrectly formatted CVE tag in patch > file. Correct or include the CVE tag in the patch with format: "CVE: > CVE--" (test_patch.TestPatch.test_cve_tag_format) I've fixed the typo in the version of the patch that will be merged, so no need to re-submit: https://git.openembedded.org/openembedded-core-contrib/commit/?h=stable/dunfell-next=507b9de9df375721cd307163fe06c3ee567385e8 Steve > > PASS: test Signed-off-by presence > (test_mbox.TestMbox.test_signed_off_by_presence) > PASS: test Signed-off-by presence > (test_patch.TestPatch.test_signed_off_by_presence) > PASS: test Upstream-Status presence > (test_patch.TestPatch.test_upstream_status_presence_format) > PASS: test author valid (test_mbox.TestMbox.test_author_valid) > PASS: test commit message presence > (test_mbox.TestMbox.test_commit_message_presence) > PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) > PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) > PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) > PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) > > SKIP: test bugzilla entry format: No bug ID found > (test_mbox.TestMbox.test_bugzilla_entry_format) > SKIP: test pylint: No python related patches, skipping test > (test_python_pylint.PyLint.test_pylint) > SKIP: test series merge on head: Merge test is disabled for now > (test_mbox.TestMbox.test_series_merge_on_head) > SKIP: test target mailing list: Series merged, no reason to check other > mailing lists (test_mbox.TestMbox.test_target_mailing_list) > > --- > > Please address the issues identified and > submit a new revision of the patch, or alternatively, reply to this > email with an explanation of why the patch should be accepted. If you > believe these results are due to an error in patchtest, please submit a > bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category > under 'Yocto Project Subprojects'). For more information on specific > failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank > you! -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191900): https://lists.openembedded.org/g/openembedded-core/message/191900 Mute This Topic: https://lists.openembedded.org/mt/103012914/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Patchtest results for [OE-core][dunfell 11/11] cve-exclusion_5.4.inc: update for 5.4.262
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information: --- Testing patch /home/patchtest/share/mboxes/dunfell-11-11-cve-exclusion_5.4.inc-update-for-5.4.262.patch FAIL: test commit message presence: Please include a commit message on your patch explaining the change (test_mbox.TestMbox.test_commit_message_presence) PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format) SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence) SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list) --- Please address the issues identified and submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you! -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191899): https://lists.openembedded.org/g/openembedded-core/message/191899 Mute This Topic: https://lists.openembedded.org/mt/103012915/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Patchtest results for [OE-core][dunfell 05/11] epiphany: fix CVE-2022-29536
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information: --- Testing patch /home/patchtest/share/mboxes/dunfell-05-11-epiphany-fix-CVE-2022-29536.patch FAIL: test CVE tag format: Missing or incorrectly formatted CVE tag in patch file. Correct or include the CVE tag in the patch with format: "CVE: CVE--" (test_patch.TestPatch.test_cve_tag_format) PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence) PASS: test Signed-off-by presence (test_patch.TestPatch.test_signed_off_by_presence) PASS: test Upstream-Status presence (test_patch.TestPatch.test_upstream_status_presence_format) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list) --- Please address the issues identified and submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you! -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191898): https://lists.openembedded.org/g/openembedded-core/message/191898 Mute This Topic: https://lists.openembedded.org/mt/103012914/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][dunfell 10/11] linux-yocto/5.4: update to v5.4.262
From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 8e221b47173d Linux 5.4.262 b053223b7cf4 netfilter: nf_tables: bogus EBUSY when deleting flowtable after flush (for 5.4) c35df8b8c572 netfilter: nf_tables: disable toggling dormant table state more than once e10f661adc55 netfilter: nf_tables: fix table flag updates 46c2947fcd71 netfilter: nftables: update table flags from the commit phase b09e6ccf0d12 netfilter: nf_tables: double hook unregistration in netns path b05a24cc453e netfilter: nf_tables: unregister flowtable hooks on netns exit a995a68e8a3b netfilter: nf_tables: fix memleak when more than 255 elements expired b95d7af657a8 netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration 61a7b3de20e2 netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention 03caf75da105 netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction 021d734c7eaa netfilter: nf_tables: defer gc run if previous batch is still pending 38ed6a5f836f netfilter: nf_tables: use correct lock to protect gc_list 4b6346dc1edf netfilter: nf_tables: GC transaction race with abort path b76dcf466223 netfilter: nf_tables: GC transaction race with netns dismantle 29ff9b8efb84 netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path 1398a0eee290 netfilter: nf_tables: remove busy mark and gc batch API 85520a1f1d87 netfilter: nft_set_hash: mark set element as dead when deleting from packet path c357648929c8 netfilter: nf_tables: adapt set backend to use GC transaction API bbdb3b65aa91 netfilter: nf_tables: GC transaction API to avoid race with control plane 1da4874d05da netfilter: nf_tables: don't skip expired elements during walk acaee227cf79 netfilter: nft_set_rbtree: fix overlap expiration walk 899aa5638568 netfilter: nft_set_rbtree: fix null deref on element insertion 181859bdfb97 netfilter: nft_set_rbtree: Switch to node list walk for overlap detection 3c7ec098e3b5 netfilter: nf_tables: drop map element references from preparation phase 6b880f3b2c04 netfilter: nftables: rename set element data activation/deactivation functions e1eed9e0b5e8 netfilter: nf_tables: pass context to nft_set_destroy() 961c4511c757 tracing: Have trace_event_file have ref counters 7676a41d90c5 drm/amdgpu: fix error handling in amdgpu_bo_list_get() 36383005f1db ext4: remove gdb backup copy for meta bg in setup_new_flex_group_blocks e95f74653dff ext4: correct the start block of counting reserved clusters 1fbfdcc3d65e ext4: correct return value of ext4_convert_meta_bg dfdfd3f21830 ext4: correct offset of gdb backup in non meta_bg group to update_backups 85c12e80c474 ext4: apply umask if ACL support is disabled d2aed8814f02 Revert "net: r8169: Disable multicast filter for RTL8168H and RTL8107E" b9e5f633b35d nfsd: fix file memleak on client_opens_release 339d7d40d3dc media: venus: hfi: add checks to handle capabilities from firmware cab97cdd409a media: venus: hfi: fix the check to handle session buffer requirement 5d39d0c1f43f media: venus: hfi_parser: Add check to keep the number of codecs within range 497b12d47cc6 media: sharp: fix sharp encoding 92d8a0478fb3 media: lirc: drop trailing space from scancode transmit cac054d10324 i2c: i801: fix potential race in i801_block_transaction_byte_by_byte b132e462363f net: dsa: lan9303: consequently nested-lock physical MDIO 229738d71702 Revert ncsi: Propagate carrier gain/loss events to the NCSI controller 4074957ec6bb Bluetooth: btusb: Add 0bda:b85b for Fn-Link RTL8852BE 356a2ee5fc36 Bluetooth: btusb: Add RTW8852BE device 13d3:3570 to device tables afe92b66a5d8 bluetooth: Add device 13d3:3571 to device tables dc073a2626d3 bluetooth: Add device 0bda:887b to device tables 75d26f7f6118 Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0cb8:0xc559 323710a6b4c6 Bluetooth: btusb: add Realtek 8822CE to usb_device_id table 981ee23b8d48 Bluetooth: btusb: Add flag to define wideband speech capability 0fe69c99cc13 tty: serial: meson: fix hard LOCKUP on crtscts mode 8f40bbf7dc01 serial: meson: Use platform_get_irq() to get the interrupt a1113f2c9b2c tty: serial: meson: retrieve port FIFO size from DT 13391526d817 serial: meson: remove redundant initialization of variable id 6245d0d70fe8 ALSA: hda/realtek - Enable internal speaker of ASUS K6500ZC 4ef452297de4 ALSA: info: Fix potential deadlock at disconnection c7df9523fed2 parisc/pgtable: Do not drop upper 5 address bits of physical address c32dfec86714 parisc: Prevent booting 64-bit kernels on PA1.x machines d570d139cb38 i3c: master: cdns: Fix reading status register ad6941b192ca mm/cma: use nth_page() in place of direct struct page manipulation 36512866607e dmaengine: stm32-mdma: correct desc
[OE-core][dunfell 11/11] cve-exclusion_5.4.inc: update for 5.4.262
Signed-off-by: Steve Sakoman
---
.../linux/cve-exclusion_5.4.inc | 79 +++
1 file changed, 64 insertions(+), 15 deletions(-)
diff --git a/meta/recipes-kernel/linux/cve-exclusion_5.4.inc
b/meta/recipes-kernel/linux/cve-exclusion_5.4.inc
index 4c17b701df..983424d427 100644
--- a/meta/recipes-kernel/linux/cve-exclusion_5.4.inc
+++ b/meta/recipes-kernel/linux/cve-exclusion_5.4.inc
@@ -1,9 +1,9 @@
# Auto-generated CVE metadata, DO NOT EDIT BY HAND.
-# Generated at 2023-10-24 06:03:05.289306 for version 5.4.257
+# Generated at 2023-12-05 04:45:42.561193 for version 5.4.262
python check_kernel_cve_status_version() {
-this_version = "5.4.257"
+this_version = "5.4.262"
kernel_version = d.getVar("LINUX_VERSION")
if kernel_version != this_version:
bb.warn("Kernel CVE status needs updating: generated for %s but kernel
is %s" % (this_version, kernel_version))
@@ -5638,7 +5638,8 @@ CVE_CHECK_WHITELIST += "CVE-2021-43976"
# cpe-stable-backport: Backported in 5.4.170
CVE_CHECK_WHITELIST += "CVE-2021-44733"
-# CVE-2021-44879 needs backporting (fixed from 5.17rc1)
+# cpe-stable-backport: Backported in 5.4.260
+CVE_CHECK_WHITELIST += "CVE-2021-44879"
# cpe-stable-backport: Backported in 5.4.171
CVE_CHECK_WHITELIST += "CVE-2021-45095"
@@ -6500,7 +6501,7 @@ CVE_CHECK_WHITELIST += "CVE-2022-43945"
# CVE-2022-44033 needs backporting (fixed from 6.4rc1)
-# CVE-2022-44034 has no known resolution
+# CVE-2022-44034 needs backporting (fixed from 6.4rc1)
# CVE-2022-4543 has no known resolution
@@ -6670,7 +6671,8 @@ CVE_CHECK_WHITELIST += "CVE-2023-1118"
# fixed-version: only affects 5.15rc1 onwards
CVE_CHECK_WHITELIST += "CVE-2023-1192"
-# CVE-2023-1193 has no known resolution
+# fixed-version: only affects 5.15rc1 onwards
+CVE_CHECK_WHITELIST += "CVE-2023-1193"
# fixed-version: only affects 5.15rc1 onwards
CVE_CHECK_WHITELIST += "CVE-2023-1194"
@@ -6964,7 +6966,8 @@ CVE_CHECK_WHITELIST += "CVE-2023-3106"
# CVE-2023-31084 needs backporting (fixed from 6.4rc3)
-# CVE-2023-31085 needs backporting (fixed from 5.4.258)
+# cpe-stable-backport: Backported in 5.4.258
+CVE_CHECK_WHITELIST += "CVE-2023-31085"
# cpe-stable-backport: Backported in 5.4.247
CVE_CHECK_WHITELIST += "CVE-2023-3111"
@@ -7079,7 +7082,8 @@ CVE_CHECK_WHITELIST += "CVE-2023-34256"
# fixed-version: only affects 6.1 onwards
CVE_CHECK_WHITELIST += "CVE-2023-34319"
-# CVE-2023-34324 needs backporting (fixed from 5.4.258)
+# fixed-version: only affects 5.10rc1 onwards
+CVE_CHECK_WHITELIST += "CVE-2023-34324"
# fixed-version: only affects 5.15rc1 onwards
CVE_CHECK_WHITELIST += "CVE-2023-3439"
@@ -7104,7 +7108,8 @@ CVE_CHECK_WHITELIST += "CVE-2023-35824"
# fixed-version: only affects 5.18rc1 onwards
CVE_CHECK_WHITELIST += "CVE-2023-35826"
-# CVE-2023-35827 has no known resolution
+# cpe-stable-backport: Backported in 5.4.259
+CVE_CHECK_WHITELIST += "CVE-2023-35827"
# cpe-stable-backport: Backported in 5.4.243
CVE_CHECK_WHITELIST += "CVE-2023-35828"
@@ -7182,7 +7187,8 @@ CVE_CHECK_WHITELIST += "CVE-2023-3867"
# cpe-stable-backport: Backported in 5.4.257
CVE_CHECK_WHITELIST += "CVE-2023-39189"
-# CVE-2023-39191 needs backporting (fixed from 6.3rc1)
+# fixed-version: only affects 5.19rc1 onwards
+CVE_CHECK_WHITELIST += "CVE-2023-39191"
# cpe-stable-backport: Backported in 5.4.257
CVE_CHECK_WHITELIST += "CVE-2023-39192"
@@ -7193,6 +7199,11 @@ CVE_CHECK_WHITELIST += "CVE-2023-39193"
# cpe-stable-backport: Backported in 5.4.255
CVE_CHECK_WHITELIST += "CVE-2023-39194"
+# cpe-stable-backport: Backported in 5.4.251
+CVE_CHECK_WHITELIST += "CVE-2023-39197"
+
+# CVE-2023-39198 needs backporting (fixed from 6.5rc7)
+
# fixed-version: only affects 5.6rc1 onwards
CVE_CHECK_WHITELIST += "CVE-2023-4004"
@@ -7204,7 +7215,8 @@ CVE_CHECK_WHITELIST += "CVE-2023-4015"
# cpe-stable-backport: Backported in 5.4.253
CVE_CHECK_WHITELIST += "CVE-2023-40283"
-# CVE-2023-40791 needs backporting (fixed from 6.5rc6)
+# fixed-version: only affects 6.3rc1 onwards
+CVE_CHECK_WHITELIST += "CVE-2023-40791"
# cpe-stable-backport: Backported in 5.4.253
CVE_CHECK_WHITELIST += "CVE-2023-4128"
@@ -7246,7 +7258,8 @@ CVE_CHECK_WHITELIST += "CVE-2023-42752"
# cpe-stable-backport: Backported in 5.4.257
CVE_CHECK_WHITELIST += "CVE-2023-42753"
-# CVE-2023-42754 needs backporting (fixed from 5.4.258)
+# cpe-stable-backport: Backported in 5.4.258
+CVE_CHECK_WHITELIST += "CVE-2023-42754"
# cpe-stable-backport: Backported in 5.4.257
CVE_CHECK_WHITELIST += "CVE-2023-42755"
@@ -7281,14 +7294,16 @@ CVE_CHECK_WHITELIST += "CVE-2023-4569"
# cpe-stable-backport: Backported in 5.4.235
CVE_CHECK_WHITELIST += "CVE-2023-45862"
-# CVE-2023-45863 needs backporting (fixed from 6.3rc1)
+# cpe-stable-backport: Backported in 5.4.260
+CVE_CHECK_WHITELIST += "CVE-2023-45863"
# cpe-stable-backport: Backported in 5.4.257
CVE_CHECK_WHITELIST += "CVE-2023-45871"
-# CVE-2023-45898 needs
[OE-core][dunfell 09/11] linux-yocto/5.4: update to v5.4.260
From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 87e8e7a7aa1f Linux 5.4.260 8b0ecf2167a0 tty: 8250: Add support for Intashield IS-100 6dd5561b2385 tty: 8250: Add support for Brainboxes UP cards 03145e0ff8ab tty: 8250: Add support for additional Brainboxes UC cards 5a6471372f9b tty: 8250: Remove UC-257 and UC-431 72f236b57f1c usb: storage: set 1.50 as the lower bcdDevice for older "Super Top" compatibility 792a91fcd20d PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device 4b865e0d78a0 Revert "ARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driver" 4e53bab11f01 nvmet-tcp: Fix a possible UAF in queue intialization setup 2c9415ec8ea9 nvmet-tcp: move send/recv error handling in the send/recv methods instead of call-sites 784ef618b2cc remove the sx8 block driver a31f8222a74c ata: ahci: fix enum constants for gcc-13 cc1afa62e231 net: chelsio: cxgb4: add an error code check in t4_load_phy_fw 7e429d1f3994 platform/mellanox: mlxbf-tmfifo: Fix a warning message 5f4f58eac361 platform/x86: asus-wmi: Change ASUS_WMI_BRN_DOWN code from 0x20 to 0x2e 88d1aa03eb16 scsi: mpt3sas: Fix in error path b1f62e3ef90c fbdev: uvesafb: Call cn_del_callback() at the end of uvesafb_exit() fb02de64791c ASoC: rt5650: fix the wrong result of key button b6c09ff5eada netfilter: nfnetlink_log: silence bogus compiler warning 6c23b6d308af spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0 788b308340ef fbdev: atyfb: only use ioremap_uc() on i386 and ia64 848b9c688865 Input: synaptics-rmi4 - handle reset delay when using SMBus trsnsport a0bf183db438 dmaengine: ste_dma40: Fix PM disable depth imbalance in d40_probe 39ae053abbad irqchip/stm32-exti: add missing DT IRQ flag translation fbcd05a0dbda Input: i8042 - add Fujitsu Lifebook E5411 to i8042 quirk table cda248f16924 x86: Fix .brk attribute in linker script 01e6885b75e2 rpmsg: Fix possible refcount leak in rpmsg_register_device_override() cff56d7a9274 rpmsg: glink: Release driver_override 3d1478598057 rpmsg: Fix calling device_lock() on non-initialized device e70898ae1a42 rpmsg: Fix kfree() of static memory on setting driver_override 0df5d801359e rpmsg: Constify local variable in field store macro 063444d66f90 driver: platform: Add helper for safer setting of driver_override 83ecffd40c65 ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow 66cfd4cf6ac8 ext4: avoid overlapping preallocations due to overflow 1e0a5dec2638 ext4: add two helper functions extent_logical_end() and pa_logical_end() c2102ac1033f x86/mm: Fix RESERVE_BRK() for older binutils ced79d864bfd x86/mm: Simplify RESERVE_BRK() 5fc242c11804 nfsd: lock_rename() needs both directories to live on the same fs e9a988cd4c8b f2fs: fix to do sanity check on inode type during garbage collection 750de03de7e1 smbdirect: missing rc checks while waiting for rdma events 5776aeee2a60 kobject: Fix slab-out-of-bounds in fill_kobj_path() 0a45e0e5dd8d arm64: fix a concurrency issue in emulation_proc_handler() 6ba2ffe3cb1c drm/dp_mst: Fix NULL deref in get_mst_branch_device_by_guid_helper() 9d29933f36e1 x86/i8259: Skip probing when ACPI/MADT advertises PCAT compatibility 1ed21b207ece i40e: Fix wrong check for I40E_TXR_FLAGS_WB_ON_ITR f48670c3b089 clk: Sanitize possible_parent_show to Handle Return Value of of_clk_get_parent_name 511f3e9bbb0a perf/core: Fix potential NULL deref 8de78231cba9 nvmem: imx: correct nregs for i.MX6UL 0b2c3a8601cc nvmem: imx: correct nregs for i.MX6SLL 6063678df7fa nvmem: imx: correct nregs for i.MX6ULL 12337d3e8819 i2c: aspeed: Fix i2c bus hang in slave read e3d8ef87a9b1 i2c: stm32f7: Fix PEC handling in case of SMBUS transfers 5764f6e546a9 i2c: muxes: i2c-demux-pinctrl: Use of_get_i2c_adapter_by_node() a3b9bcedd7ad i2c: muxes: i2c-mux-gpmux: Use of_get_i2c_adapter_by_node() 07ec3d952a4a i2c: muxes: i2c-mux-pinctrl: Use of_get_i2c_adapter_by_node() 519ff2d9fecf iio: exynos-adc: request second interupt only when touchscreen mode is used 2bf9fbd13635 gtp: fix fragmentation needed check with gso 2ab1b7ad5046 gtp: uapi: fix GTPA_MAX 54ba3b8267b0 tcp: fix wrong RTO timeout when received SACK reneging 29cb3f81bc71 r8152: Cancel hw_phy_work if we have an error in probe 6124d0b100bf r8152: Run the unload routine if we have errors during probe 1d3cb4aa9388 r8152: Increase USB control msg timeout to 5000ms as per spec 2f8da9511607 net: ieee802154: adf7242: Fix some potential buffer overflow in adf7242_stats_show() ec885679fa9a igc: Fix ambiguity in the ethtool advertising 3b098edafefa neighbour: fix various data-races 418ca6e63e06 igb: Fix potential memory leak in igb_add_ethtool_nfc_entry 00ef4a7de62c treewide: Spelling fix in comment e44e78ff44e5 r8169: fix the
[OE-core][dunfell 08/11] linux-yocto/5.4: update to v5.4.258
From: Bruce Ashfield
Updating to the latest korg -stable release that comprises
the following commits:
02f78c59a0ed Linux 5.4.258
f70c285cf02c xen/events: replace evtchn_rwlock with RCU
e2614ab16a7e ima: rework CONFIG_IMA dependency block
b5c3bc4b8104 NFS: Fix a race in __nfs_list_for_each_server()
f0ea421fa2f7 parisc: Restore __ldcw_align for PA-RISC 2.0 processors
14e5d94d5c86 RDMA/mlx5: Fix NULL string error
6e26812e289b RDMA/siw: Fix connection failure handling
8ab1fb16dce0 RDMA/uverbs: Fix typo of sizeof argument
26d48f7090b8 RDMA/cma: Fix truncation compilation warning in make_cma_ports
f102dd8a1795 gpio: pxa: disable pinctrl calls for MMP_GPIO
e38aceeadb4b gpio: aspeed: fix the GPIO number passed to
pinctrl_gpio_set_config()
8584ee20a56c IB/mlx4: Fix the size of a buffer in add_port_entries()
35b689ee4b57 RDMA/core: Require admin capabilities to set system parameters
1047ca5bae20 cpupower: add Makefile dependencies for install targets
3c2f536c3d32 sctp: update hb timer immediately after users change
hb_interval
caf0c61f14e7 sctp: update transport state when processing a dupcook packet
14fc22c92937 tcp: fix delayed ACKs for MSS boundary condition
2791d64e6607 tcp: fix quick-ack counting to count actual ACKs of new data
7fbce1e46b41 net: stmmac: dwmac-stm32: fix resume on STM32 MCU
f110aa377ddc netfilter: handle the connecting collision properly in
nf_conntrack_proto_sctp
191d87a19cf1 net: nfc: llcp: Add lock when modifying device list
310f1c92f65a net: usb: smsc75xx: Fix uninit-value access in
__smsc75xx_read_reg
899205521005 net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent
1fc793d68d50 ipv4, ipv6: Fix handling of transhdrlen in
__ip{,6}_append_data()
95eabb075a59 net: fix possible store tearing in neigh_periodic_work()
10a301c83a3d modpost: add missing else to the "of" check
5e1c1bf53e5f NFSv4: Fix a nfs4_state_manager() race
f90821f66727 NFS: Add a helper nfs_client_for_each_server()
e2d4fc53e9f7 NFS4: Trace state recovery operation
c87f66c43c1b scsi: target: core: Fix deadlock due to recursive locking
8a1fa738b491 ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig
442e50393a29 regmap: rbtree: Fix wrong register marked as in-cache when
creating new node
52008a5e22ac wifi: mt76: mt76x02: fix MT76x0 external LNA gain handling
31b27776905a drivers/net: process the result of hdlc_open() and add call of
hdlc_close() in uhdlc_close()
b8e260654a29 wifi: mwifiex: Fix oob check condition in
mwifiex_process_rx_packet
1b67be400a96 wifi: iwlwifi: dbg_ini: fix structure packing
c6d358387632 ubi: Refuse attaching if mtd's erasesize is 0
b4ec10b962f7 net: prevent rewrite of msg_name in sock_sendmsg()
53b700b41a06 net: replace calls to sock->ops->connect() with
kernel_connect()
3c4bfa7a56c8 wifi: mwifiex: Fix tlv_buf_left calculation
2e608cede0ae qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info
810248a12999 scsi: zfcp: Fix a double put in zfcp_port_enqueue()
e60272ab021c Revert "PCI: qcom: Disable write access to read only registers
for IP v2.3.3"
6e37de4a1407 rbd: take header_rwsem in rbd_dev_refresh() only when updating
bc2a3044015f rbd: decouple parent info read-in from updating rbd_dev
2e0114edeb47 rbd: decouple header read-in from updating rbd_dev->header
32a59639c551 rbd: move rbd_dev_refresh() definition
ff10b1fad581 fs: binfmt_elf_efpic: fix personality for ELF-FDPIC
43e5dc1ee2ea ata: libata-sata: increase PMP SRST timeout to 10s
ac1aebd4e3b8 ata: libata-core: Do not register PM operations for SAS ports
9313aab5f649 ata: libata-core: Fix port and device removal
9207666f166c ata: libata-core: Fix ata_port_request_pm() locking
d9483f5aecf4 net: thunderbolt: Fix TCPv6 GSO checksum calculation
47062af85961 btrfs: properly report 0 avail for very full file systems
cf221a7880ea ring-buffer: Update "shortest_full" in polling
ec7b2e7b365c i2c: i801: unregister tco_pdev in i801_probe() error path
a4ecd8562c0e ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED
OPERATION CODES
ec1df5d37d59 ALSA: hda: Disable power save for solving pop issue on Lenovo
ThinkCentre M70q
193b5a1c6c67 nilfs2: fix potential use after free in
nilfs_gccache_submit_read_data()
bf3c728e3692 serial: 8250_port: Check IRQ data before use
76ffbd900b6a Smack:- Use overlay inode label in smack_inode_copy_up()
957a9916db5b smack: Retrieve transmuting information in
smack_inode_getsecurity()
c9ce9bab2301 smack: Record transmuting in smk_transmuted
d037d8964fb8 i40e: fix return of uninitialized aq_ret in
i40e_set_vsi_promisc
2d78e2d3e31f i40e: always propagate error value in i40e_set_vsi_promisc()
8ed4b5d710b0 i40e: improve locking of mac_filter_hash
30055e020ab2 watchdog: iTCO_wdt: Set NO_REBOOT if the watchdog is not
already
[OE-core][dunfell 07/11] vim: upgrade 9.0.2068 -> 9.0.2130
From: Tim Orling https://github.com/vim/vim/compare/v9.0.2068...v9.0.2130 CVE: CVE-2023-48231 CVE: CVE-2023-48232 CVE: CVE-2023-48233 CVE: CVE-2023-48234 CVE: CVE-2023-48235 CVE: CVE-2023-48236 CVE: CVE-2023-48237 Signed-off-by: Tim Orling Signed-off-by: Alexandre Belloni (cherry picked from commit 5978d565a9e700485fc563dfe2e3c0045dd74b59) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 0662822202..e6735d5881 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -19,8 +19,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".2068" -SRCREV = "9198c1f2b1ddecde22af918541e0de2a32f0f45a" +PV .= ".2130" +SRCREV = "075ad7047457debfeef13442c01e74088b461092" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+)\.0" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191893): https://lists.openembedded.org/g/openembedded-core/message/191893 Mute This Topic: https://lists.openembedded.org/mt/103012744/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][dunfell 06/11] qemu: ignore CVE-2021-20295 CVE-2023-2680
From: Lee Chee Yang Ignore RHEL specific CVE-2021-20295 CVE-2023-2680. Signed-off-by: Lee Chee Yang Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 7 +++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index a24915c35c..9dd90e8789 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -166,6 +166,13 @@ CVE_CHECK_WHITELIST += "CVE-2020-27661" # this bug related to windows specific. CVE_CHECK_WHITELIST += "CVE-2023-0664" +# As per https://bugzilla.redhat.com/show_bug.cgi?id=2203387 +# RHEL specific issue +CVE_CHECK_WHITELIST += "CVE-2023-2680" + +# Affected only `qemu-kvm` shipped with Red Hat Enterprise Linux 8.3 release. +CVE_CHECK_WHITELIST += "CVE-2021-20295" + COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191892): https://lists.openembedded.org/g/openembedded-core/message/191892 Mute This Topic: https://lists.openembedded.org/mt/103012743/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][dunfell 05/11] epiphany: fix CVE-2022-29536
From: Lee Chee Yang
Signed-off-by: Lee Chee Yang
Signed-off-by: Steve Sakoman
---
.../recipes-gnome/epiphany/epiphany_3.34.4.bb | 1 +
.../epiphany/files/CVE-2022-29536.patch | 46 +++
2 files changed, 47 insertions(+)
create mode 100644 meta/recipes-gnome/epiphany/files/CVE-2022-29536.patch
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb
b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb
index e2afb29c12..f43bfd6a67 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb
@@ -16,6 +16,7 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRC_URI =
"${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive
\
file://0002-help-meson.build-disable-the-use-of-yelp.patch \
+ file://CVE-2022-29536.patch \
"
SRC_URI[archive.md5sum] = "a559f164bb7d6cbeceb348648076830b"
SRC_URI[archive.sha256sum] =
"60e190fc07ec7e33472e60c7e633e04004f7e277a0ffc5e9cd413706881e598d"
diff --git a/meta/recipes-gnome/epiphany/files/CVE-2022-29536.patch
b/meta/recipes-gnome/epiphany/files/CVE-2022-29536.patch
new file mode 100644
index 00..7b8adeafcc
--- /dev/null
+++ b/meta/recipes-gnome/epiphany/files/CVE-2022-29536.patch
@@ -0,0 +1,46 @@
+VE: CVE-2022-29536
+Upstream-Status: Backport [
https://gitlab.gnome.org/GNOME/epiphany/-/commit/486da133569ebfc436c959a7419565ab102e8525
]
+Signed-off-by: Lee Chee Yang
+
+From 486da133569ebfc436c959a7419565ab102e8525 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro
+Date: Fri, 15 Apr 2022 18:09:46 -0500
+Subject: [PATCH] Fix memory corruption in ephy_string_shorten()
+
+This fixes a regression that I introduced in
232c613472b38ff0d0d97338f366024ddb9cd228.
+
+I got my browser stuck in a crash loop today while visiting a website
+with a page title greater than ephy-embed.c's MAX_TITLE_LENGTH, the only
+condition in which ephy_string_shorten() is ever used. Turns out this
+commit is wrong: an ellipses is a multibyte character (three bytes in
+UTF-8) and so we're writing past the end of the buffer when calling
+strcat() here. Ooops.
+
+Shame it took nearly four years to notice and correct this.
+
+Part-of:
+---
+ lib/ephy-string.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/lib/ephy-string.c b/lib/ephy-string.c
+index 35a148ab32..8e524d52ca 100644
+--- a/lib/ephy-string.c
b/lib/ephy-string.c
+@@ -114,11 +114,10 @@ ephy_string_shorten (char *str,
+ /* create string */
+ bytes = GPOINTER_TO_UINT (g_utf8_offset_to_pointer (str, target_length - 1)
- str);
+
+- /* +1 for ellipsis, +1 for trailing NUL */
+- new_str = g_new (gchar, bytes + 1 + 1);
++ new_str = g_new (gchar, bytes + strlen ("…") + 1);
+
+ strncpy (new_str, str, bytes);
+- strcat (new_str, "…");
++ strncpy (new_str + bytes, "…", strlen ("…") + 1);
+
+ g_free (str);
+
+--
+GitLab
+
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191891):
https://lists.openembedded.org/g/openembedded-core/message/191891
Mute This Topic: https://lists.openembedded.org/mt/103012742/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][dunfell 04/11] libsndfile: fix CVE-2022-33065 Signed integer overflow in src/mat4.c
From: Vivek Kumbhar
Signed-off-by: Vivek Kumbhar
Signed-off-by: Steve Sakoman
---
.../libsndfile1/CVE-2022-33065.patch | 46 +++
.../libsndfile/libsndfile1_1.0.28.bb | 3 +-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2022-33065.patch
diff --git
a/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2022-33065.patch
b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2022-33065.patch
new file mode 100644
index 00..e22b4e9389
--- /dev/null
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2022-33065.patch
@@ -0,0 +1,46 @@
+From 0754562e13d2e63a248a1c82f90b30bc0ffe307c Mon Sep 17 00:00:00 2001
+From: Alex Stewart
+Date: Tue, 10 Oct 2023 16:10:34 -0400
+Subject: [PATCH] mat4/mat5: fix int overflow in dataend calculation
+
+The clang sanitizer warns of a possible signed integer overflow when
+calculating the `dataend` value in `mat4_read_header()`.
+
+```
+src/mat4.c:323:41: runtime error: signed integer overflow: 205 * -100663296
cannot be represented in type 'int'
+SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior src/mat4.c:323:41 in
+src/mat4.c:323:48: runtime error: signed integer overflow: 838860800 * 4
cannot be represented in type 'int'
+SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior src/mat4.c:323:48 in
+```
+
+Cast the offending `rows` and `cols` ints to `sf_count_t` (the type of
+`dataend` before performing the calculation, to avoid the issue.
+
+CVE: CVE-2022-33065
+Fixes: https://github.com/libsndfile/libsndfile/issues/789
+Fixes: https://github.com/libsndfile/libsndfile/issues/833
+
+Signed-off-by: Alex Stewart
+
+Upstream-Status: Backport
[https://github.com/libsndfile/libsndfile/commit/0754562e13d2e63a248a1c82f90b30bc0ffe307c]
+CVE: CVE-2022-33065
+Signed-off-by: Vivek Kumbhar
+---
+ src/mat4.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mat4.c b/src/mat4.c
+index 3c73680..e2f98b7 100644
+--- a/src/mat4.c
b/src/mat4.c
+@@ -320,7 +320,7 @@ mat4_read_header (SF_PRIVATE *psf)
+ psf->filelength - psf->dataoffset,
psf->sf.channels * psf->sf.frames * psf->bytewidth) ;
+ }
+ else if ((psf->filelength - psf->dataoffset) > psf->sf.channels *
psf->sf.frames * psf->bytewidth)
+- psf->dataend = psf->dataoffset + rows * cols * psf->bytewidth ;
++ psf->dataend = psf->dataoffset + (sf_count_t) rows *
(sf_count_t) cols * psf->bytewidth ;
+
+ psf->datalength = psf->filelength - psf->dataoffset - psf->dataend ;
+
+--
+2.40.1
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
index 2525af8fe0..32b678ce90 100644
--- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
@@ -22,7 +22,8 @@ SRC_URI =
"http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz \
file://CVE-2019-3832.patch \
file://CVE-2021-3246_1.patch \
file://CVE-2021-3246_2.patch \
- "
+ file://CVE-2022-33065.patch \
+ "
SRC_URI[md5sum] = "646b5f98ce89ac60cdb060fcd398247c"
SRC_URI[sha256sum] =
"1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191890):
https://lists.openembedded.org/g/openembedded-core/message/191890
Mute This Topic: https://lists.openembedded.org/mt/103012739/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][dunfell 03/11] mdadm: Backport fix for CVE-2023-28938
From: Ashish Sharma
Upstream-Status: Backport from
[https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/patch/?id=7d374a1869d3a84971d027a7f4233878c8f25a62]
CVE: CVE-2023-28938
Signed-off-by: Ashish Sharma
Signed-off-by: Steve Sakoman
---
.../mdadm/files/CVE-2023-28938.patch | 80 +++
meta/recipes-extended/mdadm/mdadm_4.1.bb | 1 +
2 files changed, 81 insertions(+)
create mode 100644 meta/recipes-extended/mdadm/files/CVE-2023-28938.patch
diff --git a/meta/recipes-extended/mdadm/files/CVE-2023-28938.patch
b/meta/recipes-extended/mdadm/files/CVE-2023-28938.patch
new file mode 100644
index 00..1e2990d79a
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/CVE-2023-28938.patch
@@ -0,0 +1,80 @@
+From 7d374a1869d3a84971d027a7f4233878c8f25a62 Mon Sep 17 00:00:00 2001
+From: Mateusz Grzonka
+Date: Tue, 27 Jul 2021 10:25:18 +0200
+Subject: Fix memory leak after "mdadm --detail"
+
+Signed-off-by: Mateusz Grzonka
+Signed-off-by: Jes Sorensen
+---
+Upstream-Status: Backport from
[https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/patch/?id=7d374a1869d3a84971d027a7f4233878c8f25a62]
+CVE: CVE-2023-28938
+Signed-off-by: Ashish Sharma
+
+ Detail.c | 20 +---
+ 1 file changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/Detail.c b/Detail.c
+index ad56344f..d3af0ab5 100644
+--- a/Detail.c
b/Detail.c
+@@ -66,11 +66,11 @@ int Detail(char *dev, struct context *c)
+ int spares = 0;
+ struct stat stb;
+ int failed = 0;
+- struct supertype *st;
++ struct supertype *st = NULL;
+ char *subarray = NULL;
+ int max_disks = MD_SB_DISKS; /* just a default */
+ struct mdinfo *info = NULL;
+- struct mdinfo *sra;
++ struct mdinfo *sra = NULL;
+ struct mdinfo *subdev;
+ char *member = NULL;
+ char *container = NULL;
+@@ -93,8 +93,7 @@ int Detail(char *dev, struct context *c)
+ if (!sra) {
+ if (md_get_array_info(fd, )) {
+ pr_err("%s does not appear to be an md device\n", dev);
+- close(fd);
+- return rv;
++ goto out;
+ }
+ }
+ external = (sra != NULL && sra->array.major_version == -1 &&
+@@ -108,16 +107,13 @@ int Detail(char *dev, struct context *c)
+ sra->devs == NULL) {
+ pr_err("Array associated with md device %s does
not exist.\n",
+ dev);
+- close(fd);
+- sysfs_free(sra);
+- return rv;
++ goto out;
+ }
+ array = sra->array;
+ } else {
+ pr_err("cannot get array detail for %s: %s\n",
+ dev, strerror(errno));
+- close(fd);
+- return rv;
++ goto out;
+ }
+ }
+
+@@ -827,10 +823,12 @@ out:
+ close(fd);
+ free(subarray);
+ free(avail);
+- for (d = 0; d < n_devices; d++)
+- free(devices[d]);
++ if (devices)
++ for (d = 0; d < n_devices; d++)
++ free(devices[d]);
+ free(devices);
+ sysfs_free(sra);
++ free(st);
+ return rv;
+ }
+
+--
+cgit
+
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 5238a41df2..ca326fd1cb 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -25,6 +25,7 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
file://include_sysmacros.patch \
file://0001-mdadm-skip-test-11spare-migration.patch \
file://CVE-2023-28736.patch \
+ file://CVE-2023-28938.patch \
"
SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191889):
https://lists.openembedded.org/g/openembedded-core/message/191889
Mute This Topic: https://lists.openembedded.org/mt/103012736/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][dunfell 02/11] binutils: Mark CVE-2022-47696 as patched
From: poojitha adireddy CVE-2022-47696 and CVE-2023-25588 are representing similar kind of vulnerability. Reference: https://ubuntu.com/security/CVE-2022-47696 https://sourceware.org/bugzilla/show_bug.cgi?id=29677 Signed-off-by: poojitha adireddy Signed-off-by: Steve Sakoman --- meta/recipes-devtools/binutils/binutils/CVE-2023-25588.patch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2023-25588.patch b/meta/recipes-devtools/binutils/binutils/CVE-2023-25588.patch index 065d8e47f0..aa5ce5f3ff 100644 --- a/meta/recipes-devtools/binutils/binutils/CVE-2023-25588.patch +++ b/meta/recipes-devtools/binutils/binutils/CVE-2023-25588.patch @@ -13,7 +13,10 @@ anyway, so get rid of them. Also, simplify and correct sanity checks. --- Upstream-Status: Backport from [https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=d12f8998d2d086f0a6606589e5aedb7147e6f2f1] CVE: CVE-2023-25588 +CVE: CVE-2022-47696 + Signed-off-by: Ashish Sharma +Signed-off-by: poojitha adireddy bfd/mach-o.c | 72 ++-- 1 file changed, 31 insertions(+), 41 deletions(-) -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191888): https://lists.openembedded.org/g/openembedded-core/message/191888 Mute This Topic: https://lists.openembedded.org/mt/103012735/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][dunfell 00/11] Patch review
Please review this set of changes for dunfell and have comments back by end of day Friday, December 8 Passed a-full on autobuilder: https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/6293 The following changes since commit 0764da7e3f1d71eb390e5eb8a9aa1323c24d1c19: vim: use upstream generated .po files (2023-11-28 12:31:43 -1000) are available in the Git repository at: https://git.openembedded.org/openembedded-core-contrib stable/dunfell-nut http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-nut Ashish Sharma (1): mdadm: Backport fix for CVE-2023-28938 Bruce Ashfield (3): linux-yocto/5.4: update to v5.4.258 linux-yocto/5.4: update to v5.4.260 linux-yocto/5.4: update to v5.4.262 Lee Chee Yang (2): epiphany: fix CVE-2022-29536 qemu: ignore CVE-2021-20295 CVE-2023-2680 Steve Sakoman (1): cve-exclusion_5.4.inc: update for 5.4.262 Tim Orling (1): vim: upgrade 9.0.2068 -> 9.0.2130 Vivek Kumbhar (1): libsndfile: fix CVE-2022-33065 Signed integer overflow in src/mat4.c poojitha adireddy (2): binutils 2.34: Fix CVE-2021-46174 binutils: Mark CVE-2022-47696 as patched .../binutils/binutils-2.34.inc| 1 + .../binutils/binutils/CVE-2021-46174.patch| 35 .../binutils/binutils/CVE-2023-25588.patch| 3 + meta/recipes-devtools/qemu/qemu.inc | 7 ++ .../mdadm/files/CVE-2023-28938.patch | 80 +++ meta/recipes-extended/mdadm/mdadm_4.1.bb | 1 + .../recipes-gnome/epiphany/epiphany_3.34.4.bb | 1 + .../epiphany/files/CVE-2022-29536.patch | 46 +++ .../linux/cve-exclusion_5.4.inc | 79 ++ .../linux/linux-yocto-rt_5.4.bb | 6 +- .../linux/linux-yocto-tiny_5.4.bb | 8 +- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 ++--- .../libsndfile1/CVE-2022-33065.patch | 46 +++ .../libsndfile/libsndfile1_1.0.28.bb | 3 +- meta/recipes-support/vim/vim.inc | 4 +- 15 files changed, 306 insertions(+), 36 deletions(-) create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2021-46174.patch create mode 100644 meta/recipes-extended/mdadm/files/CVE-2023-28938.patch create mode 100644 meta/recipes-gnome/epiphany/files/CVE-2022-29536.patch create mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2022-33065.patch -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191886): https://lists.openembedded.org/g/openembedded-core/message/191886 Mute This Topic: https://lists.openembedded.org/mt/103012733/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][dunfell 01/11] binutils 2.34: Fix CVE-2021-46174
From: poojitha adireddy
Upstream Repository: https://sourceware.org/git/binutils-gdb.git
Bug Details: https://nvd.nist.gov/vuln/detail/CVE-2021-46174
Type: Security Fix
CVE: CVE-2021-46174
Score: 7.5
Patch: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cad4d6b91e97
Signed-off-by: poojitha adireddy
Signed-off-by: Steve Sakoman
---
.../binutils/binutils-2.34.inc| 1 +
.../binutils/binutils/CVE-2021-46174.patch| 35 +++
2 files changed, 36 insertions(+)
create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2021-46174.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.34.inc
b/meta/recipes-devtools/binutils/binutils-2.34.inc
index a9a2bf332f..371e8e9fa4 100644
--- a/meta/recipes-devtools/binutils/binutils-2.34.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.34.inc
@@ -54,5 +54,6 @@ SRC_URI = "\
file://0001-CVE-2021-45078.patch \
file://CVE-2022-38533.patch \
file://CVE-2023-25588.patch \
+ file://CVE-2021-46174.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2021-46174.patch
b/meta/recipes-devtools/binutils/binutils/CVE-2021-46174.patch
new file mode 100644
index 00..2addf5139e
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2021-46174.patch
@@ -0,0 +1,35 @@
+From 46322722ad40ac1a75672ae0f62f4969195f1368 Mon Sep 17 00:00:00 2001
+From: Alan Modra
+Date: Thu, 20 Jan 2022 13:58:38 +1030
+Subject: [PATCH] PR28753, buffer overflow in read_section_stabs_debugging_info
+
+ PR 28753
+ * rddbg.c (read_section_stabs_debugging_info): Don't read past
+ end of section when concatentating stab strings.
+
+CVE: CVE-2021-46174
+Upstream-Status: Backport
[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cad4d6b91e97]
+
+(cherry picked from commit 085b299b71721e15f5c5c5344dc3e4e4536dadba)
+(cherry picked from commit cad4d6b91e97b6962807d33c04ed7e7797788438)
+Signed-off-by: poojitha adireddy
+---
+ binutils/rddbg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/binutils/rddbg.c b/binutils/rddbg.c
+index 72e934055b5..5e76d94a3c4 100644
+--- a/binutils/rddbg.c
b/binutils/rddbg.c
+@@ -207,7 +207,7 @@ read_section_stabs_debugging_info (bfd *abfd, asymbol
**syms, long symcount,
+an attempt to read the byte before 'strings' would occur.
*/
+ while ((len = strlen (s)) > 0
+&& s[len - 1] == '\\'
+- && stab + 12 < stabs + stabsize)
++ && stab + 16 <= stabs + stabsize)
+ {
+ char *p;
+
+--
+2.23.1
+
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191887):
https://lists.openembedded.org/g/openembedded-core/message/191887
Mute This Topic: https://lists.openembedded.org/mt/103012734/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] scripts/oe-setup-layers: add option to skip revs in json
> Look for the patchset '[RFC 0/7] bitbake-layers: Add > update-layers-setup' posted on 7 November, particularly the comments > to the individual patches, where we get to the design that should work > and cover the use cases. I had to work on some other issues that needed my attention, so not too much progress since, however, I have reserved some time this month and was planning to work on this. Sincerely, Jermain Horsman -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191885): https://lists.openembedded.org/g/openembedded-core/message/191885 Mute This Topic: https://lists.openembedded.org/mt/103009912/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] scripts/oe-setup-layers: add option to skip revs in json
On Wed, 6 Dec 2023 at 12:51, Andrey Zhizhikin wrote: > > Unfortunately I have to say no to this. The problem is that this will > > update to latest revisions on all the layers, which I believe is not > > what people would want, as everything including poky etc. will be > > shifting uncontrollably. > > Correct, and that is exactly the reason why this mechanism is only > offered via additional switch. If it is not supplied - then behavior is > exactly the same, and this is intended. Only those users who would > really like to exercise the shift would use it. If you want to add something like this, it can't be an all or nothing switch. There has to be a way to update only some of the layers, and have others stay where they are. Also, you might want to update to latest tag on a branch, rather than latest revision. There are many scenarios, and there's no way oe-setup-layers can cover them, and it shouldn't try. > I've also prepared a patch for documenting this switch, but held it back > until the functionality is in. There I do explain the case for CI systems > which would want to capture updated setup of all layers in collection. I understand and agree with the use case, I just don't think updating all layers to their latest revisions is what many users want, or that oe-setup-layers is the right place for this functionality. > In this regard I think that json prescription is too strict. > > While this totally suites the needs and purpose of passing over the layer > setup to any other client, it really limits the usability of setup-layers only > to that specific case. If this was originally an intended design, then > perhaps a note in documentation would be needed. json schema does not require having precise revisions of the layers. You can specify tags, branches or anything else that 'git checkout' understands, and oe-setup-layers would follow that. It's just that we currently don't have tools to write out anything except precise revisions. But you can edit the json after the fact to point to something else, then give it to oe-setup-layers, and it will work. > Is there any mail thread or patch stack where this has been discussed? > > I would like to take a look at what was proposed and perhaps re-use and > re-establish that part instead. Look for the patchset '[RFC 0/7] bitbake-layers: Add update-layers-setup' posted on 7 November, particularly the comments to the individual patches, where we get to the design that should work and cover the use cases. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191884): https://lists.openembedded.org/g/openembedded-core/message/191884 Mute This Topic: https://lists.openembedded.org/mt/103009912/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] scripts/oe-setup-layers: add option to skip revs in json
Hello Alex,
On Wed, Dec 6, 2023 at 11:08 AM Alexander Kanavin
wrote:
>
> Unfortunately I have to say no to this. The problem is that this will
> update to latest revisions on all the layers, which I believe is not
> what people would want, as everything including poky etc. will be
> shifting uncontrollably.
Correct, and that is exactly the reason why this mechanism is only
offered via additional switch. If it is not supplied - then behavior is
exactly the same, and this is intended. Only those users who would
really like to exercise the shift would use it.
I've also prepared a patch for documenting this switch, but held it back
until the functionality is in. There I do explain the case for CI systems
which would want to capture updated setup of all layers in collection.
>
> Conceptually, I would not want oe-setup-layers to suffer from feature
> creep and become bloated and difficult to maintain. Every little
> enhancement is pushing in that direction. It has a json, it does what
> the json prescribes, end of story.
In this regard I think that json prescription is too strict.
While this totally suites the needs and purpose of passing over the layer
setup to any other client, it really limits the usability of setup-layers only
to that specific case. If this was originally an intended design, then
perhaps a note in documentation would be needed.
>
> We've previously discussed with Jermain how this can be solved on the
> bitbake-layers side, e.g. that tool would write out a json where some
> layers don't have a hardcoded revision. I think work to implement that
> has stalled, not sure. But it's not difficult to add.
Is there any mail thread or patch stack where this has been discussed?
I would like to take a look at what was proposed and perhaps re-use and
re-establish that part instead.
Thanks a lot!
>
> Alex
>
>
>
> On Wed, 6 Dec 2023 at 10:25, Andrey Zhizhikin wrote:
> >
> > Current script implementation uses revisions recorded in JSON file to
> > replicate previously recorded setup. While this is useful for complete
> > layer setup reproducibility, this does not allow the setup "upgrade" where
> > this script can be used to use remote branch information and latest HEAD,
> > have the setup restored, and then saved using updated revisions.
> >
> > Add new '--skip-revs' parameter which can be used to obtain the updated
> > layer setup.
> >
> > Following set of operations could be executed to achieve this:
> > 1. Restore initial layer setup using remote branch HEAD instead of recorded
> >revisions by specifying --skip-revs.
> > 2. After layer setup is created, JSON file containing updated revisions is
> >retrieved via `bitbake-layers create-layers-setup`
> > 3. Updated JSON file can be checked in to bootstrap repository and used
> >later without '--skip-revs' to replicated updated setup.
> >
> > Signed-off-by: Andrey Zhizhikin
> > ---
> > scripts/oe-setup-layers | 8
> > 1 file changed, 8 insertions(+)
> >
> > diff --git a/scripts/oe-setup-layers b/scripts/oe-setup-layers
> > index 6d49688a32..a4941450d3 100755
> > --- a/scripts/oe-setup-layers
> > +++ b/scripts/oe-setup-layers
> > @@ -69,6 +69,13 @@ def _do_checkout(args, json):
> > remotes = r_remote['remotes']
> >
> > print('\nSetting up source {}, revision {}, branch
> > {}'.format(r_name, desc, branch))
> > +if args['skip_revs']:
> > +if branch and (branch != 'HEAD'):
> > +print('\nSkip revision option used, remote {} branch {}
> > HEAD will be used instead of {}'.format(r_name, branch, rev))
> > +rev = branch
> > +else:
> > +print('\nBranch info is missing in json, --skip-revs
> > option is not used')
> > +
> > if not _is_repo_git_repo(repodir):
> > cmd = 'git init -q {}'.format(repodir)
> > print("Running '{}'".format(cmd))
> > @@ -108,6 +115,7 @@ except subprocess.CalledProcessError as e:
> >
> > parser.add_argument('--destdir', default=defaultdest, help='Where to check
> > out the layers (default is {defaultdest}).'.format(defaultdest=defaultdest))
> > parser.add_argument('--jsondata', default=__file__+".json", help='File
> > containing the layer data in json format (default is
> > {defaultjson}).'.format(defaultjson=__file__+".json"))
> > +parser.add_argument('--skip-revs', action='store_true', help='Skip
> > revisions recorded in json manifest, and use latest revision on branch to
> > restore setup')
> >
> > args = parser.parse_args()
> >
> > --
> > 2.34.1
> >
> >
> >
> >
--
Regards,
Andrey.
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191883):
https://lists.openembedded.org/g/openembedded-core/message/191883
Mute This Topic: https://lists.openembedded.org/mt/103009912/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
Re: [OE-core] [PATCH v4] openssh: Add PACKAGECONFIG option to customize sshd mode
On Wed, Dec 6, 2023 at 8:56 AM Yu, Mingli wrote:
>
> From: Mingli Yu
>
> Add systemd-sshd-socket-mode PACKAGECONFIG option to choose sshd.socket
> and systemd-sshd-service-mode PACKAGECONFIG option to choose installing
> sshd.service.
>
> The systemd-sshd-socket-mode PACKAGECONFIG option is enabled by default
> and user can customize the above two PACKAGECONFIG option to choose the
> sshd mode.
>
> Signed-off-by: Mingli Yu
> ---
> Changed in v3:
> rebase based on
> https://lore.kernel.org/all/20231201140947.792594-1-xiangyu.c...@eng.windriver.com/
>
> Changed in v4:
> make it possible to install both sshd.socket and sshd.service
I'm wondering if we should make SYSTEMD_AUTO_ENABLE settable per
service, so you could then install both and manage which one is active
with a preset.
> .../openssh/openssh_9.5p1.bb | 25 ++-
> 1 file changed, 19 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> index 2c1c821ea9..58dd030c64 100644
> --- a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> @@ -50,16 +50,20 @@ INITSCRIPT_NAME:${PN}-sshd = "sshd"
> INITSCRIPT_PARAMS:${PN}-sshd = "defaults 9"
>
> SYSTEMD_PACKAGES = "${PN}-sshd"
> -SYSTEMD_SERVICE:${PN}-sshd = "sshd.socket sshd.service"
> +SYSTEMD_SERVICE:${PN}-sshd =
> "${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','sshd.socket',
> '', d)}
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','sshd.service',
> '', d)}"
>
> inherit autotools-brokensep ptest pkgconfig
>
> -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> +# systemd-sshd-socket-mode means sshd.socket and systemd-sshd-service-mode
> +# corresponding to sshd.service
> +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}
> systemd-sshd-socket-mode"
> PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5"
> PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns"
> PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
> PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat"
> PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd"
> +PACKAGECONFIG[systemd-sshd-socket-mode] = ""
> +PACKAGECONFIG[systemd-sshd-service-mode] = ""
>
> EXTRA_AUTORECONF += "--exclude=aclocal"
>
> @@ -124,15 +128,24 @@ do_install:append () {
> echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >>
> ${D}${sysconfdir}/ssh/sshd_config_readonly
>
> install -d ${D}${systemd_system_unitdir}
> - install -c -m 0644 ${WORKDIR}/sshd.socket
> ${D}${systemd_system_unitdir}
> - install -c -m 0644 ${WORKDIR}/sshd.service
> ${D}${systemd_system_unitdir}
> - install -c -m 0644 ${WORKDIR}/sshd@.service
> ${D}${systemd_system_unitdir}
> + if
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','true','false',d)};
> then
> + install -c -m 0644 ${WORKDIR}/sshd.socket
> ${D}${systemd_system_unitdir}
> + install -c -m 0644 ${WORKDIR}/sshd@.service
> ${D}${systemd_system_unitdir}
> + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
> + -e 's,@SBINDIR@,${sbindir},g' \
> + -e 's,@BINDIR@,${bindir},g' \
> + -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
> +${D}${systemd_system_unitdir}/sshd.socket
> + fi
> + if
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','true','false',d)};
> then
> + install -c -m 0644 ${WORKDIR}/sshd.service
> ${D}${systemd_system_unitdir}
> + fi
> install -c -m 0644 ${WORKDIR}/sshdgenkeys.service
> ${D}${systemd_system_unitdir}
> sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
> -e 's,@SBINDIR@,${sbindir},g' \
> -e 's,@BINDIR@,${bindir},g' \
> -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
> - ${D}${systemd_system_unitdir}/sshd.socket
> ${D}${systemd_system_unitdir}/*.service
> + ${D}${systemd_system_unitdir}/*.service
>
> sed -i -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
> ${D}${sysconfdir}/init.d/sshd
> --
> 2.25.1
>
>
>
>
--
Alex Kiernan
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191882):
https://lists.openembedded.org/g/openembedded-core/message/191882
Mute This Topic: https://lists.openembedded.org/mt/103009646/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] scripts/oe-setup-layers: add option to skip revs in json
Unfortunately I have to say no to this. The problem is that this will
update to latest revisions on all the layers, which I believe is not
what people would want, as everything including poky etc. will be
shifting uncontrollably.
Conceptually, I would not want oe-setup-layers to suffer from feature
creep and become bloated and difficult to maintain. Every little
enhancement is pushing in that direction. It has a json, it does what
the json prescribes, end of story.
We've previously discussed with Jermain how this can be solved on the
bitbake-layers side, e.g. that tool would write out a json where some
layers don't have a hardcoded revision. I think work to implement that
has stalled, not sure. But it's not difficult to add.
Alex
On Wed, 6 Dec 2023 at 10:25, Andrey Zhizhikin wrote:
>
> Current script implementation uses revisions recorded in JSON file to
> replicate previously recorded setup. While this is useful for complete
> layer setup reproducibility, this does not allow the setup "upgrade" where
> this script can be used to use remote branch information and latest HEAD,
> have the setup restored, and then saved using updated revisions.
>
> Add new '--skip-revs' parameter which can be used to obtain the updated
> layer setup.
>
> Following set of operations could be executed to achieve this:
> 1. Restore initial layer setup using remote branch HEAD instead of recorded
>revisions by specifying --skip-revs.
> 2. After layer setup is created, JSON file containing updated revisions is
>retrieved via `bitbake-layers create-layers-setup`
> 3. Updated JSON file can be checked in to bootstrap repository and used
>later without '--skip-revs' to replicated updated setup.
>
> Signed-off-by: Andrey Zhizhikin
> ---
> scripts/oe-setup-layers | 8
> 1 file changed, 8 insertions(+)
>
> diff --git a/scripts/oe-setup-layers b/scripts/oe-setup-layers
> index 6d49688a32..a4941450d3 100755
> --- a/scripts/oe-setup-layers
> +++ b/scripts/oe-setup-layers
> @@ -69,6 +69,13 @@ def _do_checkout(args, json):
> remotes = r_remote['remotes']
>
> print('\nSetting up source {}, revision {}, branch
> {}'.format(r_name, desc, branch))
> +if args['skip_revs']:
> +if branch and (branch != 'HEAD'):
> +print('\nSkip revision option used, remote {} branch {} HEAD
> will be used instead of {}'.format(r_name, branch, rev))
> +rev = branch
> +else:
> +print('\nBranch info is missing in json, --skip-revs option
> is not used')
> +
> if not _is_repo_git_repo(repodir):
> cmd = 'git init -q {}'.format(repodir)
> print("Running '{}'".format(cmd))
> @@ -108,6 +115,7 @@ except subprocess.CalledProcessError as e:
>
> parser.add_argument('--destdir', default=defaultdest, help='Where to check
> out the layers (default is {defaultdest}).'.format(defaultdest=defaultdest))
> parser.add_argument('--jsondata', default=__file__+".json", help='File
> containing the layer data in json format (default is
> {defaultjson}).'.format(defaultjson=__file__+".json"))
> +parser.add_argument('--skip-revs', action='store_true', help='Skip revisions
> recorded in json manifest, and use latest revision on branch to restore
> setup')
>
> args = parser.parse_args()
>
> --
> 2.34.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191881):
https://lists.openembedded.org/g/openembedded-core/message/191881
Mute This Topic: https://lists.openembedded.org/mt/103009912/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [master][PATCH 2/2] rootfs-postcommands.bbclass: add post func remove_unused_dnf_log_lock
On Wed, 6 Dec 2023 at 03:39, Changqing Li wrote: > The review comments that led to the revert are still valid, and this > message does not address them. The concern was that the removal via > rootfs postprocess is too late. If dnf leaves lock files around, they > should be removed just after the dnf execution. > Thanks. Agree that the lock file should be removed after dnf execution. > This is a bug of dnf. I had raise a bug upstream in Jul: > > https://github.com/rpm-software-management/dnf/issues/1963. Looks like it's not something upstream is going to fix quickly - low priority, no comments. > This patch more like an workaround before dnf fix this issue, and this > log_lock.pid in rootfs > > has no function impact, just a dirty file in rootfs. If you can rework the patch so that the stale files are removed immediately after running dnf, I think no one is going to object. The location is somewhere in meta/lib/oe/package_manager/rpm/. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191880): https://lists.openembedded.org/g/openembedded-core/message/191880 Mute This Topic: https://lists.openembedded.org/mt/99869451/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] scripts/oe-setup-layers: add option to skip revs in json
Current script implementation uses revisions recorded in JSON file to
replicate previously recorded setup. While this is useful for complete
layer setup reproducibility, this does not allow the setup "upgrade" where
this script can be used to use remote branch information and latest HEAD,
have the setup restored, and then saved using updated revisions.
Add new '--skip-revs' parameter which can be used to obtain the updated
layer setup.
Following set of operations could be executed to achieve this:
1. Restore initial layer setup using remote branch HEAD instead of recorded
revisions by specifying --skip-revs.
2. After layer setup is created, JSON file containing updated revisions is
retrieved via `bitbake-layers create-layers-setup`
3. Updated JSON file can be checked in to bootstrap repository and used
later without '--skip-revs' to replicated updated setup.
Signed-off-by: Andrey Zhizhikin
---
scripts/oe-setup-layers | 8
1 file changed, 8 insertions(+)
diff --git a/scripts/oe-setup-layers b/scripts/oe-setup-layers
index 6d49688a32..a4941450d3 100755
--- a/scripts/oe-setup-layers
+++ b/scripts/oe-setup-layers
@@ -69,6 +69,13 @@ def _do_checkout(args, json):
remotes = r_remote['remotes']
print('\nSetting up source {}, revision {}, branch {}'.format(r_name,
desc, branch))
+if args['skip_revs']:
+if branch and (branch != 'HEAD'):
+print('\nSkip revision option used, remote {} branch {} HEAD
will be used instead of {}'.format(r_name, branch, rev))
+rev = branch
+else:
+print('\nBranch info is missing in json, --skip-revs option is
not used')
+
if not _is_repo_git_repo(repodir):
cmd = 'git init -q {}'.format(repodir)
print("Running '{}'".format(cmd))
@@ -108,6 +115,7 @@ except subprocess.CalledProcessError as e:
parser.add_argument('--destdir', default=defaultdest, help='Where to check out
the layers (default is {defaultdest}).'.format(defaultdest=defaultdest))
parser.add_argument('--jsondata', default=__file__+".json", help='File
containing the layer data in json format (default is
{defaultjson}).'.format(defaultjson=__file__+".json"))
+parser.add_argument('--skip-revs', action='store_true', help='Skip revisions
recorded in json manifest, and use latest revision on branch to restore setup')
args = parser.parse_args()
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191879):
https://lists.openembedded.org/g/openembedded-core/message/191879
Mute This Topic: https://lists.openembedded.org/mt/103009912/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [nanbield][PATCH] update_gtk_icon_cache: Fix for GTK4-only builds
Try to execute both gtk-update-icon-cache and
gtk4-update-icon-cache after checking whether the
commands are available.
This attempts to match what gtk-icon-cache.bbclass is doing.
This fixes running update_gtk_icon_cache during do_rootfs
for an image that contains only GTK4 related packages.
Signed-off-by: Zoltán Böszörményi
---
scripts/postinst-intercepts/update_gtk_icon_cache | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/postinst-intercepts/update_gtk_icon_cache
b/scripts/postinst-intercepts/update_gtk_icon_cache
index 99367a2855..a92bd840c6 100644
--- a/scripts/postinst-intercepts/update_gtk_icon_cache
+++ b/scripts/postinst-intercepts/update_gtk_icon_cache
@@ -11,7 +11,11 @@
$STAGING_DIR_NATIVE/${libdir_native}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --u
for icondir in $D/usr/share/icons/*/ ; do
if [ -d $icondir ] ; then
-gtk-update-icon-cache -fqt $icondir
+for gtkuic_cmd in gtk-update-icon-cache gtk4-update-icon-cache ; do
+if [ -n "$(which $gtkuic_cmd)" ]; then
+$gtkuic_cmd -fqt $icondir
+fi
+done
fi
done
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191878):
https://lists.openembedded.org/g/openembedded-core/message/191878
Mute This Topic: https://lists.openembedded.org/mt/103009886/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] update_gtk_icon_cache: Fix for GTK4-only builds
Try to execute both gtk-update-icon-cache and
gtk4-update-icon-cache after checking whether the
commands are available.
This attempts to match what gtk-icon-cache.bbclass is doing.
This fixes running update_gtk_icon_cache during do_rootfs
for an image that contains only GTK4 related packages.
Signed-off-by: Zoltán Böszörményi
---
scripts/postinst-intercepts/update_gtk_icon_cache | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/postinst-intercepts/update_gtk_icon_cache
b/scripts/postinst-intercepts/update_gtk_icon_cache
index 99367a2855..a92bd840c6 100644
--- a/scripts/postinst-intercepts/update_gtk_icon_cache
+++ b/scripts/postinst-intercepts/update_gtk_icon_cache
@@ -11,7 +11,11 @@
$STAGING_DIR_NATIVE/${libdir_native}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --u
for icondir in $D/usr/share/icons/*/ ; do
if [ -d $icondir ] ; then
-gtk-update-icon-cache -fqt $icondir
+for gtkuic_cmd in gtk-update-icon-cache gtk4-update-icon-cache ; do
+if [ -n "$(which $gtkuic_cmd)" ]; then
+$gtkuic_cmd -fqt $icondir
+fi
+done
fi
done
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191877):
https://lists.openembedded.org/g/openembedded-core/message/191877
Mute This Topic: https://lists.openembedded.org/mt/103009870/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [kirkstone][PATCH] gstreamer1.0-plugins-base: enable glx/opengl support
From: Alexander Kanavin
This is required by latest webkit when built with x11 support.
(From OE-Core rev: 024edebf6f722ae4d05411be348730d9eeb3bd7c)
Signed-off-by: Alexander Kanavin
Signed-off-by: Richard Purdie
Signed-off-by: Claus Stovgaard
---
.../gstreamer/gstreamer1.0-plugins-base_1.20.7.bb | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.7.bb
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.7.bb
index 8822c6a905..8dfa70aea3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.7.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.7.bb
@@ -21,7 +21,8 @@ inherit gobject-introspection
# opengl packageconfig factored out to make it easy for distros
# and BSP layers to choose OpenGL APIs/platforms/window systems
-PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2
egl', '', d)}"
+PACKAGECONFIG_X11 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl
glx', '', d)}"
+PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2
egl ${PACKAGECONFIG_X11}', '', d)}"
PACKAGECONFIG ??= " \
${GSTREAMER_ORC} \
@@ -32,7 +33,7 @@ PACKAGECONFIG ??= " \
"
OPENGL_APIS = 'opengl gles2'
-OPENGL_PLATFORMS = 'egl'
+OPENGL_PLATFORMS = 'egl glx'
X11DEPENDS = "virtual/libx11 libsm libxrender libxv"
X11ENABLEOPTS = "-Dx11=enabled -Dxvideo=enabled -Dxshm=enabled"
@@ -61,6 +62,7 @@ PACKAGECONFIG[gles2]= ",,virtual/libgles2"
# OpenGL platform packageconfigs
PACKAGECONFIG[egl] = ",,virtual/egl"
+PACKAGECONFIG[glx] = ",,virtual/libgl"
# OpenGL window systems (except for X11)
PACKAGECONFIG[gbm] = ",,virtual/libgbm libgudev libdrm"
--
2.41.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191876):
https://lists.openembedded.org/g/openembedded-core/message/191876
Mute This Topic: https://lists.openembedded.org/mt/103009798/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone][PATCH 1/1] python3-cryptography: fix CVE-2023-49083
From: Narpat Mali cryptography is a package designed to expose cryptographic primitives and recipes to Python developers. Calling `load_pem_pkcs7_certificates` or `load_der_pkcs7_certificates` could lead to a NULL-pointer dereference and segfault. Exploitation of this vulnerability poses a serious risk of Denial of Service (DoS) for any application attempting to deserialize a PKCS7 blob/certificate. The consequences extend to potential disruptions in system availability and stability. This vulnerability has been patched in version 41.0.6. References: https://nvd.nist.gov/vuln/detail/CVE-2023-49083 https://security-tracker.debian.org/tracker/CVE-2023-49083 Signed-off-by: Narpat Mali --- .../python3-cryptography/CVE-2023-49083.patch | 53 +++ .../python/python3-cryptography_36.0.2.bb | 1 + 2 files changed, 54 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-cryptography/CVE-2023-49083.patch diff --git a/meta/recipes-devtools/python/python3-cryptography/CVE-2023-49083.patch b/meta/recipes-devtools/python/python3-cryptography/CVE-2023-49083.patch new file mode 100644 index 00..d398eea1d9 --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography/CVE-2023-49083.patch @@ -0,0 +1,53 @@ +From 627ac5e314303acc00a19d58f09eb1eabd029fd1 Mon Sep 17 00:00:00 2001 +From: Alex Gaynor +Date: Wed, 6 Dec 2023 08:04:53 + +Subject: [PATCH] Fixed crash when loading a PKCS#7 bundle with no certificates + (#9926) + +CVE: CVE-2023-49083 + +Upstream-Status: Backport [https://github.com/pyca/cryptography/commit/1e7b4d074e14c4e694d3ce69ad6754a6039fd6ff] + +Signed-off-by: Narpat Mali +--- + src/cryptography/hazmat/backends/openssl/backend.py | 5 - + tests/hazmat/primitives/test_pkcs7.py | 6 ++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py +index 5606fe6..c43fea0 100644 +--- a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py +@@ -2189,9 +2189,12 @@ class Backend(BackendInterface): + _Reasons.UNSUPPORTED_SERIALIZATION, + ) + ++certs: list[x509.Certificate] = [] ++if p7.d.sign == self._ffi.NULL: ++return certs ++ + sk_x509 = p7.d.sign.cert + num = self._lib.sk_X509_num(sk_x509) +-certs = [] + for i in range(num): + x509 = self._lib.sk_X509_value(sk_x509, i) + self.openssl_assert(x509 != self._ffi.NULL) +diff --git a/tests/hazmat/primitives/test_pkcs7.py b/tests/hazmat/primitives/test_pkcs7.py +index 91ac842..b98a9f1 100644 +--- a/tests/hazmat/primitives/test_pkcs7.py b/tests/hazmat/primitives/test_pkcs7.py +@@ -81,6 +81,12 @@ class TestPKCS7Loading(object): + mode="rb", + ) + ++def test_load_pkcs7_empty_certificates(self): ++der = b"\x30\x0B\x06\x09\x2A\x86\x48\x86\xF7\x0D\x01\x07\x02" ++ ++certificates = pkcs7.load_der_pkcs7_certificates(der) ++assert certificates == [] ++ + + # We have no public verification API and won't be adding one until we get + # some requirements from users so this function exists to give us basic +-- +2.40.0 diff --git a/meta/recipes-devtools/python/python3-cryptography_36.0.2.bb b/meta/recipes-devtools/python/python3-cryptography_36.0.2.bb index c3ae0c1ab9..c429c75e1b 100644 --- a/meta/recipes-devtools/python/python3-cryptography_36.0.2.bb +++ b/meta/recipes-devtools/python/python3-cryptography_36.0.2.bb @@ -18,6 +18,7 @@ SRC_URI += " \ file://0002-Cargo.toml-edition-2018-2021.patch \ file://fix-leak-metric.patch \ file://CVE-2023-23931.patch \ +file://CVE-2023-49083.patch \ " inherit pypi python_setuptools3_rust -- 2.40.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191875): https://lists.openembedded.org/g/openembedded-core/message/191875 Mute This Topic: https://lists.openembedded.org/mt/103009685/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v4] openssh: Add PACKAGECONFIG option to customize sshd mode
From: Mingli Yu
Add systemd-sshd-socket-mode PACKAGECONFIG option to choose sshd.socket
and systemd-sshd-service-mode PACKAGECONFIG option to choose installing
sshd.service.
The systemd-sshd-socket-mode PACKAGECONFIG option is enabled by default
and user can customize the above two PACKAGECONFIG option to choose the
sshd mode.
Signed-off-by: Mingli Yu
---
Changed in v3:
rebase based on
https://lore.kernel.org/all/20231201140947.792594-1-xiangyu.c...@eng.windriver.com/
Changed in v4:
make it possible to install both sshd.socket and sshd.service
.../openssh/openssh_9.5p1.bb | 25 ++-
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
index 2c1c821ea9..58dd030c64 100644
--- a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
@@ -50,16 +50,20 @@ INITSCRIPT_NAME:${PN}-sshd = "sshd"
INITSCRIPT_PARAMS:${PN}-sshd = "defaults 9"
SYSTEMD_PACKAGES = "${PN}-sshd"
-SYSTEMD_SERVICE:${PN}-sshd = "sshd.socket sshd.service"
+SYSTEMD_SERVICE:${PN}-sshd =
"${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','sshd.socket',
'', d)}
${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','sshd.service',
'', d)}"
inherit autotools-brokensep ptest pkgconfig
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+# systemd-sshd-socket-mode means sshd.socket and systemd-sshd-service-mode
+# corresponding to sshd.service
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}
systemd-sshd-socket-mode"
PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5"
PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns"
PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat"
PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd"
+PACKAGECONFIG[systemd-sshd-socket-mode] = ""
+PACKAGECONFIG[systemd-sshd-service-mode] = ""
EXTRA_AUTORECONF += "--exclude=aclocal"
@@ -124,15 +128,24 @@ do_install:append () {
echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >>
${D}${sysconfdir}/ssh/sshd_config_readonly
install -d ${D}${systemd_system_unitdir}
- install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_system_unitdir}
- install -c -m 0644 ${WORKDIR}/sshd.service ${D}${systemd_system_unitdir}
- install -c -m 0644 ${WORKDIR}/sshd@.service
${D}${systemd_system_unitdir}
+ if
${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','true','false',d)};
then
+ install -c -m 0644 ${WORKDIR}/sshd.socket
${D}${systemd_system_unitdir}
+ install -c -m 0644 ${WORKDIR}/sshd@.service
${D}${systemd_system_unitdir}
+ sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+ -e 's,@SBINDIR@,${sbindir},g' \
+ -e 's,@BINDIR@,${bindir},g' \
+ -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
+${D}${systemd_system_unitdir}/sshd.socket
+ fi
+ if
${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','true','false',d)};
then
+ install -c -m 0644 ${WORKDIR}/sshd.service
${D}${systemd_system_unitdir}
+ fi
install -c -m 0644 ${WORKDIR}/sshdgenkeys.service
${D}${systemd_system_unitdir}
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
-e 's,@SBINDIR@,${sbindir},g' \
-e 's,@BINDIR@,${bindir},g' \
-e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
- ${D}${systemd_system_unitdir}/sshd.socket
${D}${systemd_system_unitdir}/*.service
+ ${D}${systemd_system_unitdir}/*.service
sed -i -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
${D}${sysconfdir}/init.d/sshd
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191874):
https://lists.openembedded.org/g/openembedded-core/message/191874
Mute This Topic: https://lists.openembedded.org/mt/103009646/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/2] socat: 1.7.4.4 -> 1.8.0.0
From: Hongxu Jia
1. No chagne on license [1], original md5 is not right because
beginline=241 does not match
2. Fix two compile and one install failures
[1]
https://repo.or.cz/socat.git/blobdiff/c9ff62744f4140418f4edce7e395d1a30e9161b1..2da070164d454971d5c970b5278e645051f0d0f7:/README
Signed-off-by: Hongxu Jia
---
.../0001-fix-compile-procan.c-failed.patch| 62 +++
.../{socat_1.7.4.4.bb => socat_1.8.0.0.bb}| 8 ++-
2 files changed, 67 insertions(+), 3 deletions(-)
create mode 100644
meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch
rename meta/recipes-connectivity/socat/{socat_1.7.4.4.bb => socat_1.8.0.0.bb}
(86%)
diff --git
a/meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch
b/meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch
new file mode 100644
index 00..9051ae1abe
--- /dev/null
+++
b/meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch
@@ -0,0 +1,62 @@
+From 4f887cc665c9a48b83e20ef4abe57afa7e365e0e Mon Sep 17 00:00:00 2001
+From: Hongxu Jia
+Date: Tue, 5 Dec 2023 23:02:22 -0800
+Subject: [PATCH v2] fix compile procan.c failed
+
+1. Compile socat failed if out of tree build (build dir != source dir)
+...
+gcc -c -D CC="gcc" -o procan.o procan.c
+cc1: fatal error: procan.c: No such file or directory
+...
+Explicitly add $srcdir to makefile rule
+
+2. Compile socat failed if multiple words in $(CC), such as CC="gcc -m64"
+...
+from ../socat-1.8.0.0/procan.c:10:
+../socat-1.8.0.0/sysincludes.h:18:10: fatal error: inttypes.h: No such file or
directory
+ 18 | #include/* uint16_t */
+...
+
+In commit [Procan: print umask, CC, and couple more new infos][1],
+it defeines marcro CC in C source, the space in CC will break
+C source compile. Use first word of $(CC) to defeine marco CC
+
+[1]
https://repo.or.cz/socat.git/commit/cd5673dbd0786c94e0b3ace7e35fab14c01e3185
+
+Upstream-Status: Submitted [so...@dest-unreach.org]
+Signed-off-by: Hongxu Jia
+---
+ Makefile.in | 10 +-
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index c01b1a4..48dad69 100644
+--- a/Makefile.in
b/Makefile.in
+@@ -109,8 +109,8 @@ depend: $(CFILES) $(HFILES)
+ socat: socat.o libxio.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ socat.o libxio.a $(CLIBS)
+
+-procan.o: procan.c
+- $(CC) $(CFLAGS) -c -D CC=\"$(CC)\" -o $@ procan.c
++procan.o: $(srcdir)/procan.c
++ $(CC) $(CFLAGS) -c -D CC=\"$(firstword $(CC))\" -o $@ $(srcdir)/procan.c
+
+ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o
sysutils.o utils.o vsnprintf_r.o snprinterr.o
+ procan: $(PROCAN_OBJS)
+@@ -132,9 +132,9 @@ install: progs $(srcdir)/doc/socat.1
+ mkdir -p $(DESTDIR)$(BINDEST)
+ $(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST)/socat1
+ ln -sf socat1 $(DESTDIR)$(BINDEST)/socat
+- $(INSTALL) -m 755 socat-chain.sh $(DESTDIR)$(BINDEST)
+- $(INSTALL) -m 755 socat-mux.sh$(DESTDIR)$(BINDEST)
+- $(INSTALL) -m 755 socat-broker.sh $(DESTDIR)$(BINDEST)
++ $(INSTALL) -m 755 $(srcdir)/socat-chain.sh $(DESTDIR)$(BINDEST)
++ $(INSTALL) -m 755 $(srcdir)/socat-mux.sh$(DESTDIR)$(BINDEST)
++ $(INSTALL) -m 755 $(srcdir)/socat-broker.sh $(DESTDIR)$(BINDEST)
+ $(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST)
+ $(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST)
+ mkdir -p $(DESTDIR)$(MANDEST)/man1
+--
+2.42.0
+
diff --git a/meta/recipes-connectivity/socat/socat_1.7.4.4.bb
b/meta/recipes-connectivity/socat/socat_1.8.0.0.bb
similarity index 86%
rename from meta/recipes-connectivity/socat/socat_1.7.4.4.bb
rename to meta/recipes-connectivity/socat/socat_1.8.0.0.bb
index 5a379380d1..912605c95c 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.4.4.bb
+++ b/meta/recipes-connectivity/socat/socat_1.8.0.0.bb
@@ -7,11 +7,13 @@ SECTION = "console/network"
LICENSE = "GPL-2.0-with-OpenSSL-exception"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-
file://README;beginline=257;endline=287;md5=82520b052f322ac2b5b3dfdc7c7eea86"
+
file://README;beginline=241;endline=271;md5=338c05eadd013872abb1d6e198e10a3f"
-SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2;
+SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
+ file://0001-fix-compile-procan.c-failed.patch \
+"
-SRC_URI[sha256sum] =
"fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac"
+SRC_URI[sha256sum] =
"e1de683dd22ee0e3a6c6bbff269abe18ab0c9d7eb650204f125155b9005faca7"
inherit autotools
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191873):
https://lists.openembedded.org/g/openembedded-core/message/191873
Mute This Topic: https://lists.openembedded.org/mt/103009586/21656
Group Owner:
[OE-core] [PATCH 2/2] man-db: 2.11.2 -> 2.12.0
From: Hongxu Jia
Drop obsolete autoconf-2.73.patch
Signed-off-by: Hongxu Jia
---
.../man-db/files/autoconf-2.73.patch | 24 ---
.../{man-db_2.11.2.bb => man-db_2.12.0.bb}| 4 ++--
2 files changed, 2 insertions(+), 26 deletions(-)
delete mode 100644 meta/recipes-extended/man-db/files/autoconf-2.73.patch
rename meta/recipes-extended/man-db/{man-db_2.11.2.bb => man-db_2.12.0.bb}
(95%)
diff --git a/meta/recipes-extended/man-db/files/autoconf-2.73.patch
b/meta/recipes-extended/man-db/files/autoconf-2.73.patch
deleted file mode 100644
index 6c997a68e6..00
--- a/meta/recipes-extended/man-db/files/autoconf-2.73.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
-than the full code:
-
-https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
-
-Just tweak the exiting code to work with 2.73. The next man-db upgrade should
-update to new gnulib
-
-Upstream-Status: Inappropriate
-Signed-off-by: Richard Purdie
-
-Index: findutils-4.9.0/gl/m4/largefile.m4
-===
findutils-4.9.0.orig/gl/m4/largefile.m4
-+++ findutils-4.9.0/gl/m4/largefile.m4
-@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
- # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69:
- # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
- # or configures them incorrectly in some cases.
--m4_version_prereq([2.70], [], [
-+m4_version_prereq([2.73], [], [
-
- # _AC_SYS_LARGEFILE_TEST_INCLUDES
- # ---
diff --git a/meta/recipes-extended/man-db/man-db_2.11.2.bb
b/meta/recipes-extended/man-db/man-db_2.12.0.bb
similarity index 95%
rename from meta/recipes-extended/man-db/man-db_2.11.2.bb
rename to meta/recipes-extended/man-db/man-db_2.12.0.bb
index 8941ffc013..19dbb41d16 100644
--- a/meta/recipes-extended/man-db/man-db_2.11.2.bb
+++ b/meta/recipes-extended/man-db/man-db_2.12.0.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
file://99_mandb \
file://0001-man-Move-local-variable-declaration-to-function-scop.patch \
- file://autoconf-2.73.patch"
-SRC_URI[sha256sum] =
"cffa1ee4e974be78646c46508e6dd2f37e7c589aaab2938cc1064f058fef9f8d"
+ "
+SRC_URI[sha256sum] =
"415a6284a22764ad22ff0f66710d853be7790dd451cd71436e3d25c74d996a95"
DEPENDS = "libpipeline gdbm groff-native base-passwd"
RDEPENDS:${PN} += "base-passwd"
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191872):
https://lists.openembedded.org/g/openembedded-core/message/191872
Mute This Topic: https://lists.openembedded.org/mt/103009585/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [RESEND][PATCH 1/7] bitbake: utils: remove spaces on empty lines
Le mar. 5 déc. 2023 à 17:27, Julien Stephan via lists.openembedded.org
a écrit :
>
> Le mar. 5 déc. 2023 à 16:45, Alexandre Belloni
> a écrit :
> >
> > On 05/12/2023 15:57:58+0100, Julien Stephan wrote:
> > > Le mar. 5 déc. 2023 à 08:50, Alexandre Belloni
> > > a écrit :
> > > >
> > > > Please do not send bitbake patches in the same series as oe-core patches
> > > > if there is no dependency. Those patches are applied on different
> > > > repositories.
> > >
> > > Hi Alexandre,
> > >
> > > Noted! Do you want me to resend the series without the bitbake patch?
> >
> > No but didn't take the bitbake patch because it doesn't do what the
> > commit message says. (i.e. it touches non empty lines)
> >
>
> oups, I will update the commit message and send it to the appropriate list.
>
It has already been merged with the incorrect commit message :( sorry for that
Cheers
Julien
> > >
> > > Cheers
> > > Julien
> > > >
> > > > On 04/12/2023 16:59:28+0100, Julien Stephan wrote:
> > > > > Signed-off-by: Julien Stephan
> > > > > ---
> > > > > bitbake/lib/bb/utils.py | 16
> > > > > 1 file changed, 8 insertions(+), 8 deletions(-)
> > > > >
> > > > > diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
> > > > > index b401fa5ec7a..61ffad92ce3 100644
> > > > > --- a/bitbake/lib/bb/utils.py
> > > > > +++ b/bitbake/lib/bb/utils.py
> > > > > @@ -50,7 +50,7 @@ def clean_context():
> > > > >
> > > > > def get_context():
> > > > > return _context
> > > > > -
> > > > > +
> > > > >
> > > > > def set_context(ctx):
> > > > > _context = ctx
> > > > > @@ -212,8 +212,8 @@ def explode_dep_versions2(s, *, sort=True):
> > > > > inversion = True
> > > > > # This list is based on behavior and supported
> > > > > comparisons from deb, opkg and rpm.
> > > > > #
> > > > > -# Even though =<, <<, ==, !=, =>, and >> may not be
> > > > > supported,
> > > > > -# we list each possibly valid item.
> > > > > +# Even though =<, <<, ==, !=, =>, and >> may not be
> > > > > supported,
> > > > > +# we list each possibly valid item.
> > > > > # The build system is responsible for validation of what
> > > > > it supports.
> > > > > if i.startswith(('<=', '=<', '<<', '==', '!=', '>=',
> > > > > '=>', '>>')):
> > > > > lastcmp = i[0:2]
> > > > > @@ -347,7 +347,7 @@ def _print_exception(t, value, tb, realfile,
> > > > > text, context):
> > > > > exception = traceback.format_exception_only(t, value)
> > > > > error.append('Error executing a python function in %s:\n' %
> > > > > realfile)
> > > > >
> > > > > -# Strip 'us' from the stack (better_exec call) unless that
> > > > > was where the
> > > > > +# Strip 'us' from the stack (better_exec call) unless that
> > > > > was where the
> > > > > # error came from
> > > > > if tb.tb_next is not None:
> > > > > tb = tb.tb_next
> > > > > @@ -746,9 +746,9 @@ def prunedir(topdir, ionice=False):
> > > > > # but thats possibly insane and suffixes is probably going to be
> > > > > small
> > > > > #
> > > > > def prune_suffix(var, suffixes, d):
> > > > > -"""
> > > > > +"""
> > > > > See if var ends with any of the suffixes listed and
> > > > > -remove it if found
> > > > > +remove it if found
> > > > > """
> > > > > for suffix in suffixes:
> > > > > if suffix and var.endswith(suffix):
> > > > > @@ -1001,9 +1001,9 @@ def umask(new_mask):
> > > > > os.umask(current_mask)
> > > > >
> > > > > def to_boolean(string, default=None):
> > > > > -"""
> > > > > +"""
> > > > > Check input string and return boolean value True/False/None
> > > > > -depending upon the checks
> > > > > +depending upon the checks
> > > > > """
> > > > > if not string:
> > > > > return default
> > > > > --
> > > > > 2.42.0
> > > > >
> > > >
> > > > >
> > > > >
> > > > >
> > > >
> > > >
> > > > --
> > > > Alexandre Belloni, co-owner and COO, Bootlin
> > > > Embedded Linux and Kernel engineering
> > > > https://bootlin.com
> >
> > --
> > Alexandre Belloni, co-owner and COO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191871):
https://lists.openembedded.org/g/openembedded-core/message/191871
Mute This Topic: https://lists.openembedded.org/mt/102972946/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
