Re: [OE-core] [RESEND][PATCH 1/7] bitbake: utils: remove spaces on empty lines
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.
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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191806):
https://lists.openembedded.org/g/openembedded-core/message/191806
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]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] lib/oe/patch: handle creating patches for CRLF sources
Hello, This doesn't apply on master, can you rebase? On 27/11/2023 14:49:03+0100, Yoann Congal wrote: > Using devtool to patch CRLF based sources creates patch files which have > mixed end of lines : LF for headers and CRLF for source context and > modified lines. > > Python open(..., newline=None) (default for newline arg)does detect > end-of-line in this mixed file but only outputs LF EOL data. This > result in patch files that does not apply on the original sources. > > Switching to open(..., newline='') allows to detect end-of-line but keep > the original end-of-line intact. This generate correct patches for CRLF > based sources. > > Fixes [YOCTO #15285] > > Signed-off-by: Yoann Congal > --- > meta/lib/oe/patch.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py > index ff9afc9df9..7bf660978e 100644 > --- a/meta/lib/oe/patch.py > +++ b/meta/lib/oe/patch.py > @@ -477,7 +477,7 @@ class GitApplyTree(PatchTree): > patchlines = [] > outfile = None > try: > -with open(srcfile, 'r', encoding=encoding) as f: > +with open(srcfile, 'r', encoding=encoding, > newline='') as f: > for line in f: > if > line.startswith(GitApplyTree.patch_line_prefix): > outfile = line.split()[-1].strip() > -- > 2.30.2 > > > > -- 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 (#191805): https://lists.openembedded.org/g/openembedded-core/message/191805 Mute This Topic: https://lists.openembedded.org/mt/102828787/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 0/9] Several fixes around recipetool appendsrcfile(s) and oe.recipeutils.bbappend_recipe
Hello, The series doesn't apply on master, can you rebase? On 04/12/2023 16:25:54+0100, Julien Stephan wrote: > Hi all, > > I was trying to use recipetool appendsrcfile to add a file to a recipe and I > noticed several issues: > * -m is not correctly supported > * recipetool appendsrfile(s) are missing a usefull dry-run mode > * appendsrc function relies on oe.recipeutils.bbappend_recipe but > duplicates some code: it constructs itself the new src_uri entry > although oe.recipeutils.bbappend_recipe is already doing it > * we are lacking a mode to patch the recipe itself > > So this series tries to fix the issues above, fix the selftest > accordingly and add new test for -m and for "patch mode" (update recipe) > and also add a way to specify the name of the file to add > (in oe.recipeutils.bbappend_recipe) > > Improvements from v1: > - in bbappend_recipe function remove old entry if an entry with different > parameters already exists > to avoid duplicate entries with different parameters > > Link to v1: https://lists.openembedded.org/g/openembedded-core/message/191544 > > > Julien Stephan (9): > recipetool: appendsrcfile(s): add dry-run mode > recipeutils: bbappend_recipe: fix undefined variable > recipeutils: bbappend_recipe: add a way to specify the name of the > file to add > recipeutils: bbappend_recipe: remove old srcuri entry if parameters > are different > recipetool: appendsrcfile(s): use params instead of extraline > recipeutils: bbappend_recipe: allow to patch the recipe itself > recipetool: appendsrcfile(s): add a mode to update the recipe itself > oeqa/selftest/recipetool: appendsrfile: add test for machine > oeqa/selftest/recipetool: appendsrc: add test for update mode > > meta/lib/oe/recipeutils.py | 62 +++- > meta/lib/oeqa/selftest/cases/recipetool.py | 83 +++--- > scripts/lib/devtool/standard.py| 6 +- > scripts/lib/recipetool/append.py | 63 +++- > 4 files changed, 168 insertions(+), 46 deletions(-) > > -- > 2.42.0 > > > > -- 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 (#191804): https://lists.openembedded.org/g/openembedded-core/message/191804 Mute This Topic: https://lists.openembedded.org/mt/102972288/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
Hello,
On 05/12/2023 13:52:01+0800, 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.
>
This doesn't apply after
https://lore.kernel.org/all/20231201140947.792594-1-xiangyu.c...@eng.windriver.com/
Can you synchronize and provide a working series?
> 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"
> 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
> + elif
> ${@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
>
>
>
>
--
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 (#191803):
https://lists.openembedded.org/g/openembedded-core/message/191803
Mute This Topic: https://lists.openembedded.org/mt/102987153/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Patchtest results for [PATCH 1/2] gettext: Upgrade 0.22.3 -> 0.22.4
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/1-2-gettext-Upgrade-0.22.3---0.22.4.patch FAIL: test Signed-off-by presence: Mbox is missing Signed-off-by. Add it manually or with "git commit --amend -s" (test_mbox.TestMbox.test_signed_off_by_presence) PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence) PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) 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) PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint) 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 lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) 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 summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) 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 (#191802): https://lists.openembedded.org/g/openembedded-core/message/191802 Mute This Topic: https://lists.openembedded.org/mt/102987716/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Patchtest results for [PATCH 1/3] systemtap: upgrade 4.9 -> 5.0
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/1-3-systemtap-upgrade-4.9---5.0.patch FAIL: test Signed-off-by presence: A patch file has been added without a Signed-off-by tag: '0001-prerelease-datestamp-fixes.patch' (test_patch.TestPatch.test_signed_off_by_presence) PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files) PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format) PASS: test Signed-off-by presence (test_mbox.TestMbox.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 lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) 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) PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) 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 summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) 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 (#191801): https://lists.openembedded.org/g/openembedded-core/message/191801 Mute This Topic: https://lists.openembedded.org/mt/102987645/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 0/2] meta: Upgrade gettext and nfs-utils
From: Robert Yang
The following changes since commit d2c4e8cb85c6a5ca37c7990f879c3b650df5770b:
vte: Separate out gtk4 pieces of vte into individual packages (2023-12-04
12:45:20 +)
are available in the Git repository at:
https://github.com/robertlinux/yocto rbt/upgrade
https://github.com/robertlinux/yocto/tree/rbt/upgrade
Robert Yang (2):
gettext: Upgrade 0.22.3 -> 0.22.4
nfs-utils: Upgrade 2.6.3 -> 2.6.4
...event-and-libsqlite3-checked-when-nf.patch | 80 ---
...{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} | 3 +-
3.bb => gettext-minimal-native_0.22.4.bb} | 0
meta/recipes-core/gettext/gettext-sources.inc | 2 +-
.../{gettext_0.22.3.bb => gettext_0.22.4.bb} | 0
5 files changed, 2 insertions(+), 83 deletions(-)
delete mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch
rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.3.bb =>
nfs-utils_2.6.4.bb} (97%)
rename meta/recipes-core/gettext/{gettext-minimal-native_0.22.3.bb =>
gettext-minimal-native_0.22.4.bb} (100%)
rename meta/recipes-core/gettext/{gettext_0.22.3.bb => gettext_0.22.4.bb}
(100%)
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191799):
https://lists.openembedded.org/g/openembedded-core/message/191799
Mute This Topic: https://lists.openembedded.org/mt/102987609/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] nfs-utils: Upgrade 2.6.3 -> 2.6.4
From: Robert Yang
Remove backported patch
0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch.
Signed-off-by: Robert Yang
---
...event-and-libsqlite3-checked-when-nf.patch | 80 ---
...{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} | 3 +-
2 files changed, 1 insertion(+), 82 deletions(-)
delete mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch
rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.3.bb =>
nfs-utils_2.6.4.bb} (97%)
diff --git
a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch
b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch
deleted file mode 100644
index 5afc714f190..000
---
a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From b62a3fe424026b73ec6b1934483b16863c7dff23 Mon Sep 17 00:00:00 2001
-From: Wiktor Jaskulski
-Date: Thu, 11 May 2023 15:28:23 -0400
-Subject: [PATCH] configure.ac: libevent and libsqlite3 checked when nfsv4 is
- disabled
-
-Upstream-Status: Backport
-(http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca)
-
-Signed-off-by: Steve Dickson
-Signed-off-by: Trevor Gamblin
- configure.ac | 38 +++---
- 1 file changed, 15 insertions(+), 23 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4ade528d..519cacbf 100644
a/configure.ac
-+++ b/configure.ac
-@@ -335,42 +335,34 @@ AC_CHECK_HEADER(rpc/rpc.h, ,
- AC_MSG_ERROR([Header file rpc/rpc.h not found - maybe try
building with --enable-tirpc]))
- CPPFLAGS="${nfsutils_save_CPPFLAGS}"
-
-+dnl check for libevent libraries and headers
-+AC_LIBEVENT
-+
-+dnl Check for sqlite3
-+AC_SQLITE3_VERS
-+
-+case $libsqlite3_cv_is_recent in
-+yes) ;;
-+unknown)
-+ dnl do not fail when cross-compiling
-+ AC_MSG_WARN([assuming sqlite is at least v3.3]) ;;
-+*)
-+ AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;;
-+esac
-+
- if test "$enable_nfsv4" = yes; then
-- dnl check for libevent libraries and headers
-- AC_LIBEVENT
-
- dnl check for the keyutils libraries and headers
- AC_KEYUTILS
-
-- dnl Check for sqlite3
-- AC_SQLITE3_VERS
--
- if test "$enable_nfsdcld" = "yes"; then
- AC_CHECK_HEADERS([libgen.h sys/inotify.h], ,
- AC_MSG_ERROR([Cannot find header needed for nfsdcld]))
--
--case $libsqlite3_cv_is_recent in
--yes) ;;
--unknown)
-- dnl do not fail when cross-compiling
-- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;;
--*)
-- AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;;
--esac
- fi
-
- if test "$enable_nfsdcltrack" = "yes"; then
- AC_CHECK_HEADERS([libgen.h sys/inotify.h], ,
- AC_MSG_ERROR([Cannot find header needed for nfsdcltrack]))
--
--case $libsqlite3_cv_is_recent in
--yes) ;;
--unknown)
-- dnl do not fail when cross-compiling
-- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;;
--*)
-- AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;;
--esac
- fi
-
- else
---
-2.41.0
-
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb
b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb
similarity index 97%
rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb
rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb
index 35cf6af6d46..31290f6d44c 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb
@@ -30,11 +30,10 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
file://bugfix-adjust-statd-service-name.patch \
file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \
file://clang-warnings.patch \
-
file://0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch \
file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \
file://0001-tools-locktest-Use-intmax_t-to-print-off_t.patch \
"
-SRC_URI[sha256sum] =
"38d89e853a71d3c560ff026af3d969d75e24f782ff68324e76261fe0344459e1"
+SRC_URI[sha256sum] =
"01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d"
# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd
module will
# pull in the remainder of the dependencies.
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191800):
https://lists.openembedded.org/g/openembedded-core/message/191800
Mute This Topic: https://lists.openembedded.org/mt/102987610/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[OE-core] [PATCH 1/2] gettext: Upgrade 0.22.3 -> 0.22.4
From: Robert Yang
>From NEWS:
Version 0.22.4 - November 2023
* Bug fixes:
- AM_GNU_GETTEXT now recognizes a statically built libintl on macOS and AIX.
- Build fixes on AIX.
Signed-off-by: Robert Yang
---
...inimal-native_0.22.3.bb => gettext-minimal-native_0.22.4.bb} | 0
meta/recipes-core/gettext/gettext-sources.inc | 2 +-
.../gettext/{gettext_0.22.3.bb => gettext_0.22.4.bb}| 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/gettext/{gettext-minimal-native_0.22.3.bb =>
gettext-minimal-native_0.22.4.bb} (100%)
rename meta/recipes-core/gettext/{gettext_0.22.3.bb => gettext_0.22.4.bb}
(100%)
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.22.3.bb
b/meta/recipes-core/gettext/gettext-minimal-native_0.22.4.bb
similarity index 100%
rename from meta/recipes-core/gettext/gettext-minimal-native_0.22.3.bb
rename to meta/recipes-core/gettext/gettext-minimal-native_0.22.4.bb
diff --git a/meta/recipes-core/gettext/gettext-sources.inc
b/meta/recipes-core/gettext/gettext-sources.inc
index 31dabfc5436..8b4e2401010 100644
--- a/meta/recipes-core/gettext/gettext-sources.inc
+++ b/meta/recipes-core/gettext/gettext-sources.inc
@@ -1,4 +1,4 @@
HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html;
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
"
-SRC_URI[sha256sum] =
"839a260b2314ba66274dae7d245ec19fce190a3aa67869bf31354cb558df42c7"
+SRC_URI[sha256sum] =
"c1e0bb2a4427a9024390c662cd532d664c4b36b8ff444ed5e54b115fdb7a1aea"
diff --git a/meta/recipes-core/gettext/gettext_0.22.3.bb
b/meta/recipes-core/gettext/gettext_0.22.4.bb
similarity index 100%
rename from meta/recipes-core/gettext/gettext_0.22.3.bb
rename to meta/recipes-core/gettext/gettext_0.22.4.bb
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191798):
https://lists.openembedded.org/g/openembedded-core/message/191798
Mute This Topic: https://lists.openembedded.org/mt/102987608/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 3/3] systemtap-uprobes: removed as obsolete
systemtap-uprobes package was not used for a long time - since kernel
itself provided uprobes support. Now source code of old uprobes kernel
module was removed from systemtap git repo by "PR30434 continuation:
Removed old uprobes, uprobes2 implementation, uprobes-inc.h & any
mentions of CONFIG_UTRACE." it is good time for us to gid rid of it
too.
Signed-off-by: Victor Kamensky
---
meta/conf/distro/include/distro_alias.inc | 1 -
meta/conf/distro/include/maintainers.inc | 1 -
.../systemtap/systemtap-uprobes_git.bb| 42 ---
3 files changed, 44 deletions(-)
delete mode 100644 meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
diff --git a/meta/conf/distro/include/distro_alias.inc
b/meta/conf/distro/include/distro_alias.inc
index e43c0acd80..e6131c815a 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -317,7 +317,6 @@ DISTRO_PN_ALIAS:pn-sysprof = "Fedora=sysprof Debian=sysprof"
DISTRO_PN_ALIAS:pn-systemd-compat-units = "Fedora=systemd Ubuntu=systemd"
DISTRO_PN_ALIAS:pn-systemd-systemctl = "OE-Core"
DISTRO_PN_ALIAS:pn-systemd-systemdctl = "Fedora=systemd Ubuntu=systemd"
-DISTRO_PN_ALIAS:pn-systemtap-uprobes = "Ubuntu=systemtap Debian=systemtap"
DISTRO_PN_ALIAS:pn-sysvinit-inittab = "OE-Core"
DISTRO_PN_ALIAS:pn-tar-replacement = "Fedora=tar Ubuntu=tar"
DISTRO_PN_ALIAS:pn-tcf-agent = "Windriver
upstream=http://www.eclipse.org/dsdp/tm/;
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 2c59db56ac..445f797bcb 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -794,7 +794,6 @@ RECIPE_MAINTAINER:pn-systemd-serialgetty = "Chen Qi
"
RECIPE_MAINTAINER:pn-systemd-systemctl-native = "Chen Qi
"
RECIPE_MAINTAINER:pn-systemtap = "Victor Kamensky "
RECIPE_MAINTAINER:pn-systemtap-native = "Victor Kamensky
"
-RECIPE_MAINTAINER:pn-systemtap-uprobes = "Victor Kamensky
"
RECIPE_MAINTAINER:pn-sysvinit = "Ross Burton "
RECIPE_MAINTAINER:pn-sysvinit-inittab = "Ross Burton "
RECIPE_MAINTAINER:pn-taglib = "Anuj Mittal "
diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
deleted file mode 100644
index 3d35481bdc..00
--- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-SUMMARY = "UProbes kernel module for SystemTap"
-HOMEPAGE = "https://sourceware.org/systemtap/;
-require systemtap_git.inc
-
-DEPENDS = "systemtap virtual/kernel"
-
-# On systems without CONFIG_UTRACE, this package is empty.
-ALLOW_EMPTY:${PN} = "1"
-
-inherit module-base gettext
-
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemtap:"
-
-FILES:${PN} += "${datadir}/systemtap/runtime/uprobes"
-
-# Compile and install the uprobes kernel module on machines with utrace
-# support. Note that staprun expects it in the systemtap/runtime directory,
-# not in /lib/modules.
-do_compile() {
- if grep -q "CONFIG_UTRACE=y" ${STAGING_KERNEL_BUILDDIR}/.config
- then
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP
- oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
- AR="${KERNEL_AR}" OBJCOPY="${KERNEL_OBJCOPY}" \
- STRIP="${KERNEL_STRIP}" \
- -C ${STAGING_KERNEL_DIR} scripts
- oe_runmake KDIR=${STAGING_KERNEL_DIR} \
- M="${S}/runtime/uprobes/" \
- CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
- AR="${KERNEL_AR}" OBJCOPY="${KERNEL_OBJCOPY}" \
- STRIP="${KERNEL_STRIP}" \
- -C "${S}/runtime/uprobes/"
- fi
-}
-
-do_install() {
- if [ -e "${S}/runtime/uprobes/uprobes.ko" ]
- then
- install -d ${D}${datadir}/systemtap/runtime/uprobes/
- install -m 0644 ${S}/runtime/uprobes/uprobes.ko
${D}${datadir}/systemtap/runtime/uprobes/
- fi
-}
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191797):
https://lists.openembedded.org/g/openembedded-core/message/191797
Mute This Topic: https://lists.openembedded.org/mt/102987516/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/3] systemtap: upgrade 4.9 -> 5.0
Similar to 4.9 release, in 5.0 release release-5.0 tag is off any branch, release-5.0a tag e72dc118e563c645d93a1a2d771e8d90e8fec1ae is on the master branch. Use this value for SRCREV and add catch up patch, 0001-prerelease-datestamp-fixes.patch, to bring source up to release-5.0 tag level. Remove 0001-prerelease-datestamp-fixes.patch in next upgrade. Signed-off-by: Victor Kamensky --- .../0001-prerelease-datestamp-fixes.patch | 23 .../systemtap/0001-release-date-fix.patch | 37 --- .../systemtap/systemtap_git.inc | 6 +-- 3 files changed, 26 insertions(+), 40 deletions(-) create mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch b/meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch new file mode 100644 index 00..afdc10a3fe --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/0001-prerelease-datestamp-fixes.patch @@ -0,0 +1,23 @@ +From cfc2c1d53924face11e3fab78ded61c359778eb9 Mon Sep 17 00:00:00 2001 +From: "Frank Ch. Eigler" +Date: Sat, 4 Nov 2023 12:19:59 -0400 +Subject: [PATCH] prerelease datestamp fixes + +Upstream-Status: Backport +--- + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index c7f31e8b7..f0f9056c4 100644 +--- a/NEWS b/NEWS +@@ -1,4 +1,4 @@ +-* What's new in version 5.0, 2023-11-03 ++* What's new in version 5.0, 2023-11-04 + + - Performance improvements in uprobe registration and module startup. + +-- +2.31.1 + diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch b/meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch deleted file mode 100644 index 3dcb369ec3..00 --- a/meta/recipes-kernel/systemtap/systemtap/0001-release-date-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ebb424eee5599fcc131901c0d82d0bfc0d2f57ab Mon Sep 17 00:00:00 2001 -From: "Frank Ch. Eigler" -Date: Fri, 28 Apr 2023 13:51:27 -0400 -Subject: [PATCH] release date fix - -Upstream-Status: Backport - NEWS | 2 +- - systemtap.spec | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/NEWS b/NEWS -index 695bc990c..46859e304 100644 a/NEWS -+++ b/NEWS -@@ -1,4 +1,4 @@ --* What's new in version 4.9, 2023-04-27 -+* What's new in version 4.9, 2023-04-28 - - - ISystemtap: the new interactive systemtap jupyter kernel. This provides - a simple GUI for writing/running Systemtap scripts in an easy, incremental -diff --git a/systemtap.spec b/systemtap.spec -index 59814f112..fd8023264 100644 a/systemtap.spec -+++ b/systemtap.spec -@@ -1307,7 +1307,7 @@ exit 0 - - # PRERELEASE - %changelog --* Thu Apr 27 2023 Frank Ch. Eigler - 4.9-1 -+* Fri Apr 28 2023 Frank Ch. Eigler - 4.9-1 - - Upstream release, see wiki page below for detailed notes. - https://sourceware.org/systemtap/wiki/SystemTapReleases - --- -2.40.1 - diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index de3750ff04..bc2a9ff434 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,13 +1,13 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "418f0a45ca4473491385b5c7eef777607bbdb3b7" -PV = "4.9" +SRCREV = "e72dc118e563c645d93a1a2d771e8d90e8fec1ae" +PV = "5.0" SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \ file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ file://0001-Install-python-modules-to-correct-library-dir.patch \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ - file://0001-release-date-fix.patch \ + file://0001-prerelease-datestamp-fixes.patch \ " COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191795): https://lists.openembedded.org/g/openembedded-core/message/191795 Mute This Topic: https://lists.openembedded.org/mt/102987514/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/3] systemtap: do not install uprobes and uprobes sources
Addresses the following do_package_qa warning:
WARNING: systemtap-5.0-r0 do_package_qa: QA Issue: File
/usr/share/systemtap/runtime/linux/uprobes/Makefile in package systemtap
contains reference to TMPDIR
File /usr/share/systemtap/runtime/linux/uprobes/git_version.h in package
systemtap contains reference to TMPDIR
File /usr/share/systemtap/runtime/linux/uprobes2/git_version.h in package
systemtap contains reference to TMPDIR [buildpaths]
Signed-off-by: Victor Kamensky
---
...ve-runtime-linux-uprobes-and-runtime.patch | 40 +++
.../systemtap/systemtap_git.inc | 1 +
2 files changed, 41 insertions(+)
create mode 100644
meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch
diff --git
a/meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch
b/meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch
new file mode 100644
index 00..2d46a3962d
--- /dev/null
+++
b/meta/recipes-kernel/systemtap/systemtap/0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch
@@ -0,0 +1,40 @@
+From 5a01e28bd806326b2143e3e6bb28d4780c5d879d Mon Sep 17 00:00:00 2001
+From: Victor Kamensky
+Date: Sun, 3 Dec 2023 18:40:05 -0800
+Subject: [PATCH] Makefile.am: remove runtime/linux/uprobes and
+ runtime/linux/uprobes2 install
+
+"PR30434 continuation: Removed old uprobes, uprobes2 implementation,
+uprobes-inc.h & any mentions of CONFIG_UTRACE." commit removed uprobes,
+and uprobes2 sources and directories, but Makefile.am still tries to
+install them. In fact after failing to 'cd' into runtime/linux/uprobes
+directory it copies top level *.[ch] files into
+${prefix}/share/systemtap/runtime/linux/uprobes directory.
+
+The issue was caught by OpenEmbedded project do_package_qa checks.
+
+Signed-off-by: Victor Kamensky
+
+Upstream-Status: Submitted
[https://sourceware.org/pipermail/systemtap/2023q4/027880.html]
+---
+ Makefile.am | 4
+ 1 file changed, 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5737c6b20..2ba896088 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -277,10 +277,6 @@ endif
+ do $(INSTALL_DATA) -D $$f
$(DESTDIR)$(pkgdatadir)/runtime/softfloat/$$f; done)
+ (cd $(srcdir)/runtime/linux; for f in *.[ch]; \
+ do $(INSTALL_DATA) -D $$f
$(DESTDIR)$(pkgdatadir)/runtime/linux/$$f; done)
+- (cd $(srcdir)/runtime/linux/uprobes; for f in Makefile *.[ch]; \
+- do $(INSTALL_DATA) -D $$f
$(DESTDIR)$(pkgdatadir)/runtime/linux/uprobes/$$f; done)
+- (cd $(srcdir)/runtime/linux/uprobes2; for f in *.[ch]; \
+- do $(INSTALL_DATA) -D $$f
$(DESTDIR)$(pkgdatadir)/runtime/linux/uprobes2/$$f; done)
+ (cd $(srcdir)/tapset; find . \( -name '*.stp' -o -name '*.stpm' -o
-name README \) -print \
+ | while read f; do $(INSTALL_DATA) -D $$f
$(DESTDIR)$(pkgdatadir)/tapset/$$f; done)
+ (cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \
+--
+2.31.1
+
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc
b/meta/recipes-kernel/systemtap/systemtap_git.inc
index bc2a9ff434..9fe85676fc 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -7,6 +7,7 @@ SRC_URI =
"git://sourceware.org/git/systemtap.git;branch=master;protocol=https \
file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
file://0001-Install-python-modules-to-correct-library-dir.patch \
file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \
+
file://0001-Makefile.am-remove-runtime-linux-uprobes-and-runtime.patch \
file://0001-prerelease-datestamp-fixes.patch \
"
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191796):
https://lists.openembedded.org/g/openembedded-core/message/191796
Mute This Topic: https://lists.openembedded.org/mt/102987515/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] 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"
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
+ elif
${@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 (#191794):
https://lists.openembedded.org/g/openembedded-core/message/191794
Mute This Topic: https://lists.openembedded.org/mt/102987153/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 7/18/23 04:22, Alexander Kanavin 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. This merged to master and it should not have happened. I'm sending a revert. Alex Hi, Alex I know that following patch already reverted. https://git.openembedded.org/openembedded-core/commit/?id=49bad18012a4079f0dbfe6c541a46ec508940f28 But after review it again, I think maybe it is still needed. dnf works like this, it will create log file /var/log/log_lock.pid, and this lock file is designed to by removed after reboot, refer following link. https://github.com/rpm-software-management/dnf/blob/master/etc/tmpfiles.d/dnf.conf But following patch for fixing oe specific issue break above dnf design about removing lock file. https://git.openembedded.org/openembedded-core/commit/?id=742a1b71249f4da1c8d8e13e270b0eb6128a3f66 So I add this patch https://git.openembedded.org/openembedded-core/commit/?id=406a72a9a47c2735b7e18cefc682b1df00d5a9aa to remove the lock file in rootfs. Since for dnf-native, it will not have reboot process, so it is better to remove it at post process of rootfs, to make an clean rootfs. Regards //Changqing On Tue, 11 Jul 2023 at 10:34, Changqing Li wrote: On 7/4/23 19:11, Ross Burton 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 30 Jun 2023, at 16:07, Alexander Kanavin via lists.openembedded.org wrote: On Fri, 30 Jun 2023 at 11:14, Changqing Li wrote: Remove log_lock.pid which maybe created during do_rootfs. In commit [dnf: only write the log lock to root for native dnf], native dnf changed to write log lock to root, and target dnf still use /var/log, so log_lock.pid need to be removed post do_rootfs. This is not making clear why the file needs to be removed. What problems occur if it is left in place? Is it supposed to be added, then removed by dnf during do_rootfs, and if this doesn't happen, is that a problem with dnf that needs to be fixed, rather than removing the file manually after the fact? Absolutely. If the dnf image creation is leaving lock files then we fix the dnf image creation. Does dnf leave a daemon hanging around? Does it leave lock files when it shouldn’t? Either way, this should be in dnf or the image creation code itself, not a generic rootfs postcommand. Alex and Ross, There is no dnf daemon hanging around, you are right, seems like an dnf bug, I will report this to dnf upstream. And there is no functional problem if this file is not removed, only it may confuse user there is an useless file that is generated during do_rootfs, it should not exit in rootfs. //Changqing Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191793): https://lists.openembedded.org/g/openembedded-core/message/191793 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][dunfell 3/3] 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 2/3] 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 1/3] 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][kirkstone 3/4] linux-yocto/5.10: update to v5.10.202
From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 479e8b892541 Linux 5.10.202 610057f4f6e0 interconnect: qcom: Add support for mask-based BCMs 7ce66afcaaf6 netfilter: nf_tables: disable toggling dormant table state more than once d9c4da8cb74e netfilter: nf_tables: fix table flag updates 7d1d3f113425 netfilter: nftables: update table flags from the commit phase a98172e36e5f tracing: Have trace_event_file have ref counters c6e8af2a8a63 io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid aeeb1ad2dd4e drm/amd/display: Change the DMCUB mailbox memory location from FB to inbox e2bdd437886c drm/amdgpu: fix error handling in amdgpu_bo_list_get() dfa8e63ca527 drm/amd/pm: Handle non-terminated overdrive commands. 7dc933b4b498 ext4: remove gdb backup copy for meta bg in setup_new_flex_group_blocks 0932764fb54a ext4: correct the start block of counting reserved clusters 3c1ad03a5ff2 ext4: correct return value of ext4_convert_meta_bg d739a7e38944 ext4: correct offset of gdb backup in non meta_bg group to update_backups c878db71edc0 ext4: apply umask if ACL support is disabled 3a51aee542b0 Revert "net: r8169: Disable multicast filter for RTL8168H and RTL8107E" f6e014b5eb1d media: qcom: camss: Fix vfe_get() error jump e2d2e266089d mm: kmem: drop __GFP_NOFAIL when allocating objcg vectors 6875820f36bf nfsd: fix file memleak on client_opens_release b51b20c018c6 media: venus: hfi: add checks to handle capabilities from firmware bcee276a1e02 media: venus: hfi: fix the check to handle session buffer requirement da240b7bada2 media: venus: hfi_parser: Add check to keep the number of codecs within range 0f887306bd8b media: sharp: fix sharp encoding dfa9f4ea6502 media: lirc: drop trailing space from scancode transmit c041f5ddef00 f2fs: avoid format-overflow warning 829f0d5231b7 i2c: i801: fix potential race in i801_block_transaction_byte_by_byte 430603f6de33 net: phylink: initialize carrier state at creation 4dc0484e90a3 net: dsa: lan9303: consequently nested-lock physical MDIO cb1006640cb3 i2c: designware: Disable TX_EMPTY irq while waiting for block length byte 8e29eebe4c39 lsm: fix default return value for inode_getsecctx 8327f50442d2 lsm: fix default return value for vm_enough_memory a011391f019c Revert ncsi: Propagate carrier gain/loss events to the NCSI controller 969d994612ff arm64: dts: qcom: ipq6018: Fix tcsr_mutex register size 2b3931eb8e9c arm64: dts: qcom: ipq6018: switch TCSR mutex to MMIO bdda1c356d58 PCI: exynos: Don't discard .remove() callback 62d15b6a6ec9 Bluetooth: btusb: Add 0bda:b85b for Fn-Link RTL8852BE dbbf3c456002 Bluetooth: btusb: Add RTW8852BE device 13d3:3570 to device tables 990d4c76d254 bluetooth: Add device 13d3:3571 to device tables 3aba34baa4fb bluetooth: Add device 0bda:887b to device tables 0952747362c1 Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0cb8:0xc559 8617305611c1 cpufreq: stats: Fix buffer overflow detection in trans_stats() 2ed25af15b32 tty: serial: meson: fix hard LOCKUP on crtscts mode 07c61839582d serial: meson: Use platform_get_irq() to get the interrupt 980c3135f1ae tty: serial: meson: retrieve port FIFO size from DT 1e66cd408353 serial: meson: remove redundant initialization of variable id ba30578def84 ALSA: hda/realtek - Enable internal speaker of ASUS K6500ZC ddd47d8d1ba6 ALSA: hda/realtek - Add Dell ALC295 to pin fall back table a681d28b973f ALSA: info: Fix potential deadlock at disconnection f04fa1e1997f xhci: Enable RPM on controllers that support low-power states 5e34fe50a976 parisc/pgtable: Do not drop upper 5 address bits of physical address 064c697cac4b parisc: Prevent booting 64-bit kernels on PA1.x machines c6effcdd7dd0 i3c: master: cdns: Fix reading status register 76320f05b99d mtd: cfi_cmdset_0001: Byte swap OTP info dce3e7c40055 mm/memory_hotplug: use pfn math in place of direct struct page manipulation 63d2023fbbe1 mm/cma: use nth_page() in place of direct struct page manipulation d24340f08104 dmaengine: stm32-mdma: correct desc prep when channel running 788322e1ede6 mcb: fix error handling for different scenarios when parsing 25284c46b657 i2c: core: Run atomic i2c xfer when !preemptible 8f8fc95b3a7f kernel/reboot: emergency_restart: Set correct system_state 9386f59759b4 quota: explicitly forbid quota files from being encrypted f729cf6f3217 jbd2: fix potential data lost in recovering journal raced with synchronizing fs bdev db5ebaeb8fda PCI: keystone: Don't discard .probe() callback 2bcdc1b6b61e PCI: keystone: Don't discard .remove() callback 943347e53a75 genirq/generic_chip: Make irq_remove_generic_chip() irqdomain aware b2c194fe8f31 mmc: meson-gx: Remove setting of CMD_CFG_ERROR 03ed26935beb wifi: ath11k: fix
[OE-core][kirkstone 2/4] linux-yocto/5.10: update to v5.10.200
From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 3e55583405ac Linux 5.10.200 a5feaf765935 ALSA: hda: intel-dsp-config: Fix JSL Chromebook quirk detection 9109649559f9 tty: 8250: Add support for Intashield IS-100 73bcb4d44988 tty: 8250: Add support for Brainboxes UP cards 119f38e8ca16 tty: 8250: Add support for additional Brainboxes UC cards a8bf6f62187f tty: 8250: Remove UC-257 and UC-431 e705aee2a657 usb: raw-gadget: properly handle interrupted requests 8e0324f2cbb7 usb: storage: set 1.50 as the lower bcdDevice for older "Super Top" compatibility 747b8f877998 PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device deddf60c271f can: isotp: isotp_sendmsg(): fix TX state detection and wait behavior 8716c28f695c can: isotp: isotp_bind(): do not validate unused address information e4c4e0e1b29c can: isotp: add local echo tx processing and tx without FC 569c95b7ece0 can: isotp: handle wait_event_interruptible() return values de3c02383aa6 can: isotp: check CAN address family in isotp_bind() 0386f3704789 can: isotp: isotp_bind(): return -EINVAL on incorrect CAN ID formatting 93b1e3f3a263 can: isotp: set max PDU size to 64 kByte 7adbc048d84b can: isotp: Add error message if txqueuelen is too small 57798a2cfe15 can: isotp: add symbolic error message to isotp_module_init() 186ab5645199 can: isotp: change error format from decimal to symbolic error names b881ce6c7d10 powerpc/mm: Fix boot crash with FLATMEM 1b285a1bfb0d net: chelsio: cxgb4: add an error code check in t4_load_phy_fw 955a1105eec2 platform/mellanox: mlxbf-tmfifo: Fix a warning message 268ec38b797b scsi: mpt3sas: Fix in error path abf9c7811836 fbdev: uvesafb: Call cn_del_callback() at the end of uvesafb_exit() ec45886637ee ASoC: rt5650: fix the wrong result of key button c683d8b6417c netfilter: nfnetlink_log: silence bogus compiler warning 66cc633fc6e1 spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0 6f9093b6f8f7 fbdev: atyfb: only use ioremap_uc() on i386 and ia64 ead3c123a753 Input: synaptics-rmi4 - handle reset delay when using SMBus trsnsport fb8f253b9532 dmaengine: ste_dma40: Fix PM disable depth imbalance in d40_probe e619b38a873f irqchip/stm32-exti: add missing DT IRQ flag translation d151fb801957 net: sched: cls_u32: Fix allocation size in u32_init() 9ade01b2949b x86: Fix .brk attribute in linker script 3fdd5b2bb09f rpmsg: Fix possible refcount leak in rpmsg_register_device_override() 41c13a571de4 rpmsg: glink: Release driver_override 5f1bb9f4d4b5 rpmsg: Fix calling device_lock() on non-initialized device 5bbd3469a4b6 rpmsg: Fix kfree() of static memory on setting driver_override d0208fb38f43 rpmsg: Constify local variable in field store macro da369d3996cc driver: platform: Add helper for safer setting of driver_override 4a20f5ea62db objtool/x86: add missing embedded_insn check 6b977a7323f7 ext4: avoid overlapping preallocations due to overflow 58fe961c606c ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow c0db17e55ff6 ext4: add two helper functions extent_logical_end() and pa_logical_end() c761d34a7ec0 x86/mm: Fix RESERVE_BRK() for older binutils 01a5e17e3ef3 x86/mm: Simplify RESERVE_BRK() 571ce7d944cd f2fs: fix to do sanity check on inode type during garbage collection d1c37e849f37 smbdirect: missing rc checks while waiting for rdma events b2e62728b106 kobject: Fix slab-out-of-bounds in fill_kobj_path() b9b197f65904 x86/i8259: Skip probing when ACPI/MADT advertises PCAT compatibility 62184eb77821 iio: adc: xilinx-xadc: Don't clobber preset voltage/temperature thresholds e96eb8853f33 iio: adc: xilinx: use more devres helpers and remove remove() 0eb1198fe4d6 iio: adc: xilinx: use devm_krealloc() instead of kfree() + kcalloc() c4b496c9f772 iio: adc: xilinx: use helper variable for >dev d8928befffe5 clk: Sanitize possible_parent_show to Handle Return Value of of_clk_get_parent_name 09ce0d85cc00 sparc32: fix a braino in fault handling in csum_and_copy_..._user() 0258ca32b0ea perf/core: Fix potential NULL deref 4e3c606afa25 nvmem: imx: correct nregs for i.MX6UL 37ccf15ebeec nvmem: imx: correct nregs for i.MX6SLL 7a1c29e93c25 nvmem: imx: correct nregs for i.MX6ULL d44166341f4b misc: fastrpc: Clean buffers on remote invocation failures 866838eb8ee9 tracing/kprobes: Fix the description of variable length arguments ca764116b5c1 i2c: aspeed: Fix i2c bus hang in slave read 18c5167d0460 i2c: stm32f7: Fix PEC handling in case of SMBUS transfers 80416f6ba002 i2c: muxes: i2c-demux-pinctrl: Use of_get_i2c_adapter_by_node() 9a9ead53e72f i2c: muxes: i2c-mux-gpmux: Use of_get_i2c_adapter_by_node() 3cb69f1dbc86 i2c: muxes: i2c-mux-pinctrl: Use of_get_i2c_adapter_by_node() 0c8587fec9d5 iio: exynos-adc:
[OE-core][kirkstone 1/4] linux-yocto/5.10: update to v5.10.198
From: Bruce Ashfield
Updating to the latest korg -stable release that comprises
the following commits:
a8d812240fdd Linux 5.10.198
660627c71bc1 xen/events: replace evtchn_rwlock with RCU
1e3d016a9506 mmc: renesas_sdhi: only reset SCC when its pointer is populated
a7d86a77c33b netfilter: nftables: exthdr: fix 4-byte stack OOB write
84f6b686df2d netfilter: nf_tables: fix kdoc warnings after gc rework
c17446c00805 parisc: Restore __ldcw_align for PA-RISC 2.0 processors
cfc93ae6 RDMA/mlx5: Fix NULL string error
0d520cdb0cd0 RDMA/siw: Fix connection failure handling
5a4a6a47e074 RDMA/uverbs: Fix typo of sizeof argument
626868282c36 RDMA/cma: Fix truncation compilation warning in make_cma_ports
7de0e42444e9 RDMA/cma: Initialize ib_sa_multicast structure to 0 when join
36953b4da78b gpio: pxa: disable pinctrl calls for MMP_GPIO
6ad972e66870 gpio: aspeed: fix the GPIO number passed to
pinctrl_gpio_set_config()
d7d8f1a679ec IB/mlx4: Fix the size of a buffer in add_port_entries()
204c2d485f86 of: dynamic: Fix potential memory leak in of_changeset_action()
b74f12f98b7f RDMA/core: Require admin capabilities to set system parameters
ccd87fe7a0f6 dm zoned: free dmz->ddev array in dmz_put_zoned_devices
82d87c944ea8 cpupower: add Makefile dependencies for install targets
492241613cf4 sctp: update hb timer immediately after users change
hb_interval
f87658493898 sctp: update transport state when processing a dupcook packet
ff346b01eba5 tcp: fix delayed ACKs for MSS boundary condition
677aaa261e7a tcp: fix quick-ack counting to count actual ACKs of new data
6a24d0661fa3 tipc: fix a potential deadlock on >lock
b9f1568ba37f net: stmmac: dwmac-stm32: fix resume on STM32 MCU
3a5142f01758 netfilter: nf_tables: nft_set_rbtree: fix spurious insertion
failure
0ba9348532bd netfilter: handle the connecting collision properly in
nf_conntrack_proto_sctp
b212f361a5d1 net: ethernet: ti: am65-cpsw: Fix error code in
am65_cpsw_nuss_init_tx_chns()
dba849cc9811 net: nfc: llcp: Add lock when modifying device list
30bc4d7aebe3 net: usb: smsc75xx: Fix uninit-value access in
__smsc75xx_read_reg
d44346dda7d4 net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent
96b2e1090397 ipv4, ipv6: Fix handling of transhdrlen in
__ip{,6}_append_data()
2ea52a2fb8e8 net: fix possible store tearing in neigh_periodic_work()
6e3d9e5caba8 modpost: add missing else to the "of" check
225cd4f67bd4 NFSv4: Fix a nfs4_state_manager() race
d8f2ba9ec358 ima: rework CONFIG_IMA dependency block
77f82df960cb scsi: target: core: Fix deadlock due to recursive locking
a9430129d8db ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig
725fd2080559 regmap: rbtree: Fix wrong register marked as in-cache when
creating new node
666cdc43df24 wifi: mt76: mt76x02: fix MT76x0 external LNA gain handling
54a4faab2baa drivers/net: process the result of hdlc_open() and add call of
hdlc_close() in uhdlc_close()
93dd471d3a2f bpf: Fix tr dereferencing
10a18c8bac7f wifi: mwifiex: Fix oob check condition in
mwifiex_process_rx_packet
8c15c1bcc5b5 wifi: iwlwifi: dbg_ini: fix structure packing
a5f643ab1163 ubi: Refuse attaching if mtd's erasesize is 0
33420a82067b arm64: Add Cortex-A520 CPU part definition
81d03e251894 net: prevent rewrite of msg_name in sock_sendmsg()
72fc02ebfc93 net: replace calls to sock->ops->connect() with
kernel_connect()
1aeff207e295 wifi: mwifiex: Fix tlv_buf_left calculation
f6f25930fa34 qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info
b9c4b3ca9016 scsi: zfcp: Fix a double put in zfcp_port_enqueue()
04b6b67a3e77 Revert "PCI: qcom: Disable write access to read only registers
for IP v2.3.3"
c2cf152e8bb8 Revert "clk: imx: pll14xx: dynamically configure PLL for
393216000/361267200Hz"
f94471c0cc31 block: fix use-after-free of q->q_usage_counter
0d6987d4a34c rbd: take header_rwsem in rbd_dev_refresh() only when updating
d3d170c5fc06 rbd: decouple parent info read-in from updating rbd_dev
3ceb306f9b2d rbd: decouple header read-in from updating rbd_dev->header
7c4f11d73b24 rbd: move rbd_dev_refresh() definition
d0952ce316d1 drm/mediatek: Fix backport issue in mtk_drm_gem_prime_vmap()
c33d75a57a81 ring-buffer: Fix bytes info in per_cpu buffer stats
0ecde7dd766f ring-buffer: remove obsolete comment for free_buffer_page()
2ad1a1d3d616 NFSv4: Fix a state manager thread deadlock regression
ec4325e80633 NFS: rename nfs_client_kset to nfs_kset
598539f38c72 NFS: Cleanup unused rpc_clnt variable
19f3d5d13b75 spi: zynqmp-gqspi: fix clock imbalance on probe failure
2cdec9c13f81 spi: spi-zynqmp-gqspi: Fix runtime PM imbalance in
zynqmp_qspi_probe
ae03dafc3761 fs: binfmt_elf_efpic: fix personality for ELF-FDPIC
8ec1abb59a98 ata: libata-sata: increase PMP SRST timeout to 10s
[OE-core][kirkstone 0/4] linux-yocto: -stable updates
From: Bruce Ashfield Steve, Much like my last pull request to Richard, this has been generated from a newly provisioned machine after my old machine of 10 years had a disk failure. Let me know if you have any issues with this, and I'll debug what I missed when configuring the new box. Bruce Bruce Ashfield (4): linux-yocto/5.10: update to v5.10.198 linux-yocto/5.10: update to v5.10.200 linux-yocto/5.10: update to v5.10.202 linux-yocto/5.15: update to v5.15.141 .../linux/linux-yocto-rt_5.10.bb | 6 ++--- .../linux/linux-yocto-rt_5.15.bb | 6 ++--- .../linux/linux-yocto-tiny_5.10.bb| 8 +++--- .../linux/linux-yocto-tiny_5.15.bb| 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 - meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +-- 6 files changed, 38 insertions(+), 38 deletions(-) -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191785): https://lists.openembedded.org/g/openembedded-core/message/191785 Mute This Topic: https://lists.openembedded.org/mt/102986489/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/7] linux-yocto-dev: bump to v6.7
From: Bruce Ashfield
Signed-off-by: Bruce Ashfield
---
meta/recipes-kernel/linux/linux-yocto-dev.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb
b/meta/recipes-kernel/linux/linux-yocto-dev.bb
index b59442781c..a85f85e4c3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
@@ -14,7 +14,7 @@ require recipes-kernel/linux/linux-yocto.inc
# provide this .inc to set specific revisions
include recipes-kernel/linux/linux-yocto-dev-revisions.inc
-KBRANCH = "v6.6/standard/base"
+KBRANCH = "v6.7/standard/base"
KMETA = "kernel-meta"
SRC_URI =
"git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine;protocol=https
\
@@ -28,7 +28,7 @@ SRC_URI =
"git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name
SRCREV_machine ?=
'${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel",
"linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e",
d)}'
SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel",
"linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e",
d)}'
-LINUX_VERSION ?= "6.6"
+LINUX_VERSION ?= "6.7"
LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}"
PV = "${LINUX_VERSION}+git"
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191781):
https://lists.openembedded.org/g/openembedded-core/message/191781
Mute This Topic: https://lists.openembedded.org/mt/102986384/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/7] linux-yocto/6.1: update to v6.1.65
From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: c6114c845984 Linux 6.1.65 66ecd1cd8b0c io_uring: fix off-by one bvec index 812171018e47 USB: dwc3: qcom: fix wakeup after probe deferral 72ef87bb8e5d USB: dwc3: qcom: fix software node leak on probe errors fc7b2fe26769 usb: dwc3: set the dma max_seg_size 92b9eca53de8 usb: dwc3: Fix default mode initialization 451c5a61722d USB: dwc2: write HCINT with INTMASK applied d9be7a129778 usb: typec: tcpm: Skip hard reset when in error recovery c15cb712da41 USB: serial: option: don't claim interface 4 for ZTE MF290 5a657b34fe83 USB: serial: option: fix FM101R-GL defines 4fccb016ffcd USB: serial: option: add Fibocom L7xx modules f70b0b6fd8c6 usb: cdnsp: Fix deadlock issue during using NCM gadget f9ba5dd0d9c9 bcache: fixup lock c->root error c736af32a82b bcache: fixup init dirty data errors c37aca3dd513 bcache: prevent potential division by zero error 366f3648f10e bcache: check return value from btree_node_alloc_replacement() 4241b51f3ef8 dm-delay: fix a race between delay_presuspend and delay_bio c4d395751079 hv_netvsc: Mark VF as slave before exposing it to user-mode 5dd83db613be hv_netvsc: Fix race of register_netdevice_notifier and VF register e8ef65c17460 hv_netvsc: fix race of netvsc and VF register_netdevice 043c8e0306e2 USB: serial: option: add Luat Air72*U series products dc96fde8fcb2 s390/dasd: protect device queue against concurrent access b964a0a3910b io_uring/fs: consider link->flags when getting path for LINKAT 12f497158900 bcache: fixup multi-threaded bch_sectors_dirty_init() wake-up race fa9bacc1d5d6 md: fix bi_status reporting in md_end_clone_io 415f644b1f59 bcache: replace a mistaken IS_ERR() by IS_ERR_OR_NULL() in btree_gc_coalesce() 354d162ba527 swiotlb-xen: provide the "max_mapping_size" method 05591c0d1761 ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CVA 1ed904f424d4 arm64: dts: imx8mn-var-som: add 20ms delay to ethernet regulator enable 5d9ddbf4b5e7 NFSD: Fix checksum mismatches in the duplicate reply cache b597f3c85d2e NFSD: Fix "start of NFS reply" pointer passed to nfsd_cache_update() d7eb37615b93 ext4: make sure allocate pending entry not fail 8384d8c5cc39 ext4: fix slab-use-after-free in ext4_es_insert_extent() 9164978bce49 ext4: using nofail preallocation in ext4_es_insert_extent() 614b383d0158 ext4: using nofail preallocation in ext4_es_insert_delayed_block() 51cef2a5c6f9 ext4: using nofail preallocation in ext4_es_remove_extent() f1c236936674 ext4: use pre-allocated es in __es_remove_extent() ce581f8631a4 ext4: use pre-allocated es in __es_insert_extent() 594a5f00e50c ext4: factor out __es_alloc_extent() and __es_free_extent() 9381ff651224 ext4: add a new helper to check if es must be kept 3a14f4fd7bda media: qcom: camss: Fix genpd cleanup df5bb7b408cc media: qcom: camss: Fix V4L2 async notifier error path fdfcdf969719 media: qcom: Initialise V4L2 async notifier later 153a4396c304 media: camss: Convert to platform remove callback returning void 4ae3c85e7369 media: camss: Split power domain management 8bdcaa7c03f6 MIPS: KVM: Fix a build warning about variable set but not used e9c3d6b09c21 cifs: fix leak of iface for primary channel b24d42b52bd1 cifs: account for primary channel in the interface list 548893404c44 cifs: distribute channels across interfaces based on speed 5607a415d49c cifs: print last update time for interface list f4dff371119b smb3: allow dumping session and tcon id to improve stats analysis and debugging fbc666a9ac5a cifs: minor cleanup of some headers c2d336140a10 lockdep: Fix block chain corruption e9611e840431 USB: dwc3: qcom: fix ACPI platform device leak eaa315288b32 USB: dwc3: qcom: fix resource leaks on probe deferral 0e485f12ebb7 nvmet: nul-terminate the NQNs passed in the connect command 573fa2b70808 i40e: Fix adding unsupported cloud filters f7f3e69cedb9 i40e: use ERR_PTR error print in i40e messages 27f5dd22af56 arm64: mm: Fix "rodata=on" when CONFIG_RODATA_FULL_DEFAULT_ENABLED=y 558b8ee45f7f mm,kfence: decouple kfence from page granularity mapping judgement 48b3ee0134db afs: Fix file locking on R/O volumes to operate in local mode f9cf17836ec3 afs: Return ENOENT if no cell DNS record can be found 8025fd0706c8 net: axienet: Fix check for partial TX checksum 3481ff38118c amd-xgbe: propagate the correct speed and duplex status 73d114dd5703 amd-xgbe: handle the corner-case during tx completion 4bcc07bb360e amd-xgbe: handle corner-case during sfp hotplug 76b088b63958 octeontx2-pf: Fix ntuple rule creation to direct packet to VF with higher Rx queue than its PF 97703eb199a3 arm/xen: fix xen_vcpu_info allocation alignment 94a0ae698b4d net/smc: avoid data corruption
[OE-core] [PATCH 6/7] linux-yocto/6.5: update to v6.5.13
From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 4631960b4700 Linux 6.5.13 a9d6c0c5a6bd net/mlx5e: Track xmit submission to PTP WQ after populating metadata map c712654d6f36 net/mlx5e: Avoid referencing skb after free-ing in drop path of mlx5e_sq_xmit_wqe 2c9de867ca28 tracing: Have trace_event_file have ref counters 1f59a2a92855 powerpc/powernv: Fix fortify source warnings in opal-prd.c 7aded92aeb75 drm/amd/display: Change the DMCUB mailbox memory location from FB to inbox 353bc3849241 drm/amd/display: Enable fast plane updates on DCN3.2 and above 5b14cf37b9f0 drm/amd/display: fix a NULL pointer dereference in amdgpu_dm_i2c_xfer() 562176ea823a drm/amd/display: Fix DSC not Enabled on Direct MST Sink 5b37ee61b89d drm/amd/display: Guard against invalid RPTR/WPTR being set f3385c9b8ed4 drm/amdgpu: Fix possible null pointer dereference ed8fc80b1950 drm/amdgpu: lower CS errors to debug severity b827ed7014a0 drm/amdgpu: fix error handling in amdgpu_bo_list_get() 7c6574dd032c drm/amdgpu: fix error handling in amdgpu_vm_init 8c3b198fac82 drm/amdgpu: don't use ATRM for external devices 6f6177558004 drm/amdgpu: add a retry for IP discovery init a5bd0c0d3189 drm/amdgpu: fix GRBM read timeout when do mes_self_test 045d5eec88d2 drm/amdgpu: don't use pci_is_thunderbolt_attached() 02eb46bb2150 drm/amdgpu/smu13: drop compute workload workaround 5392874af8ab drm/amd/pm: Fix error of MACO flag setting code 5d614170fa1f drm/i915: Flush WC GGTT only on required platforms 1e019d6bcb44 drm/i915: Fix potential spectre vulnerability 0990bd1ff1bf drm/i915: Bump GLK CDCLK frequency when driving multiple pipes 9dfc6bc4a6a2 drm/i915/mtl: Support HBR3 rate with C10 phy and eDP in MTL 59d2eee68804 drm: bridge: it66121: ->get_edid callback must not return err pointers f0a11733bd03 drm/amd/pm: Handle non-terminated overdrive commands. e3b83d87c93e ext4: fix racy may inline data check in dio write 8b7e09f9b955 ext4: properly sync file size update after O_SYNC direct IO 13859f9e6493 ext4: add missed brelse in update_backups edfb7b8d36ab ext4: remove gdb backup copy for meta bg in setup_new_flex_group_blocks 079d796c58f2 ext4: correct the start block of counting reserved clusters 8547701c3b0a ext4: correct return value of ext4_convert_meta_bg ec51fb39b173 ext4: mark buffer new if it is unwritten to avoid stale data exposure a9ceb3e26c7c ext4: correct offset of gdb backup in non meta_bg group to update_backups aaa3bd727255 ext4: apply umask if ACL support is disabled d1769a4c92b3 ext4: make sure allocate pending entry not fail a937cf1c90d1 ext4: fix race between writepages and remount cdbfce536cfa Revert "net: r8169: Disable multicast filter for RTL8168H and RTL8107E" e33abcd82f9c media: qcom: camss: Fix csid-gen2 for test pattern generator 51792b41ee52 media: qcom: camss: Fix invalid clock enable bit disjunction 4122d47ad139 media: qcom: camss: Fix set CSI2_RX_CFG1_VC_MODE when VC is greater than 3 c25c6d618eda media: qcom: camss: Fix missing vfe_lite clocks check d8cd7a8645c2 media: qcom: camss: Fix VFE-480 vfe_disable_output() e428d0f3e42f media: qcom: camss: Fix VFE-17x vfe_disable_output() 820b967c0384 media: qcom: camss: Fix vfe_get() error jump 2dbb91675d6b media: qcom: camss: Fix pm_domain_on sequence in probe 967a522b5123 mmc: sdhci-pci-gli: GL9750: Mask the replay timer timeout of AER ddb96a13b277 r8169: add handling DASH when DASH is disabled 89a0fc500471 r8169: fix network lost after resume on DASH systems 533108f04a57 selftests: mptcp: fix fastclose with csum failure c8e74731fff0 mptcp: fix setsockopt(IP_TOS) subflow locking e729027888e9 mptcp: add validity check for sending RM_ADDR 342b528c0e84 mptcp: deal with large GSO size 9a7982259028 mm: kmem: drop __GFP_NOFAIL when allocating objcg vectors 77227943445e mm: fix for negative counter: nr_file_hugepages 641061405579 mmc: sdhci-pci-gli: A workaround to allow GL9750 to enter ASPM L1.2 5fb6a480a0fa riscv: kprobes: allow writing to x0 c93d4b75f58e riscv: correct pt_level name via pgtable_l5/4_enabled 85efe51890ef riscv: mm: Update the comment of CONFIG_PAGE_OFFSET 05b2911ac941 riscv: put interrupt entries into .irqentry.text 8d497507ce26 riscv: Using TOOLCHAIN_HAS_ZIHINTPAUSE marco replace zihintpause 9c3115d8549a LoongArch: Mark __percpu functions as always inline 4ce011ebb640 NFSD: Update nfsd_cache_append() to use xdr_stream 90ceb1e85869 nfsd: fix file memleak on client_opens_release 3cdc6b90ef59 dm-verity: don't use blocking calls from tasklets f6af719e355d dm-bufio: fix no-sleep mode 02d2f24aaeee drm/mediatek/dp: fix memory leak on ->get_edid callback error path d82dbbb169f2 drm/mediatek/dp: fix memory leak on ->get_edid callback audio
[OE-core] [PATCH 5/7] linux-yocto/6.5: update to v6.5.12
From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: fa1be4637aad Linux 6.5.12 39ee8317876f btrfs: make found_logical_ret parameter mandatory for function queue_scrub_stripe() 1c44debc30d2 perf parse-events: Fix driver config term 9a955334c112 bpf, x86: initialize the variable "first_off" in save_args() 3dccc81f9ea9 btrfs: use u64 for buffer sizes in the tree search ioctls 7fbd30155906 Revert "mmc: core: Capture correct oemid-bits for eMMC cards" 2ee1f00866ac Revert "PCI/ASPM: Disable only ASPM_STATE_L1 when driver, disables L1" b592cec2a478 x86/amd_nb: Use Family 19h Models 60h-7Fh Function 4 IDs 9e1c7fe85391 io_uring/net: ensure socket is marked connected on connect retry c0ba439a4333 selftests: mptcp: fix wait_rm_addr/sf parameters 8a0ba7e4b2e8 Revert "drm/ast: report connection status on Display Port." 718dfd5b1646 tracing/kprobes: Fix the order of argument descriptions afc10d0ca630 fbdev: fsl-diu-fb: mark wr_reg_wa() static 6e6676c34078 ALSA: hda/realtek: Add support dual speaker for Dell 18d26f9baca7 fbdev: imsttfb: fix a resource leak in probe 32310dbf0aa9 fbdev: imsttfb: fix double free in probe() 7446c44198a5 arm64/arm: arm_pmuv3: perf: Don't truncate 64-bit registers 68b1ad75906b spi: spi-zynq-qspi: add spi-mem to driver kconfig dependencies 033ade77d851 ASoC: dapm: fix clock get name 18795fc33915 ASoC: hdmi-codec: register hpd callback on component probe a3ef9afd315a ASoC: mediatek: mt8186_mt6366_rt1019_rt5682s: trivial: fix error messages 2f769f4c557b drm/syncobj: fix DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE fe131f6d71c5 drm/vc4: tests: Fix UAF in the mock helpers b2628d195a02 module/decompress: use kvmalloc() consistently 990345880a1c RISC-V: Don't fail in riscv_of_parent_hartid() for disabled HARTs c59f92817719 net/sched: act_ct: Always fill offloading tuple iifidx 61fd0c64e3bf netfilter: nat: fix ipv6 nat redirect with mapped and scoped addresses a95ea2622afb netfilter: xt_recent: fix (increase) ipv6 literal buffer length 52f7f210bd3d i2c: iproc: handle invalid slave state f706e2c9adf2 net: enetc: shorten enetc_setup_xdp_prog() error message to fit NETLINK_MAX_FMTMSG_LEN 93e7f8feacb1 r8169: respect userspace disabling IFF_MULTICAST dbe7967095a5 vsock/virtio: remove socket from connected/bound list on shutdown 0828d76ba2f9 blk-core: use pr_warn_ratelimited() in bio_check_ro() 879947f4180b nbd: fix uaf in nbd_open d5d744277c03 tg3: power down device only on SYSTEM_POWER_OFF 57efa187cda5 riscv: boot: Fix creation of loader.bin 209a13dc04d0 nvme: fix error-handling for io_uring nvme-passthrough bf6571bb260b net/smc: put sk reference if close work was canceled 8d6a49fc39ed net/smc: allow cdc msg send rather than drop it with NULL sndbuf_desc 6904598dd970 net/smc: fix dangling sock under state SMC_APPFINCLOSEWAIT a63ff94ae244 octeontx2-pf: Free pending and dropped SQEs d888fcdaa87d selftests: pmtu.sh: fix result checking 5917a439643b net: stmmac: xgmac: Enable support for multiple Flexible PPS outputs aeb378667a00 Fix termination state for idr_for_each_entry_ul() 28220ff13ac3 net: r8169: Disable multicast filter for RTL8168H and RTL8107E 0577f93e8481 dccp/tcp: Call security_inet_conn_request() after setting IPv6 addresses. 9e5386d494fd dccp: Call security_inet_conn_request() after setting IPv4 addresses. 59f1841a9b14 net: page_pool: add missing free_percpu when page_pool_init fail c84f297964fe octeontx2-pf: Fix holes in error code b3e4e1162368 octeontx2-pf: Fix error codes 688f277d0592 inet: shrink struct flowi_common d5574d0ad4c4 bpf: Check map->usercnt after timer->timer is assigned fe4d6a419062 rxrpc: Fix two connection reaping bugs abc1582119e8 tipc: Change nla_policy for bearer-related names to NLA_NUL_STRING 1787b9f0729d hsr: Prevent use after free in prp_create_tagged_frame() 0a720d0259ad llc: verify mac len before reading mac header f1fd72c06d8e watchdog: ixp4xx: Make sure restart always works cc56c4d17721 Input: synaptics-rmi4 - fix use after free in rmi_unregister_function() 3448b7ba8c56 pwm: brcmstb: Utilize appropriate clock APIs in suspend/resume 98965075e630 pwm: sti: Reduce number of allocations and drop usage of chip_data da97367c938d drm/amdgpu: don't put MQDs in VRAM on ARM | ARM64 5bb28ff319bf drm/amdgpu/gfx10,11: use memcpy_to/fromio for MQDs f6ac81f82692 regmap: prevent noinc writes from clobbering cache f232770077e8 cpupower: fix reference to nonexistent document 531129a7e935 media: cec: meson: always include meson sub-directory in Makefile d4076de583f3 media: platform: mtk-mdp3: fix uninitialized variable in mdp_path_config() af9c02dd5962 media: imx-jpeg: notify source chagne event when the first picture parsed 963ac643508a media:
[OE-core] [PATCH 0/7] linux-yocto: consolidated pull request
From: Bruce Ashfield Richard, Here's my latest -stable updates for 6.1 and 6.5 as well as the bump of the dev kernel to v6.7 I have more pending changes: the 6.6 reference kernel and associated libc-headers updates, as well as the eventual drop of 6.1 from the tree. But this is my first full cycle on my new configured and cobbled together builder after my disk failure. So to keep things simple, I've limited this first pull request to try and see if anything has been missed in my setup. Bruce The following changes since commit f89d9240b1208e9df28afed840376ca91842e5dd: vte: Separate out gtk4 pieces of vte into individual packages (2023-12-04 12:45:27 +) are available in the Git repository at: https://git.yoctoproject.org/poky-contrib zedd/kernel https://git.yoctoproject.org/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (7): linux-yocto/6.5: cfg: split runtime and symbol debug linux-yocto/6.5: update to v6.5.11 linux-yocto/6.1: update to v6.1.62 linux-yocto-dev: bump to v6.7 linux-yocto/6.5: update to v6.5.12 linux-yocto/6.5: update to v6.5.13 linux-yocto/6.1: update to v6.1.65 meta/recipes-kernel/linux/linux-yocto-dev.bb | 4 +-- .../linux/linux-yocto-rt_6.1.bb | 6 ++-- .../linux/linux-yocto-rt_6.5.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 6 ++-- .../linux/linux-yocto-tiny_6.5.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +-- meta/recipes-kernel/linux/linux-yocto_6.5.bb | 28 +-- 7 files changed, 42 insertions(+), 42 deletions(-) -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191777): https://lists.openembedded.org/g/openembedded-core/message/191777 Mute This Topic: https://lists.openembedded.org/mt/102986376/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/7] linux-yocto/6.5: update to v6.5.11
From: Bruce Ashfield
Updating to the latest korg -stable release that comprises
the following commits:
799441832db1 Linux 6.5.11
dd1756d79179 ASoC: SOF: sof-pci-dev: Fix community key quirk detection
aab16960e6e7 ALSA: hda: intel-dsp-config: Fix JSL Chromebook quirk detection
575d3966a7da serial: core: Fix runtime PM handling for pending tx
9f625a9ec6ad misc: pci_endpoint_test: Add deviceID for J721S2 PCIe EP
device support
fe3545fb7c39 dt-bindings: serial: rs485: Add rs485-rts-active-high
71a913eb5331 tty: 8250: Add Brainboxes Oxford Semiconductor-based quirks
7ffbf5db6963 tty: 8250: Add support for Intashield IX cards
8435b1f55760 tty: 8250: Add support for additional Brainboxes PX cards
21b8147a36f8 tty: 8250: Fix up PX-803/PX-857
98f984ff81de tty: 8250: Fix port count of PX-257
256a534427e9 tty: 8250: Add support for Intashield IS-100
933dde5b2082 tty: 8250: Add support for Brainboxes UP cards
a4a09f0ed3cd tty: 8250: Add support for additional Brainboxes UC cards
ca7f138b2c52 tty: 8250: Remove UC-257 and UC-431
19d34b73234a tty: n_gsm: fix race condition in status line change on dead
connections
fd277724946d Bluetooth: hci_bcm4377: Mark bcm4378/bcm4387 as BROKEN_LE_CODED
885108988763 usb: raw-gadget: properly handle interrupted requests
9ee038590d80 usb: typec: tcpm: Fix NULL pointer dereference in
tcpm_pd_svdm()
de5ac4d46304 usb: typec: tcpm: Add additional checks for contaminant
80105fc04b44 usb: storage: set 1.50 as the lower bcdDevice for older "Super
Top" compatibility
c99f302ea679 PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD
device
52d89332fbc6 ALSA: usb-audio: add quirk flag to enable native DSD for
McIntosh devices
c75a5e421b07 mmap: fix error paths with dup_anon_vma()
578c20ab383f mmap: fix vma_iterator in error path of vma_merge()
cd91606eff46 perf evlist: Avoid frequency mode for the dummy event
65d457433a08 power: supply: core: Use blocking_notifier_call_chain to avoid
RCU complaint
a58f5fabcab0 rust: types: make `Opaque` be `!Unpin`
7fba72536eb5 rust: make `UnsafeCell` the outer type in `Opaque`
07256dc046b1 drm/amd/display: Don't use fsleep for PSR exit waits
4ec5def87694 ceph_wait_on_conflict_unlink(): grab reference before dropping
->d_lock
fd652af1e1f9 io_uring: kiocb_done() should *not* trust ->ki_pos if
->{read,write}_iter() failed
fd318cc5b221 powerpc/mm: Fix boot crash with FLATMEM
c1d14ab7d666 r8152: Check for unplug in r8153b_ups_en() / r8153c_ups_en()
b233d39f7e15 r8152: Check for unplug in rtl_phy_patch_request()
19471af243b2 net: chelsio: cxgb4: add an error code check in t4_load_phy_fw
17002b8f2606 riscv: dts: thead: set dma-noncoherent to soc bus
9f0400d31e56 drm/amdgpu: Reserve fences for VM update
6ca3c25f5472 platform/mellanox: mlxbf-tmfifo: Fix a warning message
6cca6f997088 netfilter: nf_tables: audit log object reset once per table
99d311781fe5 LoongArch: Disable WUC for pgprot_writecombine() like
ioremap_wc()
6b43fea5f245 LoongArch: Replace kmap_atomic() with kmap_local_page() in
copy_user_highpage()
c86a4fbc2d5a LoongArch: Export symbol invalid_pud_table for modules building
74f9c03ecf79 LoongArch: Use SYM_CODE_* to annotate exception handlers
19fe554e5fcf gpu/drm: Eliminate DRM_SCHED_PRIORITY_UNSET
4ca54e8b459d drm/amdgpu: Unset context priority is now invalid
4debab37b1bc ASoC: da7219: Correct the process of setting up Gnd switch in
AAD
22da32b45717 scsi: mpt3sas: Fix in error path
8377f82beacf fbdev: uvesafb: Call cn_del_callback() at the end of
uvesafb_exit()
0a997e68 fbdev: omapfb: fix some error codes
93ff3297b04a drm/ttm: Reorder sys manager cleanup step
0074d0980bf8 s390/kasan: handle DCSS mapping in memory holes
652d60ecb7a5 ASoC: codecs: tas2780: Fix log of failed reset via I2C.
4dd62532e05c ASoC: rt5650: fix the wrong result of key button
ce5329ee79e5 efi: fix memory leak in krealloc failure handling
c76be4af694e x86/efistub: Don't try to print after ExitBootService()
5c4e4f31643d net/mlx5: Bridge, fix peer entry ageing in LAG mode
ead8d9a6b6ff netfilter: nfnetlink_log: silence bogus compiler warning
988ed1c96c42 ASoC: soc-dapm: Add helper for comparing widget name
c68a8c5b50b9 spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0
6777f23bca89 fs/ntfs3: Avoid possible memory leak
b9ec0e799a2d fs/ntfs3: Fix directory element type detection
0030ccd87a87 fs/ntfs3: Fix NULL pointer dereference on error in
attr_allocate_frame()
3228a2e0e5a7 fs/ntfs3: Fix possible NULL-ptr-deref in ni_readpage_cmpr()
d408008a881a fs/ntfs3: Do not allow to change label if volume is read-only
da05aa786c20 fs/ntfs3: Add more info into /proc/fs/ntfs3//volinfo
31baaf864b39 fs/ntfs3: Fix alternative boot searching
1d7dd485108d fs/ntfs3: Add more attributes checks in mi_enum_attr()
[OE-core] [PATCH 3/7] linux-yocto/6.1: update to v6.1.62
From: Bruce Ashfield
Updating to the latest korg -stable release that comprises
the following commits:
fb2635ac69ab Linux 6.1.62
585da49ad62c ASoC: SOF: sof-pci-dev: Fix community key quirk detection
c1c15b09f456 ALSA: hda: intel-dsp-config: Fix JSL Chromebook quirk detection
5c59879031ea misc: pci_endpoint_test: Add deviceID for J721S2 PCIe EP
device support
6bebd303ad7e tty: 8250: Add Brainboxes Oxford Semiconductor-based quirks
3017a17ad6b9 tty: 8250: Add support for Intashield IX cards
c3444894e855 tty: 8250: Add support for additional Brainboxes PX cards
31ebf431ed02 tty: 8250: Fix up PX-803/PX-857
bfe9bde05fcd tty: 8250: Fix port count of PX-257
b75ee2d9d792 tty: 8250: Add support for Intashield IS-100
cdd260b220d9 tty: 8250: Add support for Brainboxes UP cards
8af676c69815 tty: 8250: Add support for additional Brainboxes UC cards
abcb12f3192d tty: 8250: Remove UC-257 and UC-431
df6cfab66ff2 tty: n_gsm: fix race condition in status line change on dead
connections
23107989be8e usb: raw-gadget: properly handle interrupted requests
e7a802447c49 usb: typec: tcpm: Fix NULL pointer dereference in
tcpm_pd_svdm()
6f17be270003 usb: storage: set 1.50 as the lower bcdDevice for older "Super
Top" compatibility
b25a2f247083 PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD
device
977ae4dbe231 ALSA: usb-audio: add quirk flag to enable native DSD for
McIntosh devices
9411dbe2c66c mmap: fix error paths with dup_anon_vma()
21ca008c53a5 mm/mempolicy: fix set_mempolicy_home_node() previous VMA
pointer
7ab62e3415fb x86: KVM: SVM: always update the x2avic msr interception
e83359126567 perf evlist: Avoid frequency mode for the dummy event
b3eed048 power: supply: core: Use blocking_notifier_call_chain to avoid
RCU complaint
803cc77a3acc ceph_wait_on_conflict_unlink(): grab reference before dropping
->d_lock
9eab5008db6c io_uring: kiocb_done() should *not* trust ->ki_pos if
->{read,write}_iter() failed
ed0ba37e7b9b powerpc/mm: Fix boot crash with FLATMEM
31ae7876da36 r8152: Check for unplug in r8153b_ups_en() / r8153c_ups_en()
f90656fbf618 r8152: Check for unplug in rtl_phy_patch_request()
98567c9d849b net: chelsio: cxgb4: add an error code check in t4_load_phy_fw
ff86d69b2e50 drm/amdgpu: Reserve fences for VM update
8e4a77ba25ec platform/mellanox: mlxbf-tmfifo: Fix a warning message
0f2840dabfea netfilter: nf_tables: audit log object reset once per table
ec80ad4585d7 LoongArch: Replace kmap_atomic() with kmap_local_page() in
copy_user_highpage()
afe80b58eea3 LoongArch: Export symbol invalid_pud_table for modules building
9f9b2ec53aca gpu/drm: Eliminate DRM_SCHED_PRIORITY_UNSET
cafa191b27dd drm/amdgpu: Unset context priority is now invalid
0eb733b53ebf scsi: mpt3sas: Fix in error path
4e000daf394a fbdev: uvesafb: Call cn_del_callback() at the end of
uvesafb_exit()
50736464a75a fbdev: omapfb: fix some error codes
6a87b333ba47 drm/ttm: Reorder sys manager cleanup step
9951b2309ea7 ASoC: codecs: tas2780: Fix log of failed reset via I2C.
b7ed4aa0c2e6 ASoC: rt5650: fix the wrong result of key button
8e1a6594d782 efi: fix memory leak in krealloc failure handling
678edd2dfd55 netfilter: nfnetlink_log: silence bogus compiler warning
c6f6a505277f spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0
6a7a2d5a0864 fs/ntfs3: Avoid possible memory leak
84aabd18c8d7 fs/ntfs3: Fix directory element type detection
3bff4bb7f9c7 fs/ntfs3: Fix NULL pointer dereference on error in
attr_allocate_frame()
c8cbae3cbbc4 fs/ntfs3: Fix possible NULL-ptr-deref in ni_readpage_cmpr()
6fe32f79abea fs/ntfs3: Use kvmalloc instead of kmalloc(... __GFP_NOWARN)
92f9c7c7ddbf fs/ntfs3: Write immediately updated ntfs state
fc91bb3e1b2b fs/ntfs3: Add ckeck in ni_update_parent()
768e857ac3e0 fbdev: atyfb: only use ioremap_uc() on i386 and ia64
dd6d75eb00ee Input: synaptics-rmi4 - handle reset delay when using SMBus
trsnsport
c64c237275b4 powerpc/85xx: Fix math emulation exception
96c7aac8d804 dmaengine: ste_dma40: Fix PM disable depth imbalance in
d40_probe
9ef4697548c2 irqchip/stm32-exti: add missing DT IRQ flag translation
7378415da048 irqchip/riscv-intc: Mark all INTC nodes as initialized
d3204c0fdd33 net: sched: cls_u32: Fix allocation size in u32_init()
f15dbcda2ce8 ASoC: tlv320adc3xxx: BUG: Correct micbias setting
30ed99860437 coresight: tmc-etr: Disable warnings for allocation failures
6618e7a740de ASoC: simple-card: fixup asoc_simple_probe() error handling
Signed-off-by: Bruce Ashfield
---
.../linux/linux-yocto-rt_6.1.bb | 6 ++--
.../linux/linux-yocto-tiny_6.1.bb | 6 ++--
meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +--
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git
[OE-core] [PATCH 1/7] linux-yocto/6.5: cfg: split runtime and symbol debug
From: Bruce Ashfield
Integrating the following commit(s) to linux-yocto/.:
1/1 [
Author: Bruce Ashfield
Email: bruce.ashfi...@gmail.com
Subject: debug: move PREEMPT_DEBUG to a runtime debug fragment
Date: Thu, 9 Nov 2023 12:08:31 -0500
For tools like spdx and debuggers to work with the kernel, we
require extra information. That is provided by the DEBUG_INFO
flags.
In that same fragment, some runtime debugging is being enabled
and that adds signficant overhead to the kernel.
Let's start a new runtime debug fragment with DEBUG_PREEMPT
and locking. We can add more to this in the future.
Signed-off-by: Bruce Ashfield
]
Signed-off-by: Bruce Ashfield
---
meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_6.5.bb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb
b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb
index f004339749..abe788f03d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb
@@ -15,7 +15,7 @@ python () {
}
SRCREV_machine ?= "833c5da68398da64271c26188b9e15286e8e725c"
-SRCREV_meta ?= "e4ddfaf695039a7fc41815e24f57c29e30c0"
+SRCREV_meta ?= "699ca25eafb4b8244966a27e3bbef3d5891fb7e8"
SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https
\
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.5;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb
index cc75c0c702..ca1c17a84e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb
@@ -18,7 +18,7 @@ KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine ?= "16b52743d64980d531e120aec62c9220b695a269"
-SRCREV_meta ?= "e4ddfaf695039a7fc41815e24f57c29e30c0"
+SRCREV_meta ?= "699ca25eafb4b8244966a27e3bbef3d5891fb7e8"
PV = "${LINUX_VERSION}+git"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.5.bb
b/meta/recipes-kernel/linux/linux-yocto_6.5.bb
index 5cdf0e02d0..43ab8c2776 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.5.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.5.bb
@@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?=
"128116621dee1ddbc7cf5f58cddc708d7b823600"
SRCREV_machine:qemux86-64 ?= "128116621dee1ddbc7cf5f58cddc708d7b823600"
SRCREV_machine:qemumips64 ?= "b63329018323409369e952c84ac6481e68a9b6af"
SRCREV_machine ?= "128116621dee1ddbc7cf5f58cddc708d7b823600"
-SRCREV_meta ?= "e4ddfaf695039a7fc41815e24f57c29e30c0"
+SRCREV_meta ?= "699ca25eafb4b8244966a27e3bbef3d5891fb7e8"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and
you'll
# get the /base branch, which is pure upstream -stable, and the same
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191778):
https://lists.openembedded.org/g/openembedded-core/message/191778
Mute This Topic: https://lists.openembedded.org/mt/102986377/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] openssh: Add SSHD_SERVICE_TYPE variable
Hi Richard, On 12/4/23 19:07, Richard Purdie 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 Mon, 2023-12-04 at 16:54 +0800, Yu, Mingli wrote: From: Mingli Yu There are two types of sshd server now, one is based on socket activation(sshd.socket) and another is service activation(sshd.service). And the default sshd service type is based on socket by default as below. Firstly, I'm a little frustrated about how these changes are being proposed in pieces. The original patches made no mention that this was eventually going to be controlled by a new variable. I did wonder if something like this was going to happen but the didn't push back. Now we're "pinned" into a corner with the direction this code takes now we've already merged the on target configuration change. But it's more convenient to determine the service type at build time if there are so many devices. Why did we merge a patch which made this an on target decision then? Maybe usage requirement change? sorry for noise！ So add SSHD_SERVICE_TYPE variable to enable sshd.socket or sshd.service at build time and we still enable sshd.socket by default now. No, we're not adding randomly named variables which take magic options. I cannot look at SSHD_SERVICE_TYPE and know that "1" means socket activation and not setting it means service activation (or whatever, the fact I can't check what I've written easily proves my point). What happens if I set it to "true", or "socket", or "apples"? I'd suggest thinking about a PACKAGECONFIG option such as systemd-sshd- socket-mode and systemd-sshd-service-mode which at least uses naming users are mode used to and says what it does. Will sent v2 to use the common PACKAGECONFIG option to control the sshd type. Thanks, Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191776): https://lists.openembedded.org/g/openembedded-core/message/191776 Mute This Topic: https://lists.openembedded.org/mt/102967209/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Patchtest results for [dunfell][PATCH 1/2] 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-1-2-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 (#191775): https://lists.openembedded.org/g/openembedded-core/message/191775 Mute This Topic: https://lists.openembedded.org/mt/102985315/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][PATCH 2/2] 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 --- 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.37.3 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191774): https://lists.openembedded.org/g/openembedded-core/message/191774 Mute This Topic: https://lists.openembedded.org/mt/102985180/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][PATCH 1/2] epiphany: fix CVE-2022-29536
From: Lee Chee Yang
Signed-off-by: Lee Chee Yang
---
.../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.37.3
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191773):
https://lists.openembedded.org/g/openembedded-core/message/191773
Mute This Topic: https://lists.openembedded.org/mt/102985179/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] python3-pygments: upgrade 2.16.1 -> 2.17.2
* Drop redundant DEPENDS
* PEP-517 backend is now hatchling -> inherit python_hatchling
* Drop PYPI_PACKAGE as upstream download filename is now "pygments"
* Add UPSTREAM_CHECK_PYPI_PACKAGE since upstream path is still "/Pygments/"
https://github.com/pygments/pygments/blob/2.17.2/CHANGES
Signed-off-by: Tim Orling
---
Tested basic "python3; import pygments" on core-image-full-cmdline for
qemux86-64
Tested 'devtool latest-version python3-pygments'
...-pygments_2.16.1.bb => python3-pygments_2.17.2.bb} | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
rename meta/recipes-devtools/python/{python3-pygments_2.16.1.bb =>
python3-pygments_2.17.2.bb} (61%)
diff --git a/meta/recipes-devtools/python/python3-pygments_2.16.1.bb
b/meta/recipes-devtools/python/python3-pygments_2.17.2.bb
similarity index 61%
rename from meta/recipes-devtools/python/python3-pygments_2.16.1.bb
rename to meta/recipes-devtools/python/python3-pygments_2.17.2.bb
index 240d01d0dfa..8b98064b784 100644
--- a/meta/recipes-devtools/python/python3-pygments_2.16.1.bb
+++ b/meta/recipes-devtools/python/python3-pygments_2.17.2.bb
@@ -4,15 +4,10 @@ HOMEPAGE = "http://pygments.org/;
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592"
-inherit python_setuptools_build_meta
-SRC_URI[sha256sum] =
"1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29"
-
-DEPENDS += "\
-${PYTHON_PN} \
-"
-
-PYPI_PACKAGE = "Pygments"
+inherit python_hatchling
+SRC_URI[sha256sum] =
"da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"
+UPSTREAM_CHECK_PYPI_PACKAGE = "Pygments"
inherit pypi
BBCLASSEXTEND = "native nativesdk"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191772):
https://lists.openembedded.org/g/openembedded-core/message/191772
Mute This Topic: https://lists.openembedded.org/mt/102984413/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] libxcrypt.inc: use alternatives to resolve crypt.3 conflict
From: Changqing Li
To fix:
Error: Transaction test error:
file /usr/share/man/man3/crypt.3 from install of
libcrypt-doc-4.4.33-r0.x86_64 conflicts with file from package
man-pages-6.04-r0.x86_64
Signed-off-by: Changqing Li
---
meta/recipes-core/libxcrypt/libxcrypt.inc | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc
b/meta/recipes-core/libxcrypt/libxcrypt.inc
index ba93d91aef..fe90ef4762 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt.inc
+++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
"file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \
file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
"
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-alternatives
SRC_URI =
"git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https"
SRCREV = "f531a36aa916a22ef2ce7d270ba381e264250cbf"
@@ -26,4 +26,9 @@ CPPFLAGS:append:class-nativesdk = " -Wno-error"
API = "--disable-obsolete-api"
EXTRA_OECONF += "${API}"
+ALTERNATIVE_PRIORITY = "90"
+ALTERNATIVE:${PN}-doc = "crypt.3 crypt_r.3"
+ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3"
+ALTERNATIVE_LINK_NAME[crypt_r.2] = "${mandir}/man3/crypt_r.3"
+
BBCLASSEXTEND = "native nativesdk"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191771):
https://lists.openembedded.org/g/openembedded-core/message/191771
Mute This Topic: https://lists.openembedded.org/mt/102984309/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] python3-bcrypt: upgrade 4.0.1 -> 4.1.1
* Refresh -crates.inc
https://github.com/pyca/bcrypt/blob/4.1.1/README.rst#changelog
4.1.1
* Fixed the type signature on the kdf method.
4.1.0
* Dropped support for Python 3.6.
* Bumped MSRV to 1.64. (Note: Rust 1.63 can be used by setting
the BCRYPT_ALLOW_RUST_163 environment variable)
Signed-off-by: Tim Orling
---
Tested with core-image-ptest-python3-bcrypt on qemux86-64 (all tests pass)
.../python/python3-bcrypt-crates.inc | 172 +-
...crypt_4.0.1.bb => python3-bcrypt_4.1.1.bb} | 2 +-
2 files changed, 91 insertions(+), 83 deletions(-)
rename meta/recipes-devtools/python/{python3-bcrypt_4.0.1.bb =>
python3-bcrypt_4.1.1.bb} (90%)
diff --git a/meta/recipes-devtools/python/python3-bcrypt-crates.inc
b/meta/recipes-devtools/python/python3-bcrypt-crates.inc
index 16d9e55cc57..b99d753a877 100644
--- a/meta/recipes-devtools/python/python3-bcrypt-crates.inc
+++ b/meta/recipes-devtools/python/python3-bcrypt-crates.inc
@@ -3,102 +3,110 @@
# from src/_bcrypt/Cargo.lock
SRC_URI += " \
crate://crates.io/autocfg/1.1.0 \
-crate://crates.io/base64/0.13.0 \
-crate://crates.io/bcrypt/0.13.0 \
-crate://crates.io/bcrypt-pbkdf/0.8.1 \
+crate://crates.io/base64/0.21.5 \
+crate://crates.io/bcrypt/0.15.0 \
+crate://crates.io/bcrypt-pbkdf/0.10.0 \
crate://crates.io/bitflags/1.3.2 \
-crate://crates.io/block-buffer/0.10.3 \
+crate://crates.io/block-buffer/0.10.4 \
crate://crates.io/blowfish/0.9.1 \
-crate://crates.io/byteorder/1.4.3 \
+crate://crates.io/byteorder/1.5.0 \
crate://crates.io/cfg-if/1.0.0 \
-crate://crates.io/cipher/0.4.3 \
-crate://crates.io/cpufeatures/0.2.5 \
+crate://crates.io/cipher/0.4.4 \
+crate://crates.io/cpufeatures/0.2.11 \
crate://crates.io/crypto-common/0.1.6 \
-crate://crates.io/digest/0.10.5 \
-crate://crates.io/generic-array/0.14.6 \
-crate://crates.io/getrandom/0.2.7 \
-crate://crates.io/indoc/0.3.6 \
-crate://crates.io/indoc-impl/0.3.6 \
+crate://crates.io/digest/0.10.7 \
+crate://crates.io/generic-array/0.14.7 \
+crate://crates.io/getrandom/0.2.11 \
+crate://crates.io/heck/0.4.1 \
+crate://crates.io/indoc/2.0.4 \
crate://crates.io/inout/0.1.3 \
-crate://crates.io/instant/0.1.12 \
-crate://crates.io/libc/0.2.134 \
-crate://crates.io/lock_api/0.4.9 \
-crate://crates.io/once_cell/1.15.0 \
-crate://crates.io/parking_lot/0.11.2 \
-crate://crates.io/parking_lot_core/0.8.5 \
-crate://crates.io/paste/0.1.18 \
-crate://crates.io/paste-impl/0.1.18 \
-crate://crates.io/pbkdf2/0.10.1 \
-crate://crates.io/proc-macro-hack/0.5.19 \
-crate://crates.io/proc-macro2/1.0.46 \
-crate://crates.io/pyo3/0.15.2 \
-crate://crates.io/pyo3-build-config/0.15.2 \
-crate://crates.io/pyo3-macros/0.15.2 \
-crate://crates.io/pyo3-macros-backend/0.15.2 \
-crate://crates.io/quote/1.0.21 \
-crate://crates.io/redox_syscall/0.2.16 \
-crate://crates.io/scopeguard/1.1.0 \
-crate://crates.io/sha2/0.10.6 \
-crate://crates.io/smallvec/1.10.0 \
-crate://crates.io/subtle/2.4.1 \
-crate://crates.io/syn/1.0.102 \
-crate://crates.io/typenum/1.15.0 \
-crate://crates.io/unicode-ident/1.0.4 \
-crate://crates.io/unindent/0.1.10 \
+crate://crates.io/libc/0.2.150 \
+crate://crates.io/lock_api/0.4.11 \
+crate://crates.io/memoffset/0.9.0 \
+crate://crates.io/once_cell/1.18.0 \
+crate://crates.io/parking_lot/0.12.1 \
+crate://crates.io/parking_lot_core/0.9.9 \
+crate://crates.io/pbkdf2/0.12.2 \
+crate://crates.io/proc-macro2/1.0.70 \
+crate://crates.io/pyo3/0.20.0 \
+crate://crates.io/pyo3-build-config/0.20.0 \
+crate://crates.io/pyo3-ffi/0.20.0 \
+crate://crates.io/pyo3-macros/0.20.0 \
+crate://crates.io/pyo3-macros-backend/0.20.0 \
+crate://crates.io/quote/1.0.33 \
+crate://crates.io/redox_syscall/0.4.1 \
+crate://crates.io/scopeguard/1.2.0 \
+crate://crates.io/sha2/0.10.8 \
+crate://crates.io/smallvec/1.11.2 \
+crate://crates.io/subtle/2.5.0 \
+crate://crates.io/syn/2.0.39 \
+crate://crates.io/target-lexicon/0.12.12 \
+crate://crates.io/typenum/1.17.0 \
+crate://crates.io/unicode-ident/1.0.12 \
+crate://crates.io/unindent/0.2.3 \
crate://crates.io/version_check/0.9.4 \
crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
-crate://crates.io/winapi/0.3.9 \
-crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
-crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
-crate://crates.io/zeroize/1.5.7 \
+crate://crates.io/windows-targets/0.48.5 \
+crate://crates.io/windows_aarch64_gnullvm/0.48.5 \
+crate://crates.io/windows_aarch64_msvc/0.48.5 \
+crate://crates.io/windows_i686_gnu/0.48.5 \
+crate://crates.io/windows_i686_msvc/0.48.5 \
+crate://crates.io/windows_x86_64_gnu/0.48.5 \
+crate://crates.io/windows_x86_64_gnullvm/0.48.5 \
+
Re: [PATCH] [OE-core] [PATCHv2] elfutils: upgrade 0.189 -> 0.190
Hello,
This fails with musl:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/8232/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/8262/steps/12/logs/stdio
New ptest failure:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/5988/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/5808/steps/12/logs/stdio
On 03/12/2023 18:35:51-0800, Zang Ruochen wrote:
> From: Zang Ruochen
>
> The following patches have been fixed:
> 0001-libasm-may-link-with-libbz2-if-found.patch
>
> Refresh the following patch:
> 0001-dso-link-change.patch
>
> Signed-off-by: Zang Ruochen
> ---
> .../{elfutils_0.189.bb => elfutils_0.190.bb} | 3 +-
> .../elfutils/files/0001-dso-link-change.patch | 14
> ...libasm-may-link-with-libbz2-if-found.patch | 36 ---
> 3 files changed, 9 insertions(+), 44 deletions(-)
> rename meta/recipes-devtools/elfutils/{elfutils_0.189.bb =>
> elfutils_0.190.bb} (98%)
> delete mode 100644
> meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
>
> diff --git a/meta/recipes-devtools/elfutils/elfutils_0.189.bb
> b/meta/recipes-devtools/elfutils/elfutils_0.190.bb
> similarity index 98%
> rename from meta/recipes-devtools/elfutils/elfutils_0.189.bb
> rename to meta/recipes-devtools/elfutils/elfutils_0.190.bb
> index d8bf82b022..8657080830 100644
> --- a/meta/recipes-devtools/elfutils/elfutils_0.189.bb
> +++ b/meta/recipes-devtools/elfutils/elfutils_0.190.bb
> @@ -16,7 +16,6 @@ SRC_URI =
> "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
> file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \
> file://0003-fixheadercheck.patch \
> file://0006-Fix-build-on-aarch64-musl.patch \
> - file://0001-libasm-may-link-with-libbz2-if-found.patch \
>
> file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \
> file://0001-skip-the-test-when-gcc-not-deployed.patch \
> file://ptest.patch \
> @@ -25,7 +24,7 @@ SRC_URI =
> "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
> SRC_URI:append:libc-musl = " \
> file://0003-musl-utils.patch \
> "
> -SRC_URI[sha256sum] =
> "39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8"
> +SRC_URI[sha256sum] =
> "8e00a3a9b5f04bc1dc273ae86281d2d26ed412020b391ffcc23198f10231d692"
>
> inherit autotools gettext ptest pkgconfig
>
> diff --git a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
> b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
> index 6acc036406..8ccfcb7bd5 100644
> --- a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
> +++ b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
> @@ -16,18 +16,18 @@ more details.
> Rebase to 0.170
>
> Signed-off-by: Hongxu Jia
> -
> +Signed-off-by: Zang Ruochen
> ---
> src/Makefile.am | 2 +-
> tests/Makefile.am | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> -index 88d0ac8..c28d81f 100644
> +index d3d9d40..ea61616 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -45,7 +45,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl
> -lpthread
> - libelf = ../libelf/libelf.a -lz
> + libelf = ../libelf/libelf.a -lz $(zstd_LIBS)
> else
> libasm = ../libasm/libasm.so
> -libdw = ../libdw/libdw.so
> @@ -36,11 +36,11 @@ index 88d0ac8..c28d81f 100644
> endif
> libebl = ../libebl/libebl.a ../backends/libebl_backends.a ../libcpu/libcpu.a
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> -index c145720..72afd0e 100644
> +index 7fb8efb..71c1a61 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> -@@ -554,7 +554,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf)
> $(libebl) -ldl -lpthread
> - libelf = ../libelf/libelf.a -lz
> +@@ -680,7 +680,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf)
> $(libebl) -ldl -lpthread
> + libelf = ../libelf/libelf.a -lz $(zstd_LIBS)
> libasm = ../libasm/libasm.a
> else
> -libdw = ../libdw/libdw.so
> @@ -48,3 +48,5 @@ index c145720..72afd0e 100644
> libelf = ../libelf/libelf.so
> libasm = ../libasm/libasm.so
> endif
> +--
> +2.25.1
> diff --git
> a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
>
> b/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
> deleted file mode 100644
> index 09c9d3ea24..00
> ---
> a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -From ed1975deeaa47f98d212fd144c8bda075b1a5d36 Mon Sep 17 00:00:00 2001
> -From: Khem Raj
> -Date: Wed, 4 Oct 2017 22:30:46 -0700
> -Subject: [PATCH] libasm may link with libbz2 if found
> -
> -This can fail to link binaries like objdump
> -where indirect libraries may be
[mickledore][oe-core][PATCH 1/1] gnutls: update to version 3.8.2
From: Joe Slater
De-fuzz existing patches.
Do not update PACKAGECONFIG to match master.
Signed-off-by: Joe Slater
---
...ile-should-be-excuted-in-target-envi.patch | 2 --
.../gnutls/gnutls/Add-ptest-support.patch | 10 ++-
.../gnutls/gnutls/arm_eabi.patch | 6 ++--
.../{gnutls_3.8.0.bb => gnutls_3.8.2.bb} | 30 +++
4 files changed, 22 insertions(+), 26 deletions(-)
rename meta/recipes-support/gnutls/{gnutls_3.8.0.bb => gnutls_3.8.2.bb} (79%)
diff --git
a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch
b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch
index 4bdc40d932..da89d7faa1 100644
---
a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch
+++
b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch
@@ -11,8 +11,6 @@ Signed-off-by: Lei Maohui
lib/Makefile.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 6d4e8d2..24ef108 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -206,8 +206,7 @@ hmac_file = .libs/.$(gnutls_so).hmac
diff --git a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch
b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch
index f87cf536fa..b9b75888ff 100644
--- a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch
+++ b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch
@@ -12,8 +12,6 @@ Signed-off-by: Ravineet Singh
tests/Makefile.am | 6 ++
3 files changed, 11 insertions(+)
-diff --git a/Makefile.am b/Makefile.am
-index 843193f..816b09f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -191,6 +191,9 @@ dist-hook:
@@ -26,11 +24,9 @@ index 843193f..816b09f 100644
.PHONY: abi-check abi-dump-versioned abi-dump-latest pic-check symbol-check
local-code-coverage-output files-update AUTHORS
include $(top_srcdir)/cligen/cligen.mk
-diff --git a/configure.ac b/configure.ac
-index b25ba14..860ddef 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1150,6 +1150,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS)
+@@ -1194,6 +1194,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS)
AM_CONDITIONAL(NEEDS_LIBRT, test "$gnutls_needs_librt" = "yes")
@@ -39,11 +35,9 @@ index b25ba14..860ddef 100644
AC_DEFINE([GNUTLS_INTERNAL_BUILD], 1, [We allow temporarily usage of
deprecated functions - until they are removed.])
hw_features=
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index d530ad0..71c592f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
-@@ -648,6 +648,12 @@ SH_LOG_COMPILER = $(SHELL)
+@@ -657,6 +657,12 @@ SH_LOG_COMPILER = $(SHELL)
AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind
LOG_COMPILER = $(LOG_VALGRIND)
diff --git a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
index 2b61a703cb..2de9258a8a 100644
--- a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
+++ b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
@@ -14,11 +14,9 @@ Signed-off-by: Joe Slater
tests/seccomp.c | 2 ++
1 file changed, 2 insertions(+)
-diff --git a/tests/seccomp.c b/tests/seccomp.c
-index a3148fe..443bc5f 100644
--- a/tests/seccomp.c
+++ b/tests/seccomp.c
-@@ -52,7 +52,9 @@ int disable_system_calls(void)
+@@ -55,7 +55,9 @@ int disable_system_calls(void)
ADD_SYSCALL(nanosleep, 0);
ADD_SYSCALL(clock_nanosleep, 0);
@@ -27,4 +25,4 @@ index a3148fe..443bc5f 100644
+#endif
ADD_SYSCALL(getpid, 0);
ADD_SYSCALL(gettimeofday, 0);
- # if defined(HAVE_CLOCK_GETTIME)
+ #if defined(HAVE_CLOCK_GETTIME)
diff --git a/meta/recipes-support/gnutls/gnutls_3.8.0.bb
b/meta/recipes-support/gnutls/gnutls_3.8.2.bb
similarity index 79%
rename from meta/recipes-support/gnutls/gnutls_3.8.0.bb
rename to meta/recipes-support/gnutls/gnutls_3.8.2.bb
index 7ddd2420bd..dc975317c8 100644
--- a/meta/recipes-support/gnutls/gnutls_3.8.0.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.8.2.bb
@@ -15,7 +15,6 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \
file://doc/COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
DEPENDS = "nettle gmp virtual/libiconv libunistring"
-DEPENDS:append:libc-musl = " argp-standalone"
SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
@@ -26,24 +25,31 @@ SRC_URI =
"https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
file://Add-ptest-support.patch \
"
-SRC_URI[sha256sum] =
"0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5"
+SRC_URI[sha256sum] =
"e765e5016ffa9b9dd243e363a0460d57707ee2491267db2e96c9c2adef77"
inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest
-PACKAGECONFIG ??= "libidn ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp',
d)}"
+# do not use the updated default
[OE-core] [PATCH 3/3] meta-yocto-bsp/oeqa/parselogs: add BSP-specific ignores
From: Ross Burton Add machine-specific ignores from oe-core to meta-yocto-bsp. Signed-off-by: Ross Burton --- .../runtime/cases/parselogs-ignores-beaglebone-yocto.txt | 4 .../oeqa/runtime/cases/parselogs-ignores-genericx86-64.txt | 7 +++ 2 files changed, 11 insertions(+) create mode 100644 meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-beaglebone-yocto.txt create mode 100644 meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-genericx86-64.txt diff --git a/meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-beaglebone-yocto.txt b/meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-beaglebone-yocto.txt new file mode 100644 index 000..b0d98418d17 --- /dev/null +++ b/meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-beaglebone-yocto.txt @@ -0,0 +1,4 @@ +# These should be reviewed to see if they are still needed +l4_wkup_cm +Failed to make EGL context current +glamor initialization failed \ No newline at end of file diff --git a/meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-genericx86-64.txt b/meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-genericx86-64.txt new file mode 100644 index 000..9a655564cdc --- /dev/null +++ b/meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-genericx86-64.txt @@ -0,0 +1,7 @@ +# These should be reviewed to see if they are still needed +Direct firmware load for i915 +Failed to load firmware i915 +Failed to fetch GuC +Failed to initialize GuC +Failed to load DMC firmware +The driver is built-in, so to load the firmware you need to \ No newline at end of file -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191767): https://lists.openembedded.org/g/openembedded-core/message/191767 Mute This Topic: https://lists.openembedded.org/mt/102976296/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/3] oeqa/runtime/parselogs: migrate ignores
From: Ross Burton Move the ignores from a huge dict in the parselogs.py module to .txt files. This is just the common, tune, and qemu machine ignores; the machine ignores that are not in oe-core will be added to the relevant layers. The list of ignores has not been reviewed in any meaningful way, this should be done soon as I suspect a number of these are redundant. Signed-off-by: Ross Burton --- .../cases/parselogs-ignores-common.txt| 59 ++ .../cases/parselogs-ignores-mipsarch.txt | 2 + .../cases/parselogs-ignores-qemuall.txt | 27 +++ .../cases/parselogs-ignores-qemuarm64.txt | 6 + .../cases/parselogs-ignores-qemuarmv5.txt | 15 ++ .../cases/parselogs-ignores-qemuppc.txt | 6 + .../cases/parselogs-ignores-qemuppc64.txt | 4 + .../cases/parselogs-ignores-qemux86.txt | 2 + .../runtime/cases/parselogs-ignores-x86.txt | 10 + .../cases/parselogs-ignores-x86_64.txt| 1 + meta/lib/oeqa/runtime/cases/parselogs.py | 180 -- 11 files changed, 132 insertions(+), 180 deletions(-) create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-common.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-mipsarch.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-qemuall.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-qemuarm64.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-qemuarmv5.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-qemuppc.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-qemuppc64.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-qemux86.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-x86.txt create mode 12 meta/lib/oeqa/runtime/cases/parselogs-ignores-x86_64.txt diff --git a/meta/lib/oeqa/runtime/cases/parselogs-ignores-common.txt b/meta/lib/oeqa/runtime/cases/parselogs-ignores-common.txt new file mode 100644 index 000..14f8c0d4949 --- /dev/null +++ b/meta/lib/oeqa/runtime/cases/parselogs-ignores-common.txt @@ -0,0 +1,59 @@ +# Xserver explains what the short codes mean +(WW) warning, (EE) error, (NI) not implemented, (??) unknown. + +# Xserver warns if compiled with ACPI but no acpid running +Open ACPI failed (/var/run/acpid.socket) (No such file or directory) + +# Some machines (eg qemux86) don't enable PAE (they probably should though) +NX (Execute Disable) protection cannot be enabled: non-PAE kernel! + +# Connman's pacrunner warns if external connectivity isn't available +Failed to find URL:http://ipv4.connman.net/online/status.html +Failed to find URL:http://ipv6.connman.net/online/status.html + +# These should be reviewed to see if they are still needed +dma timeout +can\'t add hid device: +usbhid: probe of +_OSC failed (AE_ERROR) +_OSC failed (AE_SUPPORT) +AE_ALREADY_EXISTS +ACPI _OSC request failed (AE_SUPPORT) +can\'t disable ASPM +Failed to load module "vesa" +Failed to load module "modesetting" +Failed to load module "glx" +Failed to load module "fbdev" +Failed to load module "ati" +[drm] Cannot find any crtc or sizes +_OSC failed (AE_NOT_FOUND); disabling ASPM +hd.: possibly failed opcode +NETLINK INITIALIZATION FAILED +kernel: Cannot find map file +omap_hwmod: debugss: _wait_target_disable failed +VGA arbiter: cannot open kernel arbiter, no multi-card support +Online check failed for +netlink init failed +Fast TSC calibration +controller can't do DEVSLP, turning off +stmmac_dvr_probe: warning: cannot get CSR clock +error: couldn\'t mount because of unsupported optional features +GPT: Use GNU Parted to correct GPT errors +Cannot set xattr user.Librepo.DownloadInProgress +Failed to read /var/lib/nfs/statd/state: Success +error retry time-out = +logind: cannot setup systemd-logind helper (-61), using legacy fallback +Failed to rename network interface +Failed to process device, ignoring: Device or resource busy +Cannot find a map file +[rdrand]: Initialization Failed +[rndr ]: Initialization Failed +[pulseaudio] authkey.c: Failed to open cookie file +[pulseaudio] authkey.c: Failed to load authentication key +was skipped because of a failed condition check +was skipped because all trigger condition checks failed +xf86OpenConsole: Switching VT failed +Failed to read LoaderConfigTimeoutOneShot variable, ignoring: Operation not supported +Failed to read LoaderEntryOneShot variable, ignoring: Operation not supported +Direct firmware load for regulatory.db +failed to load regulatory.db diff --git a/meta/lib/oeqa/runtime/cases/parselogs-ignores-mipsarch.txt b/meta/lib/oeqa/runtime/cases/parselogs-ignores-mipsarch.txt new file mode 100644 index 000..2c0bd9a2477 --- /dev/null +++ b/meta/lib/oeqa/runtime/cases/parselogs-ignores-mipsarch.txt @@ -0,0 +1,2 @@ +# These should be reviewed to see if they are still needed +cacheinfo: Failed to find cpu0 device node diff --git
[OE-core] [PATCH 0/3] Move parselog ignores from code to data
From: Ross Burton Hi, This series changes the parselogs runtime QA test so that the list of warnings to ignore is not embedded in a huge dictionary but instead read at test time from text files in the layers. The generic ignores remain in oe-core, but ignores that are specific to e.g. genericx86-64 can be moved to meta-yocto-bsp. This ultimately allows BSPs that are not in in oe-core/meta-yocto-bsp to use parselogs without having to add their ignore lists into core. The final patch in this series is for meta-poky, but as they need to be applied in unison I thought it best to post them together. There will also need to be a follow-up patch for meta-intel, which I have queued locally. Ross Ross Burton (3): oeqa/runtime/parselogs: load ignores from disk oeqa/runtime/parselogs: migrate ignores meta-yocto-bsp/oeqa/parselogs: add BSP-specific ignores .../parselogs-ignores-beaglebone-yocto.txt| 4 + .../cases/parselogs-ignores-genericx86-64.txt | 7 + .../cases/parselogs-ignores-common.txt| 59 + .../cases/parselogs-ignores-mipsarch.txt | 2 + .../cases/parselogs-ignores-qemuall.txt | 27 +++ .../cases/parselogs-ignores-qemuarm64.txt | 6 + .../cases/parselogs-ignores-qemuarmv5.txt | 15 ++ .../cases/parselogs-ignores-qemuppc.txt | 6 + .../cases/parselogs-ignores-qemuppc64.txt | 4 + .../cases/parselogs-ignores-qemux86.txt | 2 + .../runtime/cases/parselogs-ignores-x86.txt | 10 + .../cases/parselogs-ignores-x86_64.txt| 1 + meta/lib/oeqa/runtime/cases/parselogs.py | 214 +++--- 13 files changed, 175 insertions(+), 182 deletions(-) create mode 100644 meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-beaglebone-yocto.txt create mode 100644 meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-genericx86-64.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-common.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-mipsarch.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-qemuall.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-qemuarm64.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-qemuarmv5.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-qemuppc.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-qemuppc64.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-qemux86.txt create mode 100644 meta/lib/oeqa/runtime/cases/parselogs-ignores-x86.txt create mode 12 meta/lib/oeqa/runtime/cases/parselogs-ignores-x86_64.txt -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191764): https://lists.openembedded.org/g/openembedded-core/message/191764 Mute This Topic: https://lists.openembedded.org/mt/102976292/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/3] oeqa/runtime/parselogs: load ignores from disk
From: Ross Burton
Instead of hardcoding the list of ignored errors/warnings in the test
itself, read them plain text files on disk.
This uses importlib to try to open a file called
oeqa.runtime.cases.parselogs-ignores-[candidate].txt, where the
candidate will be:
- "common"
- The TARGET_ARCH
- Each of the MACHINEOVERRDES
This allows the common and tune-specific ignores to be retained in
oe-core, and machine-specific ignores added to the layer where the
machine is defined.
[ YOCTO #14604 ]
Signed-off-by: Ross Burton
---
meta/lib/oeqa/runtime/cases/parselogs.py | 40 +---
1 file changed, 35 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py
b/meta/lib/oeqa/runtime/cases/parselogs.py
index cddb846bdfc..5527ebd271c 100644
--- a/meta/lib/oeqa/runtime/cases/parselogs.py
+++ b/meta/lib/oeqa/runtime/cases/parselogs.py
@@ -6,6 +6,7 @@
import collections
import os
+import sys
from shutil import rmtree
from oeqa.runtime.case import OERuntimeTestCase
@@ -190,6 +191,23 @@ ignore_errors = {
] + common_errors,
}
+
+# importlib.resources.open_text in Python <3.10 doesn't search all directories
+# when a package is split across multiple directories. Until we can rely on
+# 3.10+, reimplement the searching logic.
+if sys.version_info < (3, 10):
+def _open_text(package, resource):
+import importlib, pathlib
+module = importlib.import_module(package)
+for path in module.__path__:
+candidate = pathlib.Path(path) / resource
+if candidate.exists():
+return candidate.open(encoding='utf-8')
+raise FileNotFoundError
+else:
+from importlib.resources import open_text as _open_text
+
+
class ParseLogsTest(OERuntimeTestCase):
# Which log files should be collected
@@ -198,6 +216,9 @@ class ParseLogsTest(OERuntimeTestCase):
# The keywords that identify error messages in the log files
errors = ["error", "cannot", "can't", "failed"]
+# A list of error messages that should be ignored
+ignore_errors = []
+
@classmethod
def setUpClass(cls):
# When systemd is enabled we need to notice errors on
@@ -212,11 +233,20 @@ class ParseLogsTest(OERuntimeTestCase):
cls.errors = [s.casefold() for s in cls.errors]
-try:
-cls.ignore_errors = [s.casefold() for s in
ignore_errors[cls.td.get('MACHINE')]]
-except KeyError:
-cls.logger.info('No ignore list found for this machine, using
default')
-cls.ignore_errors = [s.casefold() for s in
ignore_errors['default']]
+cls.load_machine_ignores()
+
+@classmethod
+def load_machine_ignores(cls):
+# Add TARGET_ARCH explicitly as not every machine has that in
MACHINEOVERRDES (eg qemux86-64)
+for candidate in ["common", cls.td.get("TARGET_ARCH")] +
cls.td.get("MACHINEOVERRIDES").split(":"):
+try:
+name = f"parselogs-ignores-{candidate}.txt"
+for line in _open_text("oeqa.runtime.cases", name):
+line = line.strip()
+if line and not line.startswith("#"):
+cls.ignore_errors.append(line.casefold())
+except FileNotFoundError:
+pass
# Go through the log locations provided and if it's a folder
# create a list with all the .log files in it, if it's a file
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191765):
https://lists.openembedded.org/g/openembedded-core/message/191765
Mute This Topic: https://lists.openembedded.org/mt/102976293/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Patchtest results for [RESEND][PATCH 1/7] bitbake: utils: remove spaces on empty lines
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/RESEND-1-7-bitbake-utils-remove-spaces-on-empty-lines.patch FAIL: test commit message presence: Please include a commit message on your patch explaining the change (test_mbox.TestMbox.test_commit_message_presence) FAIL: test target mailing list: Series sent to the wrong mailing list or some patches from the series correspond to different mailing lists (test_mbox.TestMbox.test_target_mailing_list) PASS: pretest pylint (test_python_pylint.PyLint.pretest_pylint) 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 max line length (test_metadata.TestMetadata.test_max_line_length) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test pylint (test_python_pylint.PyLint.test_pylint) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) SKIP: pretest src uri left files: Patch cannot be merged (test_metadata.TestMetadata.pretest_src_uri_left_files) 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 lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test src uri left files: Patch cannot be merged (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) --- 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 (#191762): https://lists.openembedded.org/g/openembedded-core/message/191762 Mute This Topic: https://lists.openembedded.org/mt/102973623/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Patchtest results for [RESEND][PATCH 6/7] oeqa/selftest/recipetool: remove spaces on empty lines
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/RESEND-6-7-oeqa-selftest-recipetool-remove-spaces-on-empty-lines.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: pretest pylint (test_python_pylint.PyLint.pretest_pylint) 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 max line length (test_metadata.TestMetadata.test_max_line_length) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test pylint (test_python_pylint.PyLint.test_pylint) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) SKIP: pretest src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.pretest_src_uri_left_files) 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 lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) 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 (#191763): https://lists.openembedded.org/g/openembedded-core/message/191763 Mute This Topic: https://lists.openembedded.org/mt/102973624/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [RESEND][PATCH 0/7] Devtool/Recipetool: adding pypi support
Hello all, This series adds basic support for the pypi class in devtool/recipetool. The idea is to be able to detect that a package is available on pypi and in that case inherits from pypi class. This helps to produce cleaner recipes for pypi packages. To do this, I am adding a new optional callback "process_url" that plugin can register to implement some logic on matching url. By implementing this callback in create_buildsys_python we can match on pypi URLs directly or on release tarballs hosted on "files.pythonhosted.org". To create a recipe taking advantage of the pypi class we can use one of the following new syntax: * recipetool create https://pypi.org/project/ * recipetool create https://pypi.org/project// * recipetool create https://pypi.org/project/ --version or the old syntax: * recipetool create https://files.pythonhosted.org/packages/<...> If the URL points to a github URL or a release tarball not coming from "files.pythonhosted.org", the created recipe is the same as before. One can also use the newly added "--no-pypi" switch to NOT inherit from pypi class on matching URL, to keep legacy behaviour. This series also contains some bug fixes I found during my testing. Pushed my dev branch here: https://git.yoctoproject.org/poky-contrib/log/?h=jstephan/devtool-add-pypi-support Cheers Julien Julien Stephan (7): bitbake: utils: remove spaces on empty lines recipetool: create_buildsys_python.py: initialize metadata recipetool: create: add trailing newlines recipetool: create: add new optional process_url callback for plugins recipetool: create_buildsys_python: add pypi support oeqa/selftest/recipetool: remove spaces on empty lines oeqa/selftest/recipetool/devtool: add test for pypi class bitbake/lib/bb/utils.py | 16 +-- meta/lib/oeqa/selftest/cases/devtool.py | 4 +- meta/lib/oeqa/selftest/cases/recipetool.py| 114 +- scripts/lib/devtool/standard.py | 3 + scripts/lib/recipetool/create.py | 63 ++ .../lib/recipetool/create_buildsys_python.py | 73 +++ 6 files changed, 208 insertions(+), 65 deletions(-) -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191755): https://lists.openembedded.org/g/openembedded-core/message/191755 Mute This Topic: https://lists.openembedded.org/mt/102972947/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [RESEND][PATCH 7/7] oeqa/selftest/recipetool/devtool: add test for pypi class
recipetool now supports the pypi class and python recipes can by created
using the new following syntax:
* recipetool create https://pypi.org/project/
* recipetool create https://pypi.org/project//
* recipetool create https://pypi.org/project/ --version
or the old syntax:
* recipetool create https://files.pythonhosted.org/packages/<...>
So add tests for the new syntax and modify old tests
Signed-off-by: Julien Stephan
---
meta/lib/oeqa/selftest/cases/devtool.py| 4 +-
meta/lib/oeqa/selftest/cases/recipetool.py | 112 +++--
2 files changed, 85 insertions(+), 31 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index b5c488be8e8..3d9a4901ea5 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -543,7 +543,7 @@ class DevtoolAddTests(DevtoolBase):
self.track_for_cleanup(self.workspacedir)
self.add_command_to_tearDown('bitbake -c cleansstate %s' % testrecipe)
self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
-result = runCmd('devtool add %s %s -f %s' % (testrecipe, srcdir, url))
+result = runCmd('devtool add --no-pypi %s %s -f %s' % (testrecipe,
srcdir, url))
self.assertExists(os.path.join(self.workspacedir, 'conf',
'layer.conf'), 'Workspace directory not created. %s' % result.output)
self.assertTrue(os.path.isfile(os.path.join(srcdir, 'setup.py')),
'Unable to find setup.py in source directory')
self.assertTrue(os.path.isdir(os.path.join(srcdir, '.git')), 'git
repository for external source tree was not created')
@@ -562,7 +562,7 @@ class DevtoolAddTests(DevtoolBase):
result = runCmd('devtool reset -n %s' % testrecipe)
shutil.rmtree(srcdir)
fakever = '1.9'
-result = runCmd('devtool add %s %s -f %s -V %s' % (testrecipe, srcdir,
url, fakever))
+result = runCmd('devtool add --no-pypi %s %s -f %s -V %s' %
(testrecipe, srcdir, url, fakever))
self.assertTrue(os.path.isfile(os.path.join(srcdir, 'setup.py')),
'Unable to find setup.py in source directory')
# Test devtool status
result = runCmd('devtool status')
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 4bc28a4f2ee..b59e53f5994 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -457,13 +457,15 @@ class RecipetoolCreateTests(RecipetoolBase):
def test_recipetool_create_python3_setuptools(self):
# Test creating python3 package from tarball (using setuptools3 class)
+# Use the --no-pypi switch to avoid creating a pypi enabled recipe and
+# and check the created recipe as if it was a more general tarball
temprecipe = os.path.join(self.tempdir, 'recipe')
os.makedirs(temprecipe)
pn = 'python-magic'
pv = '0.4.15'
recipefile = os.path.join(temprecipe, '%s_%s.bb' % (pn, pv))
srcuri =
'https://files.pythonhosted.org/packages/84/30/80932401906eaf787f2e9bd86dc458f1d2e75b064b4c187341f29516945c/python-magic-%s.tar.gz'
% pv
-result = runCmd('recipetool create -o %s %s' % (temprecipe, srcuri))
+result = runCmd('recipetool create --no-pypi -o %s %s' % (temprecipe,
srcuri))
self.assertTrue(os.path.isfile(recipefile))
checkvars = {}
checkvars['LICENSE'] = set(['MIT'])
@@ -474,6 +476,82 @@ class RecipetoolCreateTests(RecipetoolBase):
inherits = ['setuptools3']
self._test_recipe_contents(recipefile, checkvars, inherits)
+def test_recipetool_create_python3_setuptools_pypi_tarball(self):
+# Test creating python3 package from tarball (using setuptools3 and
pypi classes)
+temprecipe = os.path.join(self.tempdir, 'recipe')
+os.makedirs(temprecipe)
+pn = 'python-magic'
+pv = '0.4.15'
+recipefile = os.path.join(temprecipe, '%s_%s.bb' % (pn, pv))
+srcuri =
'https://files.pythonhosted.org/packages/84/30/80932401906eaf787f2e9bd86dc458f1d2e75b064b4c187341f29516945c/python-magic-%s.tar.gz'
% pv
+result = runCmd('recipetool create -o %s %s' % (temprecipe, srcuri))
+self.assertTrue(os.path.isfile(recipefile))
+checkvars = {}
+checkvars['LICENSE'] = set(['MIT'])
+checkvars['LIC_FILES_CHKSUM'] =
'file://LICENSE;md5=16a934f165e8c3245f241e77d401bb88'
+checkvars['PYPI_PACKAGE'] = pn
+inherits = ['setuptools3', 'pypi']
+self._test_recipe_contents(recipefile, checkvars, inherits)
+
+def test_recipetool_create_python3_setuptools_pypi(self):
+# Test creating python3 package from pypi url (using setuptools3 and
pypi classes)
+# Intentionnaly using setuptools3 class here instead of any of the
pep517 class
+# to avoid the toml dependency and allows this test to run on host
autobuilders
+
[OE-core] [RESEND][PATCH 6/7] oeqa/selftest/recipetool: remove spaces on empty lines
Signed-off-by: Julien Stephan --- meta/lib/oeqa/selftest/cases/recipetool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index 55cbba9ca74..4bc28a4f2ee 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -853,7 +853,7 @@ class RecipetoolTests(RecipetoolBase): self._test_recipe_contents(deps_require_file, checkvars, []) - + def _copy_file_with_cleanup(self, srcfile, basedstdir, *paths): dstdir = basedstdir self.assertTrue(os.path.exists(dstdir)) -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191760): https://lists.openembedded.org/g/openembedded-core/message/191760 Mute This Topic: https://lists.openembedded.org/mt/102972953/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [RESEND][PATCH 5/7] recipetool: create_buildsys_python: add pypi support
Today, we can use devtool/recipetool to create recipes for python projects
using the github url or the direct release tarball of the project, but the
create_buildsys_python plugin doesn't support the pypi class, since we cannot
know from the extracted source if the package is available on pypi or not.
By implementing the new optional process_url callback, we can detect
that the url is a pypi one (i.e 'https://pypi.org/project/')
and retrieve the release tarball location.
Also detect if the url points to a release tarball hosted on
"files.pythonhosted.iorg" (i.e https://files.pythonhosted.org/packages/...)
In both cases, adds the pypi class, remove 'S' and 'SRC_URIxxx'
variables from the created recipe as they will be handled by the pypi class
and add the PYPI_PACKAGE variable
This helps to produce cleaner recipes when package is hosted on pypi.
If the url points to a github url or a release tarball not coming from
"files.pythonhosted.org", the created recipe is the same as before.
One can also use the newly added "--no-pypi" switch to NOT inherit
from pypi class on matching url, to keep legacy behaviour.
To create a recipe for a pypi package, one can now use one of the
new following syntax (using recipetool create / devtool add):
* recipetool create https://pypi.org/project/
* recipetool create https://pypi.org/project//
* recipetool create https://pypi.org/project/ --version
or the old syntax:
* recipetool create https://files.pythonhosted.org/packages/<...>
Signed-off-by: Julien Stephan
---
scripts/lib/devtool/standard.py | 3 +
scripts/lib/recipetool/create.py | 1 +
.../lib/recipetool/create_buildsys_python.py | 72 +++
3 files changed, 76 insertions(+)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index d53fb810071..f18ebaa70d3 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -147,6 +147,8 @@ def add(args, config, basepath, workspace):
extracmdopts += ' -a'
if args.npm_dev:
extracmdopts += ' --npm-dev'
+if args.no_pypi:
+extracmdopts += ' --no-pypi'
if args.mirrors:
extracmdopts += ' --mirrors'
if args.srcrev:
@@ -2260,6 +2262,7 @@ def register_commands(subparsers, context):
group.add_argument('--no-same-dir', help='Force build in a separate build
directory', action="store_true")
parser_add.add_argument('--fetch', '-f', help='Fetch the specified URI and
extract it to create the source tree (deprecated - pass as positional argument
instead)', metavar='URI')
parser_add.add_argument('--npm-dev', help='For npm, also fetch
devDependencies', action="store_true")
+parser_add.add_argument('--no-pypi', help='Do not inherit pypi class',
action="store_true")
parser_add.add_argument('--version', '-V', help='Version to use within
recipe (PV)')
parser_add.add_argument('--no-git', '-g', help='If fetching source, do not
set up source tree as a git repository', action="store_true")
group = parser_add.add_mutually_exclusive_group()
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 5c5ac7ae403..963aa91421e 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -1413,6 +1413,7 @@ def register_commands(subparsers):
parser_create.add_argument('-B', '--srcbranch', help='Branch in source
repository if fetching from an SCM such as git (default master)')
parser_create.add_argument('--keep-temp', action="store_true", help='Keep
temporary directory (for debugging)')
parser_create.add_argument('--npm-dev', action="store_true", help='For
npm, also fetch devDependencies')
+parser_create.add_argument('--no-pypi', action="store_true", help='Do not
inherit pypi class')
parser_create.add_argument('--devtool', action="store_true",
help=argparse.SUPPRESS)
parser_create.add_argument('--mirrors', action="store_true", help='Enable
PREMIRRORS and MIRRORS for source tree fetching (disabled by default).')
parser_create.set_defaults(func=create_recipe)
diff --git a/scripts/lib/recipetool/create_buildsys_python.py
b/scripts/lib/recipetool/create_buildsys_python.py
index b620e3271b1..5e07222ece1 100644
--- a/scripts/lib/recipetool/create_buildsys_python.py
+++ b/scripts/lib/recipetool/create_buildsys_python.py
@@ -18,7 +18,11 @@ import os
import re
import sys
import subprocess
+import json
+import urllib.request
from recipetool.create import RecipeHandler
+from urllib.parse import urldefrag
+from recipetool.create import determine_from_url
logger = logging.getLogger('recipetool')
@@ -111,6 +115,74 @@ class PythonRecipeHandler(RecipeHandler):
def __init__(self):
pass
+def process_url(self, args, classes, handled, extravalues):
+"""
+Convert any pypi url https://pypi.org/project// into
https://files.pythonhosted.org/packages/source/...
+which corresponds to the
[OE-core] [RESEND][PATCH 4/7] recipetool: create: add new optional process_url callback for plugins
Add a new process_url callback that plugins can optionally implement if
they which to handle url.
Plugins can implement this callback for example, to:
* transform the url
* add special variables using extravalues
* add extra classes
* ...
If a plugin handles the url, it must append 'url' to the handled
list and must return the fetchuri
No functional changes expected for plugins non implementing this
optional callback
Signed-off-by: Julien Stephan
---
scripts/lib/recipetool/create.py | 54 +++-
1 file changed, 32 insertions(+), 22 deletions(-)
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index f5d541eb6c1..5c5ac7ae403 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -423,6 +423,36 @@ def create_recipe(args):
storeTagName = ''
pv_srcpv = False
+handled = []
+classes = []
+
+# Find all plugins that want to register handlers
+logger.debug('Loading recipe handlers')
+raw_handlers = []
+for plugin in plugins:
+if hasattr(plugin, 'register_recipe_handlers'):
+plugin.register_recipe_handlers(raw_handlers)
+# Sort handlers by priority
+handlers = []
+for i, handler in enumerate(raw_handlers):
+if isinstance(handler, tuple):
+handlers.append((handler[0], handler[1], i))
+else:
+handlers.append((handler, 0, i))
+handlers.sort(key=lambda item: (item[1], -item[2]), reverse=True)
+for handler, priority, _ in handlers:
+logger.debug('Handler: %s (priority %d)' %
(handler.__class__.__name__, priority))
+setattr(handler, '_devtool', args.devtool)
+handlers = [item[0] for item in handlers]
+
+fetchuri = None
+for handler in handlers:
+if hasattr(handler, 'process_url'):
+ret = handler.process_url(args, classes, handled, extravalues)
+if 'url' in handled and ret:
+fetchuri = ret
+break
+
if os.path.isfile(source):
source = 'file://%s' % os.path.abspath(source)
@@ -431,7 +461,8 @@ def create_recipe(args):
if
re.match(r'https?://github.com/[^/]+/[^/]+/archive/.+(\.tar\..*|\.zip)$',
source):
logger.warning('github archive files are not guaranteed to be
stable and may be re-generated over time. If the latter occurs, the checksums
will likely change and the recipe will fail at do_fetch. It is recommended that
you point to an actual commit or tag in the repository instead (using the
repository URL in conjunction with the -S/--srcrev option).')
# Fetch a URL
-fetchuri = reformat_git_uri(urldefrag(source)[0])
+if not fetchuri:
+fetchuri = reformat_git_uri(urldefrag(source)[0])
if args.binary:
# Assume the archive contains the directory structure verbatim
# so we need to extract to a subdirectory
@@ -638,8 +669,6 @@ def create_recipe(args):
# We'll come back and replace this later in handle_license_vars()
lines_before.append('##LICENSE_PLACEHOLDER##')
-handled = []
-classes = []
# FIXME This is kind of a hack, we probably ought to be using bitbake to
do this
pn = None
@@ -718,25 +747,6 @@ def create_recipe(args):
if args.npm_dev:
extravalues['NPM_INSTALL_DEV'] = 1
-# Find all plugins that want to register handlers
-logger.debug('Loading recipe handlers')
-raw_handlers = []
-for plugin in plugins:
-if hasattr(plugin, 'register_recipe_handlers'):
-plugin.register_recipe_handlers(raw_handlers)
-# Sort handlers by priority
-handlers = []
-for i, handler in enumerate(raw_handlers):
-if isinstance(handler, tuple):
-handlers.append((handler[0], handler[1], i))
-else:
-handlers.append((handler, 0, i))
-handlers.sort(key=lambda item: (item[1], -item[2]), reverse=True)
-for handler, priority, _ in handlers:
-logger.debug('Handler: %s (priority %d)' %
(handler.__class__.__name__, priority))
-setattr(handler, '_devtool', args.devtool)
-handlers = [item[0] for item in handlers]
-
# Apply the handlers
if args.binary:
classes.append('bin_package')
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191758):
https://lists.openembedded.org/g/openembedded-core/message/191758
Mute This Topic: https://lists.openembedded.org/mt/102972951/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [RESEND][PATCH 1/7] bitbake: utils: remove spaces on empty lines
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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191754):
https://lists.openembedded.org/g/openembedded-core/message/191754
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]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [RESEND][PATCH 2/7] recipetool: create_buildsys_python.py: initialize metadata
In the case pyproject.toml doesn't contains metadatas, the metadata
variable is not initialized and the plugin throws an error and falls back
to another plugin, which is not the desired behaviour. So just ignore
metadata if we don't have them
Signed-off-by: Julien Stephan
---
scripts/lib/recipetool/create_buildsys_python.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/lib/recipetool/create_buildsys_python.py
b/scripts/lib/recipetool/create_buildsys_python.py
index 9312e4abf13..b620e3271b1 100644
--- a/scripts/lib/recipetool/create_buildsys_python.py
+++ b/scripts/lib/recipetool/create_buildsys_python.py
@@ -726,6 +726,7 @@ class PythonPyprojectTomlRecipeHandler(PythonRecipeHandler):
def process(self, srctree, classes, lines_before, lines_after, handled,
extravalues):
info = {}
+metadata = {}
if 'buildsystem' in handled:
return False
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191756):
https://lists.openembedded.org/g/openembedded-core/message/191756
Mute This Topic: https://lists.openembedded.org/mt/102972948/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [RESEND][PATCH 3/7] recipetool: create: add trailing newlines
create_recipe() function relies on oe.recipeutils.patch_recipe_lines()
which relies on bb.utils.edit_metadata(). edit_metada expect lines to
have trailing newlines, so add it to each lines before calling
patch_recipe_lines, otherwise edit_metadata will not be able to squash
blank line if there are two consecutive blanks after a removal
Signed-off-by: Julien Stephan
---
scripts/lib/recipetool/create.py | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 293198d1c88..f5d541eb6c1 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -873,8 +873,10 @@ def create_recipe(args):
outlines.append('')
outlines.extend(lines_after)
+outlines = [ line.rstrip('\n') +"\n" for line in outlines]
+
if extravalues:
-_, outlines = oe.recipeutils.patch_recipe_lines(outlines, extravalues,
trailing_newline=False)
+_, outlines = oe.recipeutils.patch_recipe_lines(outlines, extravalues,
trailing_newline=True)
if args.extract_to:
scriptutils.git_convert_standalone_clone(srctree)
@@ -890,7 +892,7 @@ def create_recipe(args):
log_info_cond('Source extracted to %s' % args.extract_to, args.devtool)
if outfile == '-':
-sys.stdout.write('\n'.join(outlines) + '\n')
+sys.stdout.write(''.join(outlines) + '\n')
else:
with open(outfile, 'w') as f:
lastline = None
@@ -898,7 +900,7 @@ def create_recipe(args):
if not lastline and not line:
# Skip extra blank lines
continue
-f.write('%s\n' % line)
+f.write('%s' % line)
lastline = line
log_info_cond('Recipe %s has been created; further editing may be
required to make it fully functional' % outfile, args.devtool)
tinfoil.modified_files()
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191757):
https://lists.openembedded.org/g/openembedded-core/message/191757
Mute This Topic: https://lists.openembedded.org/mt/102972949/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Patchtest results for [PATCH v2 6/9] recipeutils: bbappend_recipe: allow to patch the recipe itself
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/v2-6-9-recipeutils-bbappend_recipe-allow-to-patch-the-recipe-itself.patch FAIL: test max line length: Patch line too long (current length 310, maximum is 200) (test_metadata.TestMetadata.test_max_line_length) PASS: pretest pylint (test_python_pylint.PyLint.pretest_pylint) 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 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 pylint (test_python_pylint.PyLint.test_pylint) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list) SKIP: pretest src uri left files: Patch cannot be merged (test_metadata.TestMetadata.pretest_src_uri_left_files) 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 lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test src uri left files: Patch cannot be merged (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) --- 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 (#191753): https://lists.openembedded.org/g/openembedded-core/message/191753 Mute This Topic: https://lists.openembedded.org/mt/102972599/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 7/9] recipetool: appendsrcfile(s): add a mode to update the recipe itself
Add a new option -u/--update-recipe to update the recipe itself instead
of creating/updating a bbappend file
Signed-off-by: Julien Stephan
---
scripts/lib/recipetool/append.py | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index 7e56290a0ab..66ed160a0a6 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -357,7 +357,9 @@ def appendsrc(args, files, rd, extralines=None):
dry_run_outdir = dry_run_output.name
appendfile, _ = oe.recipeutils.bbappend_recipe(rd, args.destlayer,
copyfiles, None, wildcardver=args.wildcard_version, machine=args.machine,
extralines=extralines, params=params,
-
redirect_output=dry_run_outdir)
+
redirect_output=dry_run_outdir, update_original_recipe=args.update_recipe)
+if not appendfile:
+return
if args.dry_run:
output = ''
appendfilename = os.path.basename(appendfile)
@@ -459,6 +461,7 @@ def register_commands(subparsers):
help='Create/update a bbappend to add or
replace source files',
description='Creates a bbappend (or updates
an existing one) to add or replace the specified file in the recipe sources,
either those in WORKDIR or those in the source tree. This command lets you
specify multiple files with a destination directory, so cannot specify the
destination filename. See the `appendsrcfile` command for the other behavior.')
parser.add_argument('-D', '--destdir', help='Destination directory
(relative to S or WORKDIR, defaults to ".")', default='', type=destination_path)
+parser.add_argument('-u', '--update-recipe', help='Update recipe instead
of creating (or updating) a bbapend file. DESTLAYER must contains the recipe to
update', action='store_true')
parser.add_argument('-n', '--dry-run', help='Dry run mode',
action='store_true')
parser.add_argument('files', nargs='+', metavar='FILE', help='File(s) to
be added to the recipe sources (WORKDIR or S)', type=existing_path)
parser.set_defaults(func=lambda a: appendsrcfiles(parser, a),
parserecipes=True)
@@ -467,6 +470,7 @@ def register_commands(subparsers):
parents=[common_src],
help='Create/update a bbappend to add or
replace a source file',
description='Creates a bbappend (or updates
an existing one) to add or replace the specified files in the recipe sources,
either those in WORKDIR or those in the source tree. This command lets you
specify the destination filename, not just destination directory, but only
works for one file. See the `appendsrcfiles` command for the other behavior.')
+parser.add_argument('-u', '--update-recipe', help='Update recipe instead
of creating (or updating) a bbapend file. DESTLAYER must contains the recipe to
update', action='store_true')
parser.add_argument('-n', '--dry-run', help='Dry run mode',
action='store_true')
parser.add_argument('file', metavar='FILE', help='File to be added to the
recipe sources (WORKDIR or S)', type=existing_path)
parser.add_argument('destfile', metavar='DESTFILE', nargs='?',
help='Destination path (relative to S or WORKDIR, optional)',
type=destination_path)
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191749):
https://lists.openembedded.org/g/openembedded-core/message/191749
Mute This Topic: https://lists.openembedded.org/mt/102972293/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 0/9] Several fixes around recipetool appendsrcfile(s) and oe.recipeutils.bbappend_recipe
Hi all, I was trying to use recipetool appendsrcfile to add a file to a recipe and I noticed several issues: * -m is not correctly supported * recipetool appendsrfile(s) are missing a usefull dry-run mode * appendsrc function relies on oe.recipeutils.bbappend_recipe but duplicates some code: it constructs itself the new src_uri entry although oe.recipeutils.bbappend_recipe is already doing it * we are lacking a mode to patch the recipe itself So this series tries to fix the issues above, fix the selftest accordingly and add new test for -m and for "patch mode" (update recipe) and also add a way to specify the name of the file to add (in oe.recipeutils.bbappend_recipe) Improvements from v1: - in bbappend_recipe function remove old entry if an entry with different parameters already exists to avoid duplicate entries with different parameters Link to v1: https://lists.openembedded.org/g/openembedded-core/message/191544 Julien Stephan (9): recipetool: appendsrcfile(s): add dry-run mode recipeutils: bbappend_recipe: fix undefined variable recipeutils: bbappend_recipe: add a way to specify the name of the file to add recipeutils: bbappend_recipe: remove old srcuri entry if parameters are different recipetool: appendsrcfile(s): use params instead of extraline recipeutils: bbappend_recipe: allow to patch the recipe itself recipetool: appendsrcfile(s): add a mode to update the recipe itself oeqa/selftest/recipetool: appendsrfile: add test for machine oeqa/selftest/recipetool: appendsrc: add test for update mode meta/lib/oe/recipeutils.py | 62 +++- meta/lib/oeqa/selftest/cases/recipetool.py | 83 +++--- scripts/lib/devtool/standard.py| 6 +- scripts/lib/recipetool/append.py | 63 +++- 4 files changed, 168 insertions(+), 46 deletions(-) -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191744): https://lists.openembedded.org/g/openembedded-core/message/191744 Mute This Topic: https://lists.openembedded.org/mt/102972288/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 8/9] oeqa/selftest/recipetool: appendsrfile: add test for machine
Add a new test for machine specific bbappend override
Signed-off-by: Julien Stephan
---
meta/lib/oeqa/selftest/cases/recipetool.py | 44 +++---
1 file changed, 38 insertions(+), 6 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 21cb350e8a6..c55025e7df6 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -1056,7 +1056,7 @@ class RecipetoolAppendsrcBase(RecipetoolBase):
if p.scheme == 'file':
return p.netloc + p.path, uri
-def _test_appendsrcfile(self, testrecipe, filename=None, destdir=None,
has_src_uri=True, srcdir=None, newfile=None, remove=None, options=''):
+def _test_appendsrcfile(self, testrecipe, filename=None, destdir=None,
has_src_uri=True, srcdir=None, newfile=None, remove=None, machine=None ,
options=''):
if newfile is None:
newfile = self.testfile
@@ -1084,17 +1084,39 @@ class RecipetoolAppendsrcBase(RecipetoolBase):
expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
'\n']
+override = ""
+if machine:
+options += ' -m %s' % machine
+override = ':append:%s' % machine
+expectedlines.extend(['PACKAGE_ARCH = "${MACHINE_ARCH}"\n',
+ '\n'])
+
if remove:
for entry in remove:
-expectedlines.extend(['SRC_URI:remove = "%s"\n' % entry,
+if machine:
+entry_remove_line = 'SRC_URI:remove:%s = " %s"\n' %
(machine, entry)
+else:
+entry_remove_line = 'SRC_URI:remove = "%s"\n' % entry
+
+expectedlines.extend([entry_remove_line,
'\n'])
if has_src_uri:
uri = 'file://%s' % filename
if expected_subdir:
uri += ';subdir=%s' % expected_subdir
-expectedlines.extend(['SRC_URI += "%s"\n' % uri,
- '\n'])
+if machine:
+src_uri_line = 'SRC_URI%s = " %s"\n' % (override, uri)
+else:
+src_uri_line = 'SRC_URI += "%s"\n' % uri
+
+expectedlines.extend([src_uri_line, '\n'])
+
+with open("/tmp/tmp.txt", "w") as file:
+print(expectedlines, file=file)
+
+if machine:
+filename = '%s/%s' % (machine, filename)
return self._try_recipetool_appendsrcfile(testrecipe, newfile,
destpath, options, expectedlines, [filename])
@@ -1153,13 +1175,23 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
self.assertTrue(filepath, 'Unable to test, no file:// uri found in
SRC_URI for %s' % testrecipe)
self._test_appendsrcfile(testrecipe, filepath, has_src_uri=False)
-def test_recipetool_appendsrcfile_existing_in_src_uri_diff_params(self):
+def test_recipetool_appendsrcfile_existing_in_src_uri_diff_params(self,
machine=None):
testrecipe = 'base-files'
subdir = 'tmp'
filepath, srcuri_entry = self._get_first_file_uri(testrecipe)
self.assertTrue(filepath, 'Unable to test, no file:// uri found in
SRC_URI for %s' % testrecipe)
-self._test_appendsrcfile(testrecipe, filepath, subdir,
remove=[srcuri_entry])
+self._test_appendsrcfile(testrecipe, filepath, subdir,
machine=machine, remove=[srcuri_entry])
+
+def test_recipetool_appendsrcfile_machine(self):
+# A very basic test
+self._test_appendsrcfile('base-files', 'a-file', machine='mymachine')
+
+# Force cleaning the output of previous test
+self.tearDownLocal()
+
+# A more complex test: existing entry in src_uri with different param
+
self.test_recipetool_appendsrcfile_existing_in_src_uri_diff_params(machine='mymachine')
def test_recipetool_appendsrcfile_replace_file_srcdir(self):
testrecipe = 'bash'
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191751):
https://lists.openembedded.org/g/openembedded-core/message/191751
Mute This Topic: https://lists.openembedded.org/mt/102972295/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 5/9] recipetool: appendsrcfile(s): use params instead of extraline
appendsrc function relies on oe.recipeutils.bbappend_recipe to
copy files and add the corresponding entries in SRC_URI.
Currently, appendsrc function build itself the new SRC_URI entry to add the
correct subdir param, and gives it using the extralines parameter.
This has 2 drawbacks:
- oe.recipeutils.bbappend_recipe can already do this if we specify the
correct params, so we have duplicate code
- the duplicated code is not fully functional: for example, it doesn't
take into account the -m/--machine parameter
So fix this by not using extralines but give correctly formatted params.
Also remove the check for already existing entries as
oe.recipeutils.bbappend_recipe already implement it
The new bbappend file now have the SRC_URI entry after the
FILESEXTRAPATHS so fix the selftest.
Update test_recipetool_appendsrcfile_existing_in_src_uri_diff_params
test because recipetool appendsrcfiles used to not add new src_uri entry
if the entry already exist even with different parameters while
oe.recipeutils.bbappend_recipe adds it if parameters are different (and
remove the old entry)
Signed-off-by: Julien Stephan
---
meta/lib/oeqa/selftest/cases/recipetool.py | 21 +++
scripts/lib/recipetool/append.py | 24 --
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 55cbba9ca74..21cb350e8a6 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -1054,9 +1054,9 @@ class RecipetoolAppendsrcBase(RecipetoolBase):
for uri in src_uri:
p = urllib.parse.urlparse(uri)
if p.scheme == 'file':
-return p.netloc + p.path
+return p.netloc + p.path, uri
-def _test_appendsrcfile(self, testrecipe, filename=None, destdir=None,
has_src_uri=True, srcdir=None, newfile=None, options=''):
+def _test_appendsrcfile(self, testrecipe, filename=None, destdir=None,
has_src_uri=True, srcdir=None, newfile=None, remove=None, options=''):
if newfile is None:
newfile = self.testfile
@@ -1083,12 +1083,18 @@ class RecipetoolAppendsrcBase(RecipetoolBase):
expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
'\n']
+
+if remove:
+for entry in remove:
+expectedlines.extend(['SRC_URI:remove = "%s"\n' % entry,
+ '\n'])
+
if has_src_uri:
uri = 'file://%s' % filename
if expected_subdir:
uri += ';subdir=%s' % expected_subdir
-expectedlines[0:0] = ['SRC_URI += "%s"\n' % uri,
- '\n']
+expectedlines.extend(['SRC_URI += "%s"\n' % uri,
+ '\n'])
return self._try_recipetool_appendsrcfile(testrecipe, newfile,
destpath, options, expectedlines, [filename])
@@ -1143,18 +1149,17 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
def test_recipetool_appendsrcfile_existing_in_src_uri(self):
testrecipe = 'base-files'
-filepath = self._get_first_file_uri(testrecipe)
+filepath,_ = self._get_first_file_uri(testrecipe)
self.assertTrue(filepath, 'Unable to test, no file:// uri found in
SRC_URI for %s' % testrecipe)
self._test_appendsrcfile(testrecipe, filepath, has_src_uri=False)
def test_recipetool_appendsrcfile_existing_in_src_uri_diff_params(self):
testrecipe = 'base-files'
subdir = 'tmp'
-filepath = self._get_first_file_uri(testrecipe)
+filepath, srcuri_entry = self._get_first_file_uri(testrecipe)
self.assertTrue(filepath, 'Unable to test, no file:// uri found in
SRC_URI for %s' % testrecipe)
-output = self._test_appendsrcfile(testrecipe, filepath, subdir,
has_src_uri=False)
-self.assertTrue(any('with different parameters' in l for l in output))
+self._test_appendsrcfile(testrecipe, filepath, subdir,
remove=[srcuri_entry])
def test_recipetool_appendsrcfile_replace_file_srcdir(self):
testrecipe = 'bash'
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index 09e314481f1..7e56290a0ab 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -300,6 +300,8 @@ def appendfile(args):
if st.st_mode & stat.S_IXUSR:
perms = '0755'
install = {args.newfile: (args.targetpath, perms)}
+if sourcepath:
+sourcepath = os.path.basename(sourcepath)
oe.recipeutils.bbappend_recipe(rd, args.destlayer, {args.newfile:
(None, sourcepath)}, install, wildcardver=args.wildcard_version,
machine=args.machine)
tinfoil.modified_files()
return 0
@@ -329,6 +331,7 @@ def appendsrc(args, files, rd,
[OE-core] [PATCH v2 9/9] oeqa/selftest/recipetool: appendsrc: add test for update mode
add a basic test for testing the update mode of recipetool
appendsrcfile(s)
Signed-off-by: Julien Stephan
---
meta/lib/oeqa/selftest/cases/recipetool.py | 28 ++
1 file changed, 28 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py
b/meta/lib/oeqa/selftest/cases/recipetool.py
index c55025e7df6..0a82b081a2d 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -1193,6 +1193,34 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
# A more complex test: existing entry in src_uri with different param
self.test_recipetool_appendsrcfile_existing_in_src_uri_diff_params(machine='mymachine')
+def test_recipetool_appendsrcfile_update_recipe_basic(self):
+testrecipe = "base-files"
+recipefile = get_bb_var('FILE', testrecipe)
+result = runCmd('bitbake-layers show-layers')
+layerrecipe = None
+for line in result.output.splitlines()[3:]:
+with open("/tmp/juju.txt", "a") as file:
+layer = line.split()[1]
+print(layer, file=file)
+if layer in recipefile:
+layerrecipe = layer
+break
+self.assertTrue(layerrecipe, 'Unable to find the layer containing %s'
% testrecipe)
+cmd = 'recipetool appendsrcfile -u %s %s %s' % (layerrecipe,
testrecipe, self.testfile)
+result = runCmd(cmd)
+self.assertNotIn('Traceback', result.output)
+self.add_command_to_tearDown('cd %s; rm -f %s/%s; git checkout .' %
(os.path.dirname(recipefile), testrecipe, os.path.basename(self.testfile)))
+
+expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)),
+ ('??', '.*/%s/%s/%s$' % (testrecipe, testrecipe,
os.path.basename(self.testfile)))]
+self._check_repo_status(os.path.dirname(recipefile), expected_status)
+result = runCmd('git diff %s' % os.path.basename(recipefile),
cwd=os.path.dirname(recipefile))
+removelines = []
+addlines = [
+'file://%s ' % os.path.basename(self.testfile),
+]
+self._check_diff(result.output, addlines, removelines)
+
def test_recipetool_appendsrcfile_replace_file_srcdir(self):
testrecipe = 'bash'
filepath = 'Makefile.in'
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191752):
https://lists.openembedded.org/g/openembedded-core/message/191752
Mute This Topic: https://lists.openembedded.org/mt/102972297/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 6/9] recipeutils: bbappend_recipe: allow to patch the recipe itself
Add a new parameter update_original_recipe to allow to patch a recipe
instead of creating/updating a bbappend
Signed-off-by: Julien Stephan
---
meta/lib/oe/recipeutils.py | 35 +--
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 8aa82396c86..013b7412742 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -664,7 +664,7 @@ def get_bbappend_path(d, destlayerdir, wildcardver=False):
return (appendpath, pathok)
-def bbappend_recipe(rd, destlayerdir, srcfiles, install=None,
wildcardver=False, machine=None, extralines=None, removevalues=None,
redirect_output=None, params=None):
+def bbappend_recipe(rd, destlayerdir, srcfiles, install=None,
wildcardver=False, machine=None, extralines=None, removevalues=None,
redirect_output=None, params=None, update_original_recipe=False):
"""
Writes a bbappend file for a recipe
Parameters:
@@ -698,19 +698,29 @@ def bbappend_recipe(rd, destlayerdir, srcfiles,
install=None, wildcardver=False,
params:
Parameters to use when adding entries to SRC_URI. If specified,
should be a list of dicts with the same length as srcfiles.
+update_original_recipe:
+Force to update the original recipe instead of creating/updating
+a bbapend. destlayerdir must contain the original recipe
"""
if not removevalues:
removevalues = {}
recipefile = rd.getVar('FILE')
-# Determine how the bbappend should be named
-appendpath, pathok = get_bbappend_path(rd, destlayerdir, wildcardver)
-if not appendpath:
-bb.error('Unable to determine layer directory containing %s' %
recipefile)
-return (None, None)
-if not pathok:
-bb.warn('Unable to determine correct subdirectory path for bbappend
file - check that what %s adds to BBFILES also matches .bbappend files. Using
%s for now, but until you fix this the bbappend will not be applied.' %
(os.path.join(destlayerdir, 'conf', 'layer.conf'), os.path.dirname(appendpath)))
+if update_original_recipe:
+if destlayerdir not in recipefile:
+bb.error("destlayerdir %s doesn't contain the original recipe
(%s), cannot update it" % (destlayerdir, recipefile))
+return (None, None)
+
+appendpath = recipefile
+else:
+# Determine how the bbappend should be named
+appendpath, pathok = get_bbappend_path(rd, destlayerdir, wildcardver)
+if not appendpath:
+bb.error('Unable to determine layer directory containing %s' %
recipefile)
+return (None, None)
+if not pathok:
+bb.warn('Unable to determine correct subdirectory path for
bbappend file - check that what %s adds to BBFILES also matches .bbappend
files. Using %s for now, but until you fix this the bbappend will not be
applied.' % (os.path.join(destlayerdir, 'conf', 'layer.conf'),
os.path.dirname(appendpath)))
appenddir = os.path.dirname(appendpath)
if not redirect_output:
@@ -755,7 +765,7 @@ def bbappend_recipe(rd, destlayerdir, srcfiles,
install=None, wildcardver=False,
bbappendlines.append((varname, op, value))
destsubdir = rd.getVar('PN')
-if srcfiles:
+if not update_original_recipe and srcfiles:
bbappendlines.append(('FILESEXTRAPATHS:prepend', ':=',
'${THISDIR}/${PN}:'))
appendoverride = ''
@@ -789,7 +799,10 @@ def bbappend_recipe(rd, destlayerdir, srcfiles,
install=None, wildcardver=False,
appendline('SRC_URI:append%s' % appendoverride, '=', '
' + srcurientry)
else:
if oldentry:
-appendline('SRC_URI:remove', '=', oldentry)
+if update_original_recipe:
+removevalues['SRC_URI'] = oldentry
+else:
+appendline('SRC_URI:remove', '=', oldentry)
appendline('SRC_URI', '+=', srcurientry)
copyfiles[newfile] = srcfile
if install:
@@ -811,6 +824,8 @@ def bbappend_recipe(rd, destlayerdir, srcfiles,
install=None, wildcardver=False,
# multiple times per operation when we're handling overrides)
if os.path.exists(appendpath) and not os.path.exists(outfile):
shutil.copy2(appendpath, outfile)
+elif update_original_recipe:
+outfile = recipefile
else:
bb.note('Writing append file %s' % appendpath)
outfile = appendpath
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191750):
https://lists.openembedded.org/g/openembedded-core/message/191750
Mute This Topic: https://lists.openembedded.org/mt/102972294/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe:
[OE-core] [PATCH v2 4/9] recipeutils: bbappend_recipe: remove old srcuri entry if parameters are different
Currently we do not add a new src_ury entry if the entry already exists
AND the parameters are the same.
I believe that when an entry already exist with different parameters,
we should remove it and add the new entry otherwise we end up with two
entries with different parameters
Signed-off-by: Julien Stephan
---
meta/lib/oe/recipeutils.py | 8
1 file changed, 8 insertions(+)
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 9784ae3b031..8aa82396c86 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -774,14 +774,22 @@ def bbappend_recipe(rd, destlayerdir, srcfiles,
install=None, wildcardver=False,
else:
srcfile = os.path.basename(newfile)
srcurientry = 'file://%s' % srcfile
+oldentry = None
+for uri in rd.getVar('SRC_URI').split():
+if srcurientry in uri:
+oldentry = uri
if params and params[i]:
srcurientry = '%s;%s' % (srcurientry, ';'.join('%s=%s' %
(k,v) for k,v in params[i].items()))
# Double-check it's not there already
# FIXME do we care if the entry is added by another bbappend
that might go away?
if not srcurientry in rd.getVar('SRC_URI').split():
if machine:
+if oldentry:
+appendline('SRC_URI:remove%s' % appendoverride,
'=', ' ' + oldentry)
appendline('SRC_URI:append%s' % appendoverride, '=', '
' + srcurientry)
else:
+if oldentry:
+appendline('SRC_URI:remove', '=', oldentry)
appendline('SRC_URI', '+=', srcurientry)
copyfiles[newfile] = srcfile
if install:
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191747):
https://lists.openembedded.org/g/openembedded-core/message/191747
Mute This Topic: https://lists.openembedded.org/mt/102972291/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/9] recipeutils: bbappend_recipe: fix undefined variable
In the case get_bbappend_path returns None (could not find the layer
containing the recipe) the error message tries to print the recipefile,
but it is not defined. Fix it.
Signed-off-by: Julien Stephan
---
meta/lib/oe/recipeutils.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 3336db8ab06..7465a2d0ab4 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -702,6 +702,7 @@ def bbappend_recipe(rd, destlayerdir, srcfiles,
install=None, wildcardver=False,
if not removevalues:
removevalues = {}
+recipefile = rd.getVar('FILE')
# Determine how the bbappend should be named
appendpath, pathok = get_bbappend_path(rd, destlayerdir, wildcardver)
if not appendpath:
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191746):
https://lists.openembedded.org/g/openembedded-core/message/191746
Mute This Topic: https://lists.openembedded.org/mt/102972290/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 3/9] recipeutils: bbappend_recipe: add a way to specify the name of the file to add
bbappend_recipe can take a dict of source files to add to SRC_URI where
the key is the full path to the file to be added and the value is
the original file in the recipe space.
Modify the dict value to use a tupple: (originalfile, newname), to allow
specifying the name of the file we would like to add
Signed-off-by: Julien Stephan
---
meta/lib/oe/recipeutils.py | 20
scripts/lib/devtool/standard.py | 6 +++---
scripts/lib/recipetool/append.py | 4 ++--
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 7465a2d0ab4..9784ae3b031 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -671,12 +671,13 @@ def bbappend_recipe(rd, destlayerdir, srcfiles,
install=None, wildcardver=False,
rd: data dictionary for the recipe
destlayerdir: base directory of the layer to place the bbappend in
(subdirectory path from there will be determined automatically)
-srcfiles: dict of source files to add to SRC_URI, where the value
-is the full path to the file to be added, and the value is the
-original filename as it would appear in SRC_URI or None if it
-isn't already present. You may pass None for this parameter if
-you simply want to specify your own content via the extralines
-parameter.
+srcfiles: dict of source files to add to SRC_URI, where the key
+is the full path to the file to be added, and the value is a tuple
+containing the original filename as it would appear in SRC_URI
+or None if it isn't already present and the new name of the file or
+None to use by default basename(original filename).
+You may pass None for this parameter if you simply want to specify
+your own content via the extralines parameter.
install: dict mapping entries in srcfiles to a tuple of two elements:
install path (*without* ${D} prefix) and permission value (as a
string, e.g. '0644').
@@ -764,11 +765,14 @@ def bbappend_recipe(rd, destlayerdir, srcfiles,
install=None, wildcardver=False,
copyfiles = {}
if srcfiles:
instfunclines = []
-for i, (newfile, origsrcfile) in enumerate(srcfiles.items()):
+for i, (newfile, (origsrcfile, newname)) in
enumerate(srcfiles.items()):
srcfile = origsrcfile
srcurientry = None
if not srcfile:
-srcfile = os.path.basename(newfile)
+if newname:
+srcfile = newname
+else:
+srcfile = os.path.basename(newfile)
srcurientry = 'file://%s' % srcfile
if params and params[i]:
srcurientry = '%s;%s' % (srcurientry, ';'.join('%s=%s' %
(k,v) for k,v in params[i].items()))
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index d53fb810071..fa473014f90 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1568,7 +1568,7 @@ def _update_recipe_srcrev(recipename, workspace, srctree,
rd, appendlayerdir, wi
update_srcuri = True
if appendlayerdir:
-files = dict((os.path.join(local_files_dir, key), val) for
+files = dict((os.path.join(local_files_dir, key), (val, None)) for
key, val in list(upd_f.items()) +
list(new_f.items()))
removevalues = {}
if update_srcuri:
@@ -1678,9 +1678,9 @@ def _update_recipe_patch(recipename, workspace, srctree,
rd, appendlayerdir, wil
destpath = None
srcuri = (rd.getVar('SRC_URI', False) or '').split()
if appendlayerdir:
-files = OrderedDict((os.path.join(local_files_dir, key), val) for
+files = OrderedDict((os.path.join(local_files_dir, key), (val,
None)) for
key, val in list(upd_f.items()) + list(new_f.items()))
-files.update(OrderedDict((os.path.join(patches_dir, key), val) for
+files.update(OrderedDict((os.path.join(patches_dir, key), (val,
None)) for
key, val in list(upd_p.items()) +
list(new_p.items(
if files or remove_files:
removevalues = None
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index 314ff4e20fd..09e314481f1 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -300,7 +300,7 @@ def appendfile(args):
if st.st_mode & stat.S_IXUSR:
perms = '0755'
install = {args.newfile: (args.targetpath, perms)}
-oe.recipeutils.bbappend_recipe(rd, args.destlayer, {args.newfile:
sourcepath}, install, wildcardver=args.wildcard_version, machine=args.machine)
+
[OE-core] [PATCH v2 1/9] recipetool: appendsrcfile(s): add dry-run mode
Add dry-run mode for recipetool appendsrcfile and appendsrcfiles, with
if necessary, a diff of changes
Signed-off-by: Julien Stephan
---
scripts/lib/recipetool/append.py | 33 +++-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index 9dbb1cc4b5a..314ff4e20fd 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -18,6 +18,7 @@ import shutil
import scriptutils
import errno
from collections import defaultdict
+import difflib
logger = logging.getLogger('recipetool')
@@ -355,7 +356,35 @@ def appendsrc(args, files, rd, extralines=None):
extralines.append('SRC_URI += {0}'.format(source_uri))
copyfiles[newfile] = srcfile
-oe.recipeutils.bbappend_recipe(rd, args.destlayer, copyfiles, None,
wildcardver=args.wildcard_version, machine=args.machine, extralines=extralines)
+dry_run_output = None
+dry_run_outdir = None
+if args.dry_run:
+import tempfile
+dry_run_output = tempfile.TemporaryDirectory(prefix='devtool')
+dry_run_outdir = dry_run_output.name
+
+appendfile, _ = oe.recipeutils.bbappend_recipe(rd, args.destlayer,
copyfiles, None, wildcardver=args.wildcard_version, machine=args.machine,
extralines=extralines, redirect_output=dry_run_outdir)
+if args.dry_run:
+output = ''
+appendfilename = os.path.basename(appendfile)
+newappendfile = appendfile
+if appendfile and os.path.exists(appendfile):
+with open(appendfile, 'r') as f:
+oldlines = f.readlines()
+else:
+appendfile = '/dev/null'
+oldlines = []
+
+with open(os.path.join(dry_run_outdir, appendfilename), 'r') as f:
+newlines = f.readlines()
+diff = difflib.unified_diff(oldlines, newlines, appendfile,
newappendfile)
+difflines = list(diff)
+if difflines:
+output += ''.join(difflines)
+if output:
+logger.info('Diff of changed files:\n%s' % output)
+else:
+logger.info('No changed files')
tinfoil.modified_files()
def appendsrcfiles(parser, args):
@@ -436,6 +465,7 @@ def register_commands(subparsers):
help='Create/update a bbappend to add or
replace source files',
description='Creates a bbappend (or updates
an existing one) to add or replace the specified file in the recipe sources,
either those in WORKDIR or those in the source tree. This command lets you
specify multiple files with a destination directory, so cannot specify the
destination filename. See the `appendsrcfile` command for the other behavior.')
parser.add_argument('-D', '--destdir', help='Destination directory
(relative to S or WORKDIR, defaults to ".")', default='', type=destination_path)
+parser.add_argument('-n', '--dry-run', help='Dry run mode',
action='store_true')
parser.add_argument('files', nargs='+', metavar='FILE', help='File(s) to
be added to the recipe sources (WORKDIR or S)', type=existing_path)
parser.set_defaults(func=lambda a: appendsrcfiles(parser, a),
parserecipes=True)
@@ -443,6 +473,7 @@ def register_commands(subparsers):
parents=[common_src],
help='Create/update a bbappend to add or
replace a source file',
description='Creates a bbappend (or updates
an existing one) to add or replace the specified files in the recipe sources,
either those in WORKDIR or those in the source tree. This command lets you
specify the destination filename, not just destination directory, but only
works for one file. See the `appendsrcfiles` command for the other behavior.')
+parser.add_argument('-n', '--dry-run', help='Dry run mode',
action='store_true')
parser.add_argument('file', metavar='FILE', help='File to be added to the
recipe sources (WORKDIR or S)', type=existing_path)
parser.add_argument('destfile', metavar='DESTFILE', nargs='?',
help='Destination path (relative to S or WORKDIR, optional)',
type=destination_path)
parser.set_defaults(func=lambda a: appendsrcfile(parser, a),
parserecipes=True)
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191743):
https://lists.openembedded.org/g/openembedded-core/message/191743
Mute This Topic: https://lists.openembedded.org/mt/102972287/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 v3] image-live: Add support for building EFI-bootable ISO images for non-x86-based archs
Hello, Alex! I have doubts that the entire isoparser class set could be inlined, that would occupy around 1200 lines in total. https://github.com/barneygale/isoparser/tree/master/isoparser Three functions that are used to find the file using this class set are 32 lines long in total. Best regards, Andrey. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191742): https://lists.openembedded.org/g/openembedded-core/message/191742 Mute This Topic: https://lists.openembedded.org/mt/102896781/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 v3] image-live: Add support for building EFI-bootable ISO images for non-x86-based archs
How big is the script? Can it be 'inlined' into the class as a set of functions? Alex On Mon, 4 Dec 2023 at 14:33, Andrey Popov wrote: > > Hello, Alexandre! > > Thank you for the feedback. > I think I can eliminate the xorriso/libisoburn dependency by replacing it > with a python script that I've created which uses modified version of > isoparser python package. > However, I am not aware of the correct way to include this tool into > openembedded-core. If someone can suggest such a way (if it is a good idea > after all), that would be greatly appreciated. > > Best regards, Andrey. > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191741): https://lists.openembedded.org/g/openembedded-core/message/191741 Mute This Topic: https://lists.openembedded.org/mt/102896781/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 v3] image-live: Add support for building EFI-bootable ISO images for non-x86-based archs
Hello, Alex! With this patch applied, targets that request image-live and do not define pcbios feature should not depend on syslinux anymore. However, this patch requires an external tool (or, at least, isoparser python package to be imported inside the class) to determine the efi.img offset and size inside ISO image. Regarding the snippet in question, it can be safely omitted since it was required for isohybrid to work for targets that define efi feature but do not define pcbios one, and because this patch replaces invocation of this tool with custom method for creating EFI-bootable MBR in aforementioned case. Best regards, Andrey. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191740): https://lists.openembedded.org/g/openembedded-core/message/191740 Mute This Topic: https://lists.openembedded.org/mt/102896781/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 v3] image-live: Add support for building EFI-bootable ISO images for non-x86-based archs
On Thu, 30 Nov 2023 at 17:16, Andrey Popov wrote:
> - # EFI only
> - if [ "${PCBIOS}" != "1" ] && [ "${EFI}" = "1" ] ; then
> - # Work around bug in isohybrid where it requires isolinux.bin
> - # In the boot catalog, even though it is not used
> - mkdir -p ${ISODIR}/${ISOLINUXDIR}
> - install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin
> ${ISODIR}${ISOLINUXDIR}
> - fi
> -
Why is this snippet removed? I don't see anything that replaces it. If
the removal is valid, do we still need syslinux?
Alex
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191739):
https://lists.openembedded.org/g/openembedded-core/message/191739
Mute This Topic: https://lists.openembedded.org/mt/102896781/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] rust-llvm: Allow overriding LLVM target archs
From: Niko Mauno
Move the default value into a variable which can be overridden to
match more accurately the use case specific scenario.
(From OE-Core rev: 645370e85d8742d0614cd52ca7507b5df2d38ad8)
Signed-off-by: Niko Mauno
Signed-off-by: Alexandre Belloni
Signed-off-by: Richard Purdie
---
meta/recipes-devtools/rust/rust-llvm.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/rust/rust-llvm.inc
b/meta/recipes-devtools/rust/rust-llvm.inc
index e645e7a7ac..416a07cd40 100644
--- a/meta/recipes-devtools/rust/rust-llvm.inc
+++ b/meta/recipes-devtools/rust/rust-llvm.inc
@@ -25,9 +25,11 @@ CXXFLAGS:remove = "-g"
LLVM_DIR = "llvm${LLVM_RELEASE}"
+RUST_LLVM_TARGETS ?= "ARM;AArch64;Mips;PowerPC;RISCV;X86"
+
EXTRA_OECMAKE = " \
-DCMAKE_BUILD_TYPE=Release \
--DLLVM_TARGETS_TO_BUILD='ARM;AArch64;Mips;PowerPC;RISCV;X86' \
+-DLLVM_TARGETS_TO_BUILD='${RUST_LLVM_TARGETS}' \
-DLLVM_BUILD_DOCS=OFF \
-DLLVM_ENABLE_TERMINFO=OFF \
-DLLVM_ENABLE_ZLIB=OFF \
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191738):
https://lists.openembedded.org/g/openembedded-core/message/191738
Mute This Topic: https://lists.openembedded.org/mt/102970153/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 v3] image-live: Add support for building EFI-bootable ISO images for non-x86-based archs
Hello, Alexandre! Thank you for the feedback. I think I can eliminate the xorriso/libisoburn dependency by replacing it with a python script that I've created which uses modified version of isoparser python package. However, I am not aware of the correct way to include this tool into openembedded-core. If someone can suggest such a way (if it is a good idea after all), that would be greatly appreciated. Best regards, Andrey. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191737): https://lists.openembedded.org/g/openembedded-core/message/191737 Mute This Topic: https://lists.openembedded.org/mt/102896781/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 0/2] patch: reduce changes during patch refresh
On Mon, 4 Dec 2023 at 13:48, Lukas Funke wrote: > You're probably right. A little context is always helpful. > > From the top: the proposed change is setting the commit-hash in > exported patches to all-zero. > > When devtool is updating the recipes using 'devtool update-recipe > ' it figures out (in '_get_patchset_revs()') which commits > were changed during development (in the workspace). > Now devtool known which commits actually contain changes. Subsequently > devtool is exporting the patches with all-zero commit hash (in > '_export_patches()', which contains our all-zero commit hash change). > '_export_patches()' also compares the now exported commit-hash to the > expected commit-hash which is an argument to the very same function. > Since it they didn't match (see the code snippet), devtool thinks there > is no change. Thus, the patch is ignored. > > If we want to export patches with all-zero commits we have to either > remove this check or have to export the original commit id in the patch. > The latter would again introduce noise. I still don't entirely understand what is happening, but the logic of deciding whether any of the commits were changed should not rely on what is written into patchfiles, and rather operate directly from the git history. That should be fixed first. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191736): https://lists.openembedded.org/g/openembedded-core/message/191736 Mute This Topic: https://lists.openembedded.org/mt/102748808/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 0/2] patch: reduce changes during patch refresh
Hi Alex, On 04.12.2023 11:54, Alexander Kanavin wrote: On Mon, 4 Dec 2023 at 11:48, Lukas Funke wrote: Unfortunately, the patch indeed causes the tests to fail. The problamatic lines are in the 'lib\devtool\standard.py': if len(firstlineitems) > 1 and len(firstlineitems[1]) == 40: if not firstlineitems[1] in changed_revs: continue When the commit-hash becomes all zero, there is no way for devtools to detect the change. I'm a little puzzled how to handle this situation. However, I still think the all zero hash is usefull since it will reduce the noise when developers review their changed in git(lab|hub). Maybe it would be for the best to remove the check? It would help if you provide the context for that code snippet, so we can see why is it there, and what is it trying to do, without having to go and separately study the code ourselves. Patch review is hard, please do not make it harder. You're probably right. A little context is always helpful. From the top: the proposed change is setting the commit-hash in exported patches to all-zero. When devtool is updating the recipes using 'devtool update-recipe ' it figures out (in '_get_patchset_revs()') which commits were changed during development (in the workspace). Now devtool known which commits actually contain changes. Subsequently devtool is exporting the patches with all-zero commit hash (in '_export_patches()', which contains our all-zero commit hash change). '_export_patches()' also compares the now exported commit-hash to the expected commit-hash which is an argument to the very same function. Since it they didn't match (see the code snippet), devtool thinks there is no change. Thus, the patch is ignored. If we want to export patches with all-zero commits we have to either remove this check or have to export the original commit id in the patch. The latter would again introduce noise. Best regards Lukas Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191735): https://lists.openembedded.org/g/openembedded-core/message/191735 Mute This Topic: https://lists.openembedded.org/mt/102748808/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] openssh: Add SSHD_SERVICE_TYPE variable
On Mon, 2023-12-04 at 16:54 +0800, Yu, Mingli wrote: > From: Mingli Yu > > There are two types of sshd server now, one is based on socket > activation(sshd.socket) and another is service activation(sshd.service). > And the default sshd service type is based on socket by default as below. Firstly, I'm a little frustrated about how these changes are being proposed in pieces. The original patches made no mention that this was eventually going to be controlled by a new variable. I did wonder if something like this was going to happen but the didn't push back. Now we're "pinned" into a corner with the direction this code takes now we've already merged the on target configuration change. > But it's more convenient to determine the service type at build time > if there are so many devices. Why did we merge a patch which made this an on target decision then? > So add SSHD_SERVICE_TYPE variable to enable sshd.socket or sshd.service > at build time and we still enable sshd.socket by default now. No, we're not adding randomly named variables which take magic options. I cannot look at SSHD_SERVICE_TYPE and know that "1" means socket activation and not setting it means service activation (or whatever, the fact I can't check what I've written easily proves my point). What happens if I set it to "true", or "socket", or "apples"? I'd suggest thinking about a PACKAGECONFIG option such as systemd-sshd- socket-mode and systemd-sshd-service-mode which at least uses naming users are mode used to and says what it does. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191734): https://lists.openembedded.org/g/openembedded-core/message/191734 Mute This Topic: https://lists.openembedded.org/mt/102967209/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 0/2] patch: reduce changes during patch refresh
On Mon, 4 Dec 2023 at 11:48, Lukas Funke wrote: > Unfortunately, the patch indeed causes the tests to fail. The > problamatic lines are in the 'lib\devtool\standard.py': > > if len(firstlineitems) > 1 and len(firstlineitems[1]) == 40: > if not firstlineitems[1] in changed_revs: > continue > > When the commit-hash becomes all zero, there is no way for devtools to > detect the change. I'm a little puzzled how to handle this situation. > However, I still think the all zero hash is usefull since it will reduce > the noise when developers review their changed in git(lab|hub). Maybe it > would be for the best to remove the check? It would help if you provide the context for that code snippet, so we can see why is it there, and what is it trying to do, without having to go and separately study the code ourselves. Patch review is hard, please do not make it harder. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191733): https://lists.openembedded.org/g/openembedded-core/message/191733 Mute This Topic: https://lists.openembedded.org/mt/102748808/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 0/2] patch: reduce changes during patch refresh
Hi Richard, On 27.11.2023 14:45, Richard Purdie wrote: On Wed, 2023-11-22 at 15:08 +0100, Lukas Funke wrote: From: Lukas Funke The patch series aims to reduce the noise in patches created by devtools. Some diffs are just introduced due to an update in the hash or in the diffstats. These changes are not important to a reviewer. Stefan Herbrechtsmeier (2): patch: extract patches without diffstats patch: extract patches with all-zero hash meta/lib/oe/patch.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) I'm fairly sure but haven't conclusively proven this causes these failures: https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/6095/steps/14/logs/stdio 2023-11-23 23:31:16,216 - oe-selftest - INFO - RESULTS - devtool.DevtoolUpdateTests.test_devtool_update_recipe_local_patch_gz: FAILED (65.60s) 2023-11-23 23:31:16,216 - oe-selftest - INFO - RESULTS - devtool.DevtoolUpdateTests.test_devtool_update_recipe_long_filename: FAILED (53.35s) 2023-11-23 23:31:16,216 - oe-selftest - INFO - RESULTS - devtool.DevtoolUpdateTests.test_devtool_update_recipe_with_gitignore: FAILED (44.11s) Unfortunately, the patch indeed causes the tests to fail. The problamatic lines are in the 'lib\devtool\standard.py': if len(firstlineitems) > 1 and len(firstlineitems[1]) == 40: if not firstlineitems[1] in changed_revs: continue When the commit-hash becomes all zero, there is no way for devtools to detect the change. I'm a little puzzled how to handle this situation. However, I still think the all zero hash is usefull since it will reduce the noise when developers review their changed in git(lab|hub). Maybe it would be for the best to remove the check? Best regards Lukas Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191732): https://lists.openembedded.org/g/openembedded-core/message/191732 Mute This Topic: https://lists.openembedded.org/mt/102748808/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] avahi: update URL for new project location
From: Ross Burton
Avahi has moved to a new parent organisation on GitHub, so update the
URLs to match.
Signed-off-by: Ross Burton
---
meta/recipes-connectivity/avahi/avahi_0.8.bb | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb
b/meta/recipes-connectivity/avahi/avahi_0.8.bb
index 910da3c9cce..7295c4e05b6 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
@@ -6,7 +6,7 @@ IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for
automatic IP address \
configuration from the link-local 169.254.0.0/16 range without the need for a
central \
server.'
HOMEPAGE = "http://avahi.org;
-BUGTRACKER = "https://github.com/lathiat/avahi/issues;
+BUGTRACKER = "https://github.com/avahi/avahi/issues;
SECTION = "network"
# major part is under LGPL-2.1-or-later, but several .dtd, .xsl, initscripts
and
@@ -33,8 +33,7 @@ SRC_URI =
"${GITHUB_BASE_URI}/download/v${PV}/avahi-${PV}.tar.gz \
file://CVE-2023-38473.patch \
"
-GITHUB_BASE_URI = "https://github.com/lathiat/avahi/releases/;
-SRC_URI[md5sum] = "229c6aa30674fc43c202b22c5f8c2be7"
+GITHUB_BASE_URI = "https://github.com/avahi/avahi/releases/;
SRC_URI[sha256sum] =
"060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda"
CVE_STATUS[CVE-2021-26720] = "not-applicable-platform: Issue only affects
Debian/SUSE"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191731):
https://lists.openembedded.org/g/openembedded-core/message/191731
Mute This Topic: https://lists.openembedded.org/mt/102968037/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
Generally if you mark something as inappropriate, it's best to write
an extended description of why in the patch. The barrier to adding
patches that we can never upstream is high.
Alex
On Mon, 4 Dec 2023 at 07:53, Johannes Pointner wrote:
>
> Hello,
>
> On Sat, Dec 2, 2023 at 4:13 PM Alexandre Belloni via
> lists.openembedded.org
> wrote:
> >
> > On 01/12/2023 11:53:59+0100, Johannes Pointner via lists.openembedded.org
> > wrote:
> > > 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]
> >
> > I'm not sure how this is embedded specific, why doesn't it affect desktop
> > distribution that have usrmerge (e.g. Fedora) ?
> Because this is just a workaround for the standalone ldconfig-native.
> https://lists.openembedded.org/g/openembedded-core/message/191566
> I also looked at the reason for the patches that are already used by
> ldconfig-native.
> But I am open to suggestions, what would you prefer?
> >
> > > +
> > > +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);
> > > + 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
> > >
> > >
> >
> > >
> > >
> > >
> >
> >
> > --
> > 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 (#191730):
https://lists.openembedded.org/g/openembedded-core/message/191730
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]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] Patchtest results for [PATCH] tiff: Backport fixes for CVE-2023-6277
Is this a different patchtest issue to the one that was fixed? Alex On Sun, 3 Dec 2023 at 17:33, Patchtest wrote: > > Thank you for your submission. Patchtest identified one > or more issues with the patch. Please see the log below for > more information: > > --- > Tests failed for the patch, but the results log could not be processed due to > excessive result line length. > --- > > 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 (#191729): https://lists.openembedded.org/g/openembedded-core/message/191729 Mute This Topic: https://lists.openembedded.org/mt/102954001/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] rust-common.bbclass: Define rust arch for x32 platforms
Thanks for this one, I hope we can finally get that vte update in :)
Alex
On Sat, 2 Dec 2023 at 01:09, Khem Raj wrote:
>
> Signed-off-by: Khem Raj
> ---
> v2: Change 'if' to 'elif' to make it part of if else block
>
> meta/classes-recipe/rust-common.bbclass | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/meta/classes-recipe/rust-common.bbclass
> b/meta/classes-recipe/rust-common.bbclass
> index 3d73a370ec8..ae96d9c5b1f 100644
> --- a/meta/classes-recipe/rust-common.bbclass
> +++ b/meta/classes-recipe/rust-common.bbclass
> @@ -63,6 +63,8 @@ def rust_base_triple(d, thing):
> # This catches ARM targets and appends the necessary hard float bits
> if os == "linux-gnueabi" or os == "linux-musleabi":
> libc = bb.utils.contains('TUNE_FEATURES', 'callconvention-hard',
> 'hf', '', d)
> +elif os == "linux-gnux32" or os == "linux-muslx32":
> +libc = ""
> elif "musl" in os:
> libc = "-musl"
> os = "linux"
> --
> 2.43.0
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191728):
https://lists.openembedded.org/g/openembedded-core/message/191728
Mute This Topic: https://lists.openembedded.org/mt/102928304/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] openssh: Add SSHD_SERVICE_TYPE variable
From: Mingli Yu
There are two types of sshd server now, one is based on socket
activation(sshd.socket) and another is service activation(sshd.service).
And the default sshd service type is based on socket by default as below.
# systemctl status sshd.socket
* sshd.socket
Loaded: loaded (/lib/systemd/system/sshd.socket; enabled; preset: enabled)
Active: active (listening) since Mon 2023-12-04 08:34:33 UTC; 22s ago
Listen: [::]:22 (Stream)
Accepted: 0; Connected: 0;
Process: 228 ExecStartPre=/bin/mkdir -p /var/run/sshd (code=exited,
status=0/SUCCESS)
Tasks: 0 (limit: 263)
Memory: 84.0K
CGroup: /system.slice/sshd.socket
Dec 04 08:34:33 qemux86-64 systemd[1]: Starting sshd.socket...
Dec 04 08:34:33 qemux86-64 systemd[1]: Listening on sshd.socket.
And use can switch to service activation if they want as below after
the device boot up.
# systemctl disable sshd.socket
Removed "/etc/systemd/system/sockets.target.wants/sshd.socket".
# systemctl stop sshd.socket
# systemctl start sshd.service
# systemctl status sshd.service
* sshd.service - OpenSSH server daemon
Loaded: loaded (/lib/systemd/system/sshd.service; enabled; preset: enabled)
Active: active (running) since Mon 2023-12-04 08:48:14 UTC; 53s ago
Process: 390 ExecStartPre=/bin/mkdir -p /var/run/sshd (code=exited,
status=0/SUCCESS)
Main PID: 391 (sshd)
Tasks: 1 (limit: 263)
Memory: 2.1M
CGroup: /system.slice/sshd.service
`-391 "sshd: /usr/sbin/sshd -D [listener] 0 of 10-100 startups"
Dec 04 08:48:14 qemux86-64 systemd[1]: Starting OpenSSH server daemon...
Dec 04 08:48:14 qemux86-64 systemd[1]: Started OpenSSH server daemon.
Dec 04 08:48:14 qemux86-64 sshd[391]: Server listening on 0.0.0.0 port 22.
Dec 04 08:48:14 qemux86-64 sshd[391]: Server listening on :: port 22.
But it's more convenient to determine the service type at build time
if there are so many devices.
So add SSHD_SERVICE_TYPE variable to enable sshd.socket or sshd.service
at build time and we still enable sshd.socket by default now.
Signed-off-by: Mingli Yu
---
.../openssh/openssh_9.5p1.bb | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
index bbb8fb091a..6a603cd12d 100644
--- a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
@@ -50,7 +50,7 @@ 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('SSHD_SERVICE_TYPE', '1',
'sshd.service', 'sshd.socket', d)}"
inherit autotools-brokensep ptest pkgconfig
DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '',
d)}"
@@ -125,15 +125,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('SSHD_SERVICE_TYPE','1','true','false',d)}; then
+ install -c -m 0644 ${WORKDIR}/sshd.service
${D}${systemd_system_unitdir}
+ else
+ 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
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 (#191727):
https://lists.openembedded.org/g/openembedded-core/message/191727
Mute This Topic:
[OE-core] [PATCH v1] documentation.conf: fix do_menuconfig description
From: Joao Marcos Costa The current description is only pertinent to the kernel, even though do_menuconfig task is used by other projects, such as Busybox and U-Boot. Replace "for the kernel" by an agnostic alternative (i.e., "in the compilation directory"). Signed-off-by: Joao Marcos Costa --- meta/conf/documentation.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index ab2addb321..05e4b8bc7f 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf @@ -28,7 +28,7 @@ do_kernel_configcheck[doc] = "Validates the kernel configuration for a linux-yoc do_kernel_configme[doc] = "Assembles the kernel configuration for a linux-yocto style kernel" do_kernel_link_images[doc] = "Creates a symbolic link in arch/$arch/boot for vmlinux and vmlinuz kernel images" do_listtasks[doc] = "Lists all defined tasks for a target" -do_menuconfig[doc] = "Runs 'make menuconfig' for the kernel" +do_menuconfig[doc] = "Runs 'make menuconfig' in the compilation directory" do_package[doc] = "Analyzes the content of the holding area and splits it into subsets based on available packages and files" do_package_index[doc] = "Creates or updates the index in the Package Feed area" do_package_qa[doc] = "Runs QA checks on packaged files" -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191726): https://lists.openembedded.org/g/openembedded-core/message/191726 Mute This Topic: https://lists.openembedded.org/mt/102895214/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
