Re: [OE-core] [PATCH] insane.bbclass: Skip patches not in oe-core by full path in do_qa_patch
ping -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169273): https://lists.openembedded.org/g/openembedded-core/message/169273 Mute This Topic: https://lists.openembedded.org/mt/92907002/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [kirkstone][PATCH] u-boot: fix CVE-2022-33103
On 2022-08-10 12:30, Steve Sakoman wrote: [Please note: This e-mail is from an EXTERNAL e-mail address] On Wed, Aug 10, 2022 at 5:35 AM Sakib Sajal wrote: Steve, did you miss this patch? I did :-( I've got it now. Sorry about that. No worries! :) Steve On 2022-07-26 15:18, Sakib Sajal wrote: Backport patch to resolve CVE-2022-33103. Signed-off-by: Sakib Sajal --- ..._read-Prevent-arbitrary-code-executi.patch | 80 +++ meta/recipes-bsp/u-boot/u-boot_2022.01.bb | 1 + 2 files changed, 81 insertions(+) create mode 100644 meta/recipes-bsp/u-boot/files/0001-fs-squashfs-sqfs_read-Prevent-arbitrary-code-executi.patch diff --git a/meta/recipes-bsp/u-boot/files/0001-fs-squashfs-sqfs_read-Prevent-arbitrary-code-executi.patch b/meta/recipes-bsp/u-boot/files/0001-fs-squashfs-sqfs_read-Prevent-arbitrary-code-executi.patch new file mode 100644 index 00..b1650f6baa --- /dev/null +++ b/meta/recipes-bsp/u-boot/files/0001-fs-squashfs-sqfs_read-Prevent-arbitrary-code-executi.patch @@ -0,0 +1,80 @@ +From 65f1066f5abe291c7b10b6075fd60776074a38a9 Mon Sep 17 00:00:00 2001 +From: Miquel Raynal +Date: Thu, 9 Jun 2022 16:02:06 +0200 +Subject: [PATCH] fs/squashfs: sqfs_read: Prevent arbitrary code execution + +Following Jincheng's report, an out-of-band write leading to arbitrary +code execution is possible because on one side the squashfs logic +accepts directory names up to 65535 bytes (u16), while U-Boot fs logic +accepts directory names up to 255 bytes long. + +Prevent such an exploit from happening by capping directory name sizes +to 255. Use a define for this purpose so that developers can link the +limitation to its source and eventually kill it some day by dynamically +allocating this array (if ever desired). + +Link: https://lore.kernel.org/all/CALO=dhfb+yboxxvr5kcsk0ifdg+e7ywko4-e+72kjbcs8jb...@mail.gmail.com +Reported-by: Jincheng Wang +Signed-off-by: Miquel Raynal +Tested-by: Jincheng Wang + +CVE: CVE-2022-33103 +Upstream-Status: Backport [2ac0baab4aff1a0b45067d0b62f00c15f4e86856] + +Signed-off-by: Sakib Sajal +--- + fs/squashfs/sqfs.c | 8 +--- + include/fs.h | 4 +++- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c +index e2d91c654c..a145d754cc 100644 +--- a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c +@@ -973,6 +973,7 @@ int sqfs_readdir(struct fs_dir_stream *fs_dirs, struct fs_dirent **dentp) + int i_number, offset = 0, ret; + struct fs_dirent *dent; + unsigned char *ipos; ++u16 name_size; + + dirs = (struct squashfs_dir_stream *)fs_dirs; + if (!dirs->size) { +@@ -1055,9 +1056,10 @@ int sqfs_readdir(struct fs_dir_stream *fs_dirs, struct fs_dirent **dentp) + return -SQFS_STOP_READDIR; + } + +-/* Set entry name */ +-strncpy(dent->name, dirs->entry->name, dirs->entry->name_size + 1); +-dent->name[dirs->entry->name_size + 1] = '\0'; ++/* Set entry name (capped at FS_DIRENT_NAME_LEN which is a U-Boot limitation) */ ++name_size = min_t(u16, dirs->entry->name_size + 1, FS_DIRENT_NAME_LEN - 1); ++strncpy(dent->name, dirs->entry->name, name_size); ++dent->name[name_size] = '\0'; + + offset = dirs->entry->name_size + 1 + SQFS_ENTRY_BASE_LENGTH; + dirs->entry_count--; +diff --git a/include/fs.h b/include/fs.h +index 1c79e299fd..6cb7ec89f4 100644 +--- a/include/fs.h b/include/fs.h +@@ -161,6 +161,8 @@ int fs_write(const char *filename, ulong addr, loff_t offset, loff_t len, + #define FS_DT_REG 8 /* regular file */ + #define FS_DT_LNK 10/* symbolic link */ + ++#define FS_DIRENT_NAME_LEN 256 ++ + /** + * struct fs_dirent - directory entry + * +@@ -181,7 +183,7 @@ struct fs_dirent { + /** change_time:time of last modification */ + struct rtc_time change_time; + /** name: file name */ +-char name[256]; ++char name[FS_DIRENT_NAME_LEN]; + }; + + /* Note: fs_dir_stream should be treated as opaque to the user of fs layer */ +-- +2.33.0 + diff --git a/meta/recipes-bsp/u-boot/u-boot_2022.01.bb b/meta/recipes-bsp/u-boot/u-boot_2022.01.bb index f2443723e2..a6a15d698f 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2022.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2022.01.bb @@ -4,6 +4,7 @@ require u-boot.inc SRC_URI:append = " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch \ file://0001-riscv-fix-build-with-binutils-2.38.patch \ file://0001-i2c-fix-stack-buffer-overflow-vulnerability-in-i2c-m.patch \ + file://0001-fs-squashfs-sqfs_read-Prevent-arbitrary-code-executi.patch \ " DEPENDS += "bc-native dtc-native python3-setuptools-native" -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169272): https://lists.openembedded.org/g/openembedded-core/message/169272 Mute This Topic:
Re: [OE-core] [PATCH v2 1/1] ltp: Add post release runtime fixes
Hi Richard, Khem, > > > +[ upstream status: bda92ad659a52d38ac810099f69adff626b064c6 ] > > Thanks for these. I did merge them, I just wanted to note that in > future the format for upstream status is: > > Upstream-Status: Backport [bda92ad659a52d38ac810099f69adff626b064c6] > > We have code that uses these so the format is standardised. I fixed the > ones in this series up manually. > Thanks a lot! I'll take care next time. Kind regards, Petr > > Cheers, > > Richard > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169271): https://lists.openembedded.org/g/openembedded-core/message/169271 Mute This Topic: https://lists.openembedded.org/mt/92574361/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] json-c: Add ptest for json-c
Hi, thanks for asking this, I started qemu by using runqemu directly and without any further arguments. With kvm the test took around 20 seconds. I'll send a new patch with adding json-c-ptest to PTEST_SLOW. Simone On Thu, 2022-08-11 at 17:41 +0200, Alexander Kanavin wrote: > CAUTION: This email originated from outside of the Elektrobit > organization. Do not click links or open attachments unless you > recognize the sender and know the content is safe. > > > Just to be sure, did you use qemu with kvm option? I find it odd that > json library tests would take this long. Can you double check what > they do? We can't afford to extend ptest run time indefinitely, it's > already close to 4 hours. > > Alex > > On Thu, 11 Aug 2022 at 17:26, Weiß, Simone < > simone.we...@elektrobit.com> wrote: > > Hi, > > > > For me it took around ~500 seconds. I considered it as slow, as > > `PTESTS_FAST` should take around ~30 seconds according to the > > comment > > on ptest-packagelists.inc. > > > > Simone > > On Thu, 2022-08-11 at 10:23 +0200, Alexander Kanavin via > > lists.openembedded.org wrote: > > > CAUTION: This email originated from outside of the Elektrobit > > > organization. Do not click links or open attachments unless you > > > recognize the sender and know the content is safe. > > > > > > > > > On Wed, 10 Aug 2022 at 21:40, Simone Weiss < > > > simone.we...@elektrobit.com> wrote: > > > > --- a/meta/conf/distro/include/ptest-packagelists.inc > > > > +++ b/meta/conf/distro/include/ptest-packagelists.inc > > > > @@ -87,6 +87,7 @@ PTESTS_SLOW = "\ > > > > findutils-ptest \ > > > > glib-2.0-ptest \ > > > > gstreamer1.0-ptest \ > > > > +json-c-ptest \ > > > > libevent-ptest \ > > > > libgcrypt-ptest \ > > > > lttng-tools-ptest \ > > > > > > How long do the tests take to execute? Do they have to be added > > > to > > > the > > > slow list? > > > > > > Alex > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169270): https://lists.openembedded.org/g/openembedded-core/message/169270 Mute This Topic: https://lists.openembedded.org/mt/92944223/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] weston: exclude pre-releases from version check
Signed-off-by: Alexander Kanavin --- meta/recipes-graphics/wayland/weston_10.0.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/wayland/weston_10.0.2.bb b/meta/recipes-graphics/wayland/weston_10.0.2.bb index f81a33fd1e..786d12be61 100644 --- a/meta/recipes-graphics/wayland/weston_10.0.2.bb +++ b/meta/recipes-graphics/wayland/weston_10.0.2.bb @@ -16,6 +16,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo SRC_URI[sha256sum] = "89646ca0d9f8d413c2767e5c3828eaa3fa149c2a105b3729a6894fa7cf1549e7" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html; +UPSTREAM_CHECK_REGEX = "weston-(?P\d+\.\d+\.(?!9\d+)\d+)" inherit meson pkgconfig useradd -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169269): https://lists.openembedded.org/g/openembedded-core/message/169269 Mute This Topic: https://lists.openembedded.org/mt/92966274/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 6/7] patchelf: replace a rejected patch with an equivalent uninative.bbclass tweak
This was the original reason to add the patch: https://git.openembedded.org/openembedded-core/commit/?id=18efcbcb896239c64fedd009ce57f3f0c668cbc0 and this is the upstream discussion which suggests handling read-only files explicitly outside of patchelf: https://github.com/NixOS/patchelf/pull/89 Signed-off-by: Alexander Kanavin --- meta/classes/uninative.bbclass| 2 + .../patchelf/handle-read-only-files.patch | 63 --- .../patchelf/patchelf_0.15.0.bb | 1 - 3 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 6a9e862bcd..7f0591d49a 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -167,5 +167,7 @@ python uninative_changeinterp () { if not elf.isDynamic(): continue +os.chmod(f, s[stat.ST_MODE] | stat.S_IWUSR) subprocess.check_output(("patchelf-uninative", "--set-interpreter", d.getVar("UNINATIVE_LOADER"), f), stderr=subprocess.STDOUT) +os.chmod(f, s[stat.ST_MODE]) } diff --git a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch b/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch deleted file mode 100644 index 76ad8d9d4d..00 --- a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 38b3d65f4a79d39ad9cdf841f2b3b29fd0c961ca Mon Sep 17 00:00:00 2001 -From: Fabio Berton -Date: Fri, 9 Sep 2016 16:00:42 -0300 -Subject: [PATCH] handle read-only files - -Patch from: -https://github.com/darealshinji/patchelf/commit/40e66392bc4b96e9b4eda496827d26348a503509 - -Upstream-Status: Denied [https://github.com/NixOS/patchelf/pull/89] - -Signed-off-by: Fabio Berton - src/patchelf.cc | 18 +- - 1 file changed, 13 insertions(+), 5 deletions(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 49accae..fb6c7ed 100644 a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -378,8 +378,16 @@ void ElfFile::sortShdrs() - - static void writeFile(const std::string & fileName, const FileContents & contents) - { -+struct stat st; -+ - debug("writing %s\n", fileName.c_str()); - -+if (stat(fileName.c_str(), ) != 0) -+error("stat"); -+ -+if (chmod(fileName.c_str(), 0600) != 0) -+error("chmod"); -+ - int fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0777); - if (fd == -1) - error("open"); -@@ -395,8 +403,6 @@ static void writeFile(const std::string & fileName, const FileContents & content - bytesWritten += portion; - } - --if (close(fd) >= 0) --return; - /* - * Just ignore EINTR; a retry loop is the wrong thing to do. - * -@@ -405,9 +411,11 @@ static void writeFile(const std::string & fileName, const FileContents & content - * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR - * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain - */ --if (errno == EINTR) --return; --error("close"); -+if ((close(fd) < 0) && errno != EINTR) -+error("close"); -+ -+if (chmod(fileName.c_str(), st.st_mode) != 0) -+error("chmod"); - } - - --- -2.30.2 - diff --git a/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb b/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb index 389a0a9f40..e07775f574 100644 --- a/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb +++ b/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb @@ -5,7 +5,6 @@ HOMEPAGE = "https://github.com/NixOS/patchelf; LICENSE = "GPL-3.0-only" SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \ - file://handle-read-only-files.patch \ " SRCREV = "49008002562355b0e35075cbc1c42c645ff04e28" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169268): https://lists.openembedded.org/g/openembedded-core/message/169268 Mute This Topic: https://lists.openembedded.org/mt/92966273/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 5/7] patchelf: update 0.14.5 -> 0.15.0
Rebase handle-read-only-files.patch Signed-off-by: Alexander Kanavin --- .../patchelf/handle-read-only-files.patch | 30 +-- ...{patchelf_0.14.5.bb => patchelf_0.15.0.bb} | 2 +- 2 files changed, 15 insertions(+), 17 deletions(-) rename meta/recipes-devtools/patchelf/{patchelf_0.14.5.bb => patchelf_0.15.0.bb} (91%) diff --git a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch b/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch index b755a263a4..76ad8d9d4d 100644 --- a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch +++ b/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch @@ -1,4 +1,4 @@ -From 682fb48c137b687477008b68863c2a0b73ed47d1 Mon Sep 17 00:00:00 2001 +From 38b3d65f4a79d39ad9cdf841f2b3b29fd0c961ca Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Fri, 9 Sep 2016 16:00:42 -0300 Subject: [PATCH] handle read-only files @@ -9,37 +9,32 @@ https://github.com/darealshinji/patchelf/commit/40e66392bc4b96e9b4eda496827d2634 Upstream-Status: Denied [https://github.com/NixOS/patchelf/pull/89] Signed-off-by: Fabio Berton - --- - src/patchelf.cc | 16 +++- - 1 file changed, 15 insertions(+), 1 deletion(-) + src/patchelf.cc | 18 +- + 1 file changed, 13 insertions(+), 5 deletions(-) -Index: git/src/patchelf.cc -=== git.orig/src/patchelf.cc -+++ git/src/patchelf.cc -@@ -534,9 +534,19 @@ void ElfFile::sortShd +diff --git a/src/patchelf.cc b/src/patchelf.cc +index 49accae..fb6c7ed 100644 +--- a/src/patchelf.cc b/src/patchelf.cc +@@ -378,8 +378,16 @@ void ElfFile::sortShdrs() static void writeFile(const std::string & fileName, const FileContents & contents) { +struct stat st; -+int fd; + debug("writing %s\n", fileName.c_str()); --int fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777); +if (stat(fileName.c_str(), ) != 0) +error("stat"); + +if (chmod(fileName.c_str(), 0600) != 0) +error("chmod"); + -+fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777); -+ + int fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0777); if (fd == -1) error("open"); - -@@ -551,8 +561,6 @@ static void writeFile(const std::string +@@ -395,8 +403,6 @@ static void writeFile(const std::string & fileName, const FileContents & content bytesWritten += portion; } @@ -48,7 +43,7 @@ Index: git/src/patchelf.cc /* * Just ignore EINTR; a retry loop is the wrong thing to do. * -@@ -561,9 +569,11 @@ static void writeFile(const std::string +@@ -405,9 +411,11 @@ static void writeFile(const std::string & fileName, const FileContents & content * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain */ @@ -63,3 +58,6 @@ Index: git/src/patchelf.cc } +-- +2.30.2 + diff --git a/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb b/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb similarity index 91% rename from meta/recipes-devtools/patchelf/patchelf_0.14.5.bb rename to meta/recipes-devtools/patchelf/patchelf_0.15.0.bb index 0fa2c00f1d..389a0a9f40 100644 --- a/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb +++ b/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb @@ -7,7 +7,7 @@ LICENSE = "GPL-3.0-only" SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \ file://handle-read-only-files.patch \ " -SRCREV = "a35054504293f9ff64539850d1ed0bfd2f5399f2" +SRCREV = "49008002562355b0e35075cbc1c42c645ff04e28" S = "${WORKDIR}/git" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169267): https://lists.openembedded.org/g/openembedded-core/message/169267 Mute This Topic: https://lists.openembedded.org/mt/92966270/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] weston: upgrade 10.0.1 -> 10.0.2
Drop dont-use-plane-add-prop.patch as issue is fixed elsewhere (see the link in the patch). Signed-off-by: Alexander Kanavin --- .../weston/dont-use-plane-add-prop.patch | 32 --- .../{weston_10.0.1.bb => weston_10.0.2.bb}| 4 +-- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch rename meta/recipes-graphics/wayland/{weston_10.0.1.bb => weston_10.0.2.bb} (97%) diff --git a/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch b/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch deleted file mode 100644 index 1ac0695222..00 --- a/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ece4c3d261aeec230869c0304ed1011ff6837c16 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 12 Sep 2020 14:04:04 -0700 -Subject: [PATCH] Fix atomic modesetting with musl - -atomic modesetting seems to fail with drm weston backend and this patch fixes -it, below errors are seen before weston exits - -atomic: couldn't commit new state: Invalid argument - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158] -Signed-off-by: Khem Raj - - libweston/backend-drm/kms.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c -index 780d007..9994da1 100644 a/libweston/backend-drm/kms.c -+++ b/libweston/backend-drm/kms.c -@@ -1142,8 +1142,8 @@ drm_pending_state_apply_atomic(struct drm_pending_state *pending_state, - wl_list_for_each(plane, >plane_list, link) { - drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n", - (unsigned long) plane->plane_id); -- plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); -- plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); -+ //plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); -+ //plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); - } - - flags |= DRM_MODE_ATOMIC_ALLOW_MODESET; diff --git a/meta/recipes-graphics/wayland/weston_10.0.1.bb b/meta/recipes-graphics/wayland/weston_10.0.2.bb similarity index 97% rename from meta/recipes-graphics/wayland/weston_10.0.1.bb rename to meta/recipes-graphics/wayland/weston_10.0.2.bb index e27dac164e..f81a33fd1e 100644 --- a/meta/recipes-graphics/wayland/weston_10.0.1.bb +++ b/meta/recipes-graphics/wayland/weston_10.0.2.bb @@ -13,9 +13,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo file://systemd-notify.weston-start \ " -SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch " - -SRC_URI[sha256sum] = "8a9e52506a865a7410981b04f8341b89b84106db8531ab1f9fdd37b5dc034115" +SRC_URI[sha256sum] = "89646ca0d9f8d413c2767e5c3828eaa3fa149c2a105b3729a6894fa7cf1549e7" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html; -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169266): https://lists.openembedded.org/g/openembedded-core/message/169266 Mute This Topic: https://lists.openembedded.org/mt/92966269/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/7] cmake: update 3.23.2 -> 3.24.0
License-Update: additional copyright holders Signed-off-by: Alexander Kanavin --- .../cmake/{cmake-native_3.23.2.bb => cmake-native_3.24.0.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 4 ++-- .../cmake/{cmake_3.23.2.bb => cmake_3.24.0.bb}| 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/cmake/{cmake-native_3.23.2.bb => cmake-native_3.24.0.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.23.2.bb => cmake_3.24.0.bb} (100%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.23.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.24.0.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.23.2.bb rename to meta/recipes-devtools/cmake/cmake-native_3.24.0.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 4a6884e871..d64afffdc1 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.cmake.org/; BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php; SECTION = "console/utils" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=f2102a52df7aa592cf072180e7ebc8c7 \ +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=45025187a129339459b6f1a24f7fac6e \ file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ " @@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "f316b40053466f9a416adf981efda41b160ca859e97f6a484b447ea299ff26aa" +SRC_URI[sha256sum] = "c2b61f7cdecb1576cad25f918a8f42b8685d88a832fd4b62b9e0fa32e915a658" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake_3.23.2.bb b/meta/recipes-devtools/cmake/cmake_3.24.0.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.23.2.bb rename to meta/recipes-devtools/cmake/cmake_3.24.0.bb -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169265): https://lists.openembedded.org/g/openembedded-core/message/169265 Mute This Topic: https://lists.openembedded.org/mt/92966268/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] rust: update 1.62.0 -> 1.62.1
Signed-off-by: Alexander Kanavin --- .../recipes-devtools/cargo/{cargo_1.62.0.bb => cargo_1.62.1.bb} | 0 .../rust/{libstd-rs_1.62.0.bb => libstd-rs_1.62.1.bb} | 0 ...t-cross-canadian_1.62.0.bb => rust-cross-canadian_1.62.1.bb} | 0 .../rust/{rust-llvm_1.62.0.bb => rust-llvm_1.62.1.bb} | 0 meta/recipes-devtools/rust/rust-source.inc | 2 +- meta/recipes-devtools/rust/{rust_1.62.0.bb => rust_1.62.1.bb} | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/cargo/{cargo_1.62.0.bb => cargo_1.62.1.bb} (100%) rename meta/recipes-devtools/rust/{libstd-rs_1.62.0.bb => libstd-rs_1.62.1.bb} (100%) rename meta/recipes-devtools/rust/{rust-cross-canadian_1.62.0.bb => rust-cross-canadian_1.62.1.bb} (100%) rename meta/recipes-devtools/rust/{rust-llvm_1.62.0.bb => rust-llvm_1.62.1.bb} (100%) rename meta/recipes-devtools/rust/{rust_1.62.0.bb => rust_1.62.1.bb} (100%) diff --git a/meta/recipes-devtools/cargo/cargo_1.62.0.bb b/meta/recipes-devtools/cargo/cargo_1.62.1.bb similarity index 100% rename from meta/recipes-devtools/cargo/cargo_1.62.0.bb rename to meta/recipes-devtools/cargo/cargo_1.62.1.bb diff --git a/meta/recipes-devtools/rust/libstd-rs_1.62.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.62.1.bb similarity index 100% rename from meta/recipes-devtools/rust/libstd-rs_1.62.0.bb rename to meta/recipes-devtools/rust/libstd-rs_1.62.1.bb diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.62.0.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.62.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-cross-canadian_1.62.0.bb rename to meta/recipes-devtools/rust/rust-cross-canadian_1.62.1.bb diff --git a/meta/recipes-devtools/rust/rust-llvm_1.62.0.bb b/meta/recipes-devtools/rust/rust-llvm_1.62.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-llvm_1.62.0.bb rename to meta/recipes-devtools/rust/rust-llvm_1.62.1.bb diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index b814574e55..dbcef2cbc2 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -1,5 +1,5 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust; -SRC_URI[rust.sha256sum] = "6c00ef115c894c2645e60b5049a4f5dacf1dc0c993f3074f7ae4fdf4c755dd5e" +SRC_URI[rust.sha256sum] = "02066a93c2f6596cc046a897d5716c86e3607c1cd0f54db9a867ae8c8265072e" SRC_URI:append:class-target:pn-rust = " file://hardcodepaths.patch" SRC_URI:append:class-nativesdk:pn-nativesdk-rust = " file://hardcodepaths.patch" diff --git a/meta/recipes-devtools/rust/rust_1.62.0.bb b/meta/recipes-devtools/rust/rust_1.62.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust_1.62.0.bb rename to meta/recipes-devtools/rust/rust_1.62.1.bb -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169264): https://lists.openembedded.org/g/openembedded-core/message/169264 Mute This Topic: https://lists.openembedded.org/mt/92966267/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/7] dropbear: merge .inc into .bb
Signed-off-by: Alexander Kanavin --- meta/recipes-core/dropbear/dropbear.inc | 128 - .../recipes-core/dropbear/dropbear_2022.82.bb | 129 +- 2 files changed, 128 insertions(+), 129 deletions(-) delete mode 100644 meta/recipes-core/dropbear/dropbear.inc diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc deleted file mode 100644 index e170587d08..00 --- a/meta/recipes-core/dropbear/dropbear.inc +++ /dev/null @@ -1,128 +0,0 @@ -SUMMARY = "A lightweight SSH and SCP implementation" -HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html; -DESCRIPTION = "Dropbear is a relatively small SSH server and client. It runs on a variety of POSIX-based platforms. Dropbear is open source software, distributed under a MIT-style license. Dropbear is particularly useful for "embedded"-type Linux (or other Unix) systems, such as wireless routers." -SECTION = "console/network" - -# some files are from other projects and have others license terms: -# public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY -LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=25cf44512b7bc8966a48b6b1a9b7605f" - -DEPENDS = "zlib virtual/crypt" -RPROVIDES:${PN} = "ssh sshd" -RCONFLICTS:${PN} = "openssh-sshd openssh" - -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" - -SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ - file://0001-urandom-xauth-changes-to-options.h.patch \ - file://init \ - file://dropbearkey.service \ - file://dropbear@.service \ - file://dropbear.socket \ - file://dropbear.default \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} " - -PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ - file://0006-dropbear-configuration-file.patch \ - file://dropbear" - -PAM_PLUGINS = "libpam-runtime \ - pam-plugin-deny \ - pam-plugin-permit \ - pam-plugin-unix \ - " -RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" - -inherit autotools update-rc.d systemd - -CVE_PRODUCT = "dropbear_ssh" - -INITSCRIPT_NAME = "dropbear" -INITSCRIPT_PARAMS = "defaults 10" - -SYSTEMD_SERVICE:${PN} = "dropbear.socket" - -SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" -BINCOMMANDS = "dbclient ssh scp" -EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' - -PACKAGECONFIG ?= "disable-weak-ciphers" -PACKAGECONFIG[system-libtom] = "--disable-bundled-libtom,--enable-bundled-libtom,libtommath libtomcrypt" -PACKAGECONFIG[disable-weak-ciphers] = "" - -EXTRA_OECONF += "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" - -# This option appends to CFLAGS and LDFLAGS from OE -# This is causing [textrel] QA warning -EXTRA_OECONF += "--disable-harden" - -# musl does not implement wtmp/logwtmp APIs -EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog" - -do_install() { - install -d ${D}${sysconfdir} \ - ${D}${sysconfdir}/init.d \ - ${D}${sysconfdir}/default \ - ${D}${sysconfdir}/dropbear \ - ${D}${bindir} \ - ${D}${sbindir} \ - ${D}${localstatedir} - - install -m 0644 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear - - install -m 0755 dropbearmulti ${D}${sbindir}/ - - for i in ${BINCOMMANDS} - do - # ssh and scp symlinks are created by update-alternatives - if [ $i = ssh ] || [ $i = scp ]; then continue; fi - ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i - done - for i in ${SBINCOMMANDS} - do - ln -s ./dropbearmulti ${D}${sbindir}/$i - done - sed -e 's,/etc,${sysconfdir},g' \ - -e 's,/usr/sbin,${sbindir},g' \ - -e 's,/var,${localstatedir},g' \ - -e 's,/usr/bin,${bindir},g' \ - -e 's,/usr,${prefix},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/dropbear - chmod 755 ${D}${sysconfdir}/init.d/dropbear - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then - install -d ${D}${sysconfdir}/pam.d - install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/ - fi - - # deal with systemd unit files - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_system_unitdir} - sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ -
Re: [OE-core][PATCH] module.bbclass: rebuild the modules when kernel change
On Thu, Aug 11, 2022 at 1:26 PM Jose Quaresma wrote: > > > > Bruce Ashfield escreveu no dia quinta, 11/08/2022 > à(s) 18:06: >> >> On Thu, Aug 11, 2022 at 12:18 PM Jose Quaresma >> wrote: >> > >> > When the kernel is rebuild or some of they tasks change the >> > kernel modules is not rebuild as well and will comes from >> > the sstate-cache. >> > >> > [YOCTO #14885] https://bugzilla.yoctoproject.org/show_bug.cgi?id=14885 >> > >> > Signed-off-by: Jose Quaresma >> > --- >> > meta/classes/module.bbclass | 2 ++ >> > 1 file changed, 2 insertions(+) >> > >> > diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass >> > index a09ec3ed1e..d377a08bc6 100644 >> > --- a/meta/classes/module.bbclass >> > +++ b/meta/classes/module.bbclass >> > @@ -1,5 +1,7 @@ >> > inherit module-base kernel-module-split pkgconfig >> > >> > +DEPENDS += "virtual/kernel" >> >> There's already a dependency on virtual/kernel:do_shared_workdir() through >> module-base.bbclass and the make-mod-scripts dependency. > > > I know that and imo the make-mod-scripts need to be cleaned up a bit as well > It is compile the the code do_configure and as a dependency in > "virtual/kernel:do_compile_kernelmodules" Right. It doesn't save much, but being able to start dependent tasks even that bit sooner has proven to be a win. We get plenty of complaints about the kernel being a bottleneck, which is what lead to the finer dependency. > for they do_compile anyway this is another history and I will submit some > patch when finished. > Another thing that I have in my mind is to make the make-mod-scripts a > native recipe because they > don't build anything for the target. > make-mod-scripts is a bit strange indeed, it sits somewhere in the middle, it does use the target compiler, etc, for some tests that the kernel fires as part of even the scripts and preparation. Which is why it hasn't been -native only up until now .. it isn't out of the question that we could use it in more of a cross friendly way (there are some really old bugs/enhancements around that topic). It might be worth a try, but if it isn't breaking anything .. I tread very carefully around the kernel dependencies, shared-workdir and the scripts. We've had many subtle race conditions and other hard to debug issues. >> >> >> And that dependency was a change to this: >> >> -# This is instead of DEPENDS = "virtual/kernel" >> -do_configure[depends] += "virtual/kernel:do_compile_kernelmodules" >> >> i.e. we've always had a finer grained dependency than what is being >> proposed here. >> >> We need to understand why that shared_workdir() dependency isn't >> doing the job any more, and if there's no way to fix it .. then going back >> to the older compile dependency is still lighter weight than depending >> on virtual/kernel (and the default of do_prepare_recipe_sysroot). > > > I can do another round in order to change another task, other than the > shared_workdir, > that I think will do the same i.e: get the modules from the sstate-cache. > I suspect this is unrelated to the task shared_workdir. > > Thanks for the feedback and your time. I can dig into it more as well, I'll see what I can find in some local builds. Bruce > > Jose > >> >> >> It must (could?) be something with the shared workdir changing the >> interactions. >> >> Bruce >> >> > + >> > EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}" >> > >> > MODULES_INSTALL_TARGET ?= "modules_install" >> > -- >> > 2.37.1 >> > >> > >> > >> > >> >> >> -- >> - Thou shalt not follow the NULL pointer, for chaos and madness await >> thee at its end >> - "Use the force Harry" - Gandalf, Star Trek II > > > > -- > Best regards, > > José Quaresma -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169262): https://lists.openembedded.org/g/openembedded-core/message/169262 Mute This Topic: https://lists.openembedded.org/mt/92962048/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] module.bbclass: rebuild the modules when kernel change
Em qui., 11 de ago. de 2022 às 14:06, Bruce Ashfield < bruce.ashfi...@gmail.com> escreveu: > On Thu, Aug 11, 2022 at 12:18 PM Jose Quaresma > wrote: > > > > When the kernel is rebuild or some of they tasks change the > > kernel modules is not rebuild as well and will comes from > > the sstate-cache. > > > > [YOCTO #14885] https://bugzilla.yoctoproject.org/show_bug.cgi?id=14885 > > > > Signed-off-by: Jose Quaresma > > --- > > meta/classes/module.bbclass | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass > > index a09ec3ed1e..d377a08bc6 100644 > > --- a/meta/classes/module.bbclass > > +++ b/meta/classes/module.bbclass > > @@ -1,5 +1,7 @@ > > inherit module-base kernel-module-split pkgconfig > > > > +DEPENDS += "virtual/kernel" > > There's already a dependency on virtual/kernel:do_shared_workdir() through > module-base.bbclass and the make-mod-scripts dependency. > > And that dependency was a change to this: > > -# This is instead of DEPENDS = "virtual/kernel" > -do_configure[depends] += "virtual/kernel:do_compile_kernelmodules" > > i.e. we've always had a finer grained dependency than what is being > proposed here. > > We need to understand why that shared_workdir() dependency isn't > doing the job any more, and if there's no way to fix it .. then going back > to the older compile dependency is still lighter weight than depending > on virtual/kernel (and the default of do_prepare_recipe_sysroot). > > It must (could?) be something with the shared workdir changing the > interactions. > Good catch; this really seems strange. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169261): https://lists.openembedded.org/g/openembedded-core/message/169261 Mute This Topic: https://lists.openembedded.org/mt/92962048/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] module.bbclass: rebuild the modules when kernel change
Bruce Ashfield escreveu no dia quinta, 11/08/2022 à(s) 18:06: > On Thu, Aug 11, 2022 at 12:18 PM Jose Quaresma > wrote: > > > > When the kernel is rebuild or some of they tasks change the > > kernel modules is not rebuild as well and will comes from > > the sstate-cache. > > > > [YOCTO #14885] https://bugzilla.yoctoproject.org/show_bug.cgi?id=14885 > > > > Signed-off-by: Jose Quaresma > > --- > > meta/classes/module.bbclass | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass > > index a09ec3ed1e..d377a08bc6 100644 > > --- a/meta/classes/module.bbclass > > +++ b/meta/classes/module.bbclass > > @@ -1,5 +1,7 @@ > > inherit module-base kernel-module-split pkgconfig > > > > +DEPENDS += "virtual/kernel" > > There's already a dependency on virtual/kernel:do_shared_workdir() through > module-base.bbclass and the make-mod-scripts dependency. > I know that and imo the make-mod-scripts need to be cleaned up a bit as well It is compile the the code do_configure and as a dependency in "virtual/kernel:do_compile_kernelmodules" for they do_compile anyway this is another history and I will submit some patch when finished. Another thing that I have in my mind is to make the make-mod-scripts a native recipe because they don't build anything for the target. > > And that dependency was a change to this: > > -# This is instead of DEPENDS = "virtual/kernel" > -do_configure[depends] += "virtual/kernel:do_compile_kernelmodules" > > i.e. we've always had a finer grained dependency than what is being > proposed here. > > We need to understand why that shared_workdir() dependency isn't > doing the job any more, and if there's no way to fix it .. then going back > to the older compile dependency is still lighter weight than depending > on virtual/kernel (and the default of do_prepare_recipe_sysroot). > I can do another round in order to change another task, other than the shared_workdir, that I think will do the same i.e: get the modules from the sstate-cache. I suspect this is unrelated to the task shared_workdir. Thanks for the feedback and your time. Jose > > It must (could?) be something with the shared workdir changing the > interactions. > > Bruce > > > + > > EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}" > > > > MODULES_INSTALL_TARGET ?= "modules_install" > > -- > > 2.37.1 > > > > > > > > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II > -- Best regards, José Quaresma -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169260): https://lists.openembedded.org/g/openembedded-core/message/169260 Mute This Topic: https://lists.openembedded.org/mt/92962048/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v4] glibc: Bump to 2.36
fix new upstream build issue with DEBUG_BUILD build Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- v3: Rebased, no code changes v4: Update to latest on branch drop applied patches meta/conf/distro/include/tcmode-default.inc | 2 +- ...2.35.bb => cross-localedef-native_2.36.bb} | 4 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- ...bc-locale_2.35.bb => glibc-locale_2.36.bb} | 0 ...bc-mtrace_2.35.bb => glibc-mtrace_2.36.bb} | 0 ...-scripts_2.35.bb => glibc-scripts_2.36.bb} | 0 ...libc-tests_2.35.bb => glibc-tests_2.36.bb} | 1 - ...tsuite_2.35.bb => glibc-testsuite_2.36.bb} | 0 meta/recipes-core/glibc/glibc-version.inc | 6 +-- ...dd-hardlink-resolver-from-util-linux.patch | 2 +- ...-fix-ups-hardlink-to-make-it-compile.patch | 2 +- ...Look-for-host-system-ld.so.cache-as-.patch | 8 ++-- ...Fix-buffer-overrun-with-a-relocated-.patch | 6 +-- ...Raise-the-size-of-arrays-containing-.patch | 22 - ...k-glibc-Allow-64-bit-atomics-for-x86.patch | 6 +-- ...Make-relocatable-install-for-locales.patch | 12 ++--- ...Fall-back-to-faccessat-on-faccess2-r.patch | 4 +- ...the-path-sets-wrong-config-variables.patch | 30 ++-- ...ss-building-and-testing-instructions.patch | 2 +- ...glibc-Help-bootstrap-cross-toolchain.patch | 8 ++-- ...eglibc-Resolve-__fpscr_values-on-SH4.patch | 4 +- ...port-cross-locale-generation-support.patch | 46 +-- ...-archive-uses-a-hard-coded-locale-pa.patch | 4 +- ...ybe-uninitialized-errors-with-Os-BZ.patch} | 6 +-- ...E_KNOWN_INTERPRETER_NAMES-to-known-.patch} | 4 +- ...o-not-ask-compiler-for-finding-arch.patch} | 2 +- ...y-the-header-between-arm-and-aarch64.patch | 19 ...-printf-builtin-in-nscd-init-script.patch} | 4 +- ...gure.ac-Set-libc_cv_rootsbindir-onl.patch} | 7 +-- ...ll-interpreter-overridable-in-tzsel.patch} | 10 ++-- ...Use-bin-sh-default-shell-interpreter.patch | 27 +++ ...-failed-in-unprivileged-process-BZ-.patch} | 6 +-- ...uild-time-paths-in-the-output-binar.patch} | 23 +++--- ...ement-a-useful-version-of-_startup_.patch} | 8 ++-- .../glibc/{glibc_2.35.bb => glibc_2.36.bb}| 21 + 35 files changed, 170 insertions(+), 138 deletions(-) rename meta/recipes-core/glibc/{cross-localedef-native_2.35.bb => cross-localedef-native_2.36.bb} (94%) rename meta/recipes-core/glibc/{glibc-locale_2.35.bb => glibc-locale_2.36.bb} (100%) rename meta/recipes-core/glibc/{glibc-mtrace_2.35.bb => glibc-mtrace_2.36.bb} (100%) rename meta/recipes-core/glibc/{glibc-scripts_2.35.bb => glibc-scripts_2.36.bb} (100%) rename meta/recipes-core/glibc/{glibc-tests_2.35.bb => glibc-tests_2.36.bb} (98%) rename meta/recipes-core/glibc/{glibc-testsuite_2.35.bb => glibc-testsuite_2.36.bb} (100%) rename meta/recipes-core/glibc/glibc/{0016-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch => 0015-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch} (93%) rename meta/recipes-core/glibc/glibc/{0017-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch => 0016-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch} (89%) rename meta/recipes-core/glibc/glibc/{0019-powerpc-Do-not-ask-compiler-for-finding-arch.patch => 0017-powerpc-Do-not-ask-compiler-for-finding-arch.patch} (96%) rename meta/recipes-core/glibc/glibc/{0021-Replace-echo-with-printf-builtin-in-nscd-init-script.patch => 0019-Replace-echo-with-printf-builtin-in-nscd-init-script.patch} (91%) rename meta/recipes-core/glibc/glibc/{0022-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch => 0020-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch} (84%) rename meta/recipes-core/glibc/glibc/{0023-timezone-Make-shell-interpreter-overridable-in-tzsel.patch => 0021-timezone-Make-shell-interpreter-overridable-in-tzsel.patch} (80%) create mode 100644 meta/recipes-core/glibc/glibc/0022-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch rename meta/recipes-core/glibc/glibc/{0024-fix-create-thread-failed-in-unprivileged-process-BZ-.patch => 0023-fix-create-thread-failed-in-unprivileged-process-BZ-.patch} (96%) rename meta/recipes-core/glibc/glibc/{reproducible-paths.patch => 0024-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch} (50%) rename meta/recipes-core/glibc/glibc/{0001-Revert-Linux-Implement-a-useful-version-of-_startup_.patch => 0025-Revert-Linux-Implement-a-useful-version-of-_startup_.patch} (97%) rename meta/recipes-core/glibc/{glibc_2.35.bb => glibc_2.36.bb} (87%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index eb8b00556a0..965cb20537f 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -20,7 +20,7 @@ GCCVERSION ?= "12.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.39%" GDBVERSION ?= "12.%" -GLIBCVERSION ?= "2.35" +GLIBCVERSION ?= "2.36" LINUXLIBCVERSION ?= "5.19%" QEMUVERSION ?= "7.0%" GOVERSION
Re: [OE-core][PATCH] module.bbclass: rebuild the modules when kernel change
On Thu, Aug 11, 2022 at 12:18 PM Jose Quaresma wrote: > > When the kernel is rebuild or some of they tasks change the > kernel modules is not rebuild as well and will comes from > the sstate-cache. > > [YOCTO #14885] https://bugzilla.yoctoproject.org/show_bug.cgi?id=14885 > > Signed-off-by: Jose Quaresma > --- > meta/classes/module.bbclass | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass > index a09ec3ed1e..d377a08bc6 100644 > --- a/meta/classes/module.bbclass > +++ b/meta/classes/module.bbclass > @@ -1,5 +1,7 @@ > inherit module-base kernel-module-split pkgconfig > > +DEPENDS += "virtual/kernel" There's already a dependency on virtual/kernel:do_shared_workdir() through module-base.bbclass and the make-mod-scripts dependency. And that dependency was a change to this: -# This is instead of DEPENDS = "virtual/kernel" -do_configure[depends] += "virtual/kernel:do_compile_kernelmodules" i.e. we've always had a finer grained dependency than what is being proposed here. We need to understand why that shared_workdir() dependency isn't doing the job any more, and if there's no way to fix it .. then going back to the older compile dependency is still lighter weight than depending on virtual/kernel (and the default of do_prepare_recipe_sysroot). It must (could?) be something with the shared workdir changing the interactions. Bruce > + > EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}" > > MODULES_INSTALL_TARGET ?= "modules_install" > -- > 2.37.1 > > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169258): https://lists.openembedded.org/g/openembedded-core/message/169258 Mute This Topic: https://lists.openembedded.org/mt/92962048/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] qemux86-64: Allow higher tunes
On Thu, 2022-08-11 at 17:51 +0200, Alexander Kanavin wrote: > You won't get AVX or > anything newer, which requires adding these instructions to qemu > usermode (a project I'd like to do if I had the time). https://lore.kernel.org/all/20220418173904.3746036-1-p...@nowt.org/ I didn't notice any v3 or an update on the bug. Thanks, Anuj -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169257): https://lists.openembedded.org/g/openembedded-core/message/169257 Mute This Topic: https://lists.openembedded.org/mt/92961093/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] glibc: Update patch status
On Thu, Aug 11, 2022 at 9:21 AM Martin Jansa wrote: > > The 2nd more important part was backported to 2.36 branch > https://sourceware.org/git/?p=glibc.git;a=commit;h=302bc33bc53c787da6e74162a7092e9c0fb964a8 > > If you plan to do another SRCREV bump before glibc upgrade is merged, then we > can drop these 2 changes. (I'll try to do another build tests with > DEBUG_BUILD, but probably next week or so). I think, I might do, if Alex reports issues as he is already testing it out. > > On Tue, Aug 9, 2022 at 4:50 PM Khem Raj wrote: >> >> These patches were appplied in master >> >> Signed-off-by: Khem Raj >> --- >> .../0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch | 2 +- >> .../0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git >> a/meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch >> >> b/meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch >> index 2d14a4c6196..2caff3a0d53 100644 >> --- >> a/meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch >> +++ >> b/meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch >> @@ -7,7 +7,7 @@ Subject: [PATCH] x86: Fix `#define STRCPY` guard in >> strcpy-sse2.S >> defined. It doesn't end up mattering as the whole check is >> guarded by `#if IS_IN (libc)` but is incorrect none the less. >> >> -Upstream-Status: Submitted >> [https://sourceware.org/bugzilla/show_bug.cgi?id=29454 >> https://sourceware.org/pipermail/libc-alpha/2022-August/141289.html] >> +Upstream-Status: Backport >> [https://sourceware.org/git/?p=glibc.git;a=commit;h=312ded0d6339e8c463d0395397b5825401b14f54] >> Signed-off-by: Martin Jansa >> --- >> sysdeps/x86_64/multiarch/strcpy-sse2.S | 2 +- >> diff --git >> a/meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch >> >> b/meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch >> index 1b347b33226..a2c951ad936 100644 >> --- >> a/meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch >> +++ >> b/meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch >> @@ -8,7 +8,7 @@ strlen_pass::handle_builtin_strcpy but only for optimized >> build. To avoid needing to include strcpy.S in the rtld build to >> support the debug build, just do the optimization by hand. >> >> -Upstream-Status: Submitted >> [https://sourceware.org/bugzilla/show_bug.cgi?id=29454 >> https://sourceware.org/pipermail/libc-alpha/2022-August/141290.html] >> +Upstream-Status: Backport >> [https://sourceware.org/git/?p=glibc.git;a=commit;h=483cfe1a6a33d6335b1901581b41040d2d412511] >> Signed-off-by: Martin Jansa >> --- >> elf/dl-cache.c | 5 +++-- >> -- >> 2.37.1 >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169256): https://lists.openembedded.org/g/openembedded-core/message/169256 Mute This Topic: https://lists.openembedded.org/mt/92916378/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] module.bbclass: rebuild the modules when kernel change
Em qui., 11 de ago. de 2022 às 13:18, Jose Quaresma escreveu: > When the kernel is rebuild or some of they tasks change the > kernel modules is not rebuild as well and will comes from > the sstate-cache. > > [YOCTO #14885] https://bugzilla.yoctoproject.org/show_bug.cgi?id=14885 > > Signed-off-by: Jose Quaresma > Issue: https://github.com/Freescale/meta-freescale/pull/1168 Acked-by: Otavio Salvador -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169255): https://lists.openembedded.org/g/openembedded-core/message/169255 Mute This Topic: https://lists.openembedded.org/mt/92962048/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] glibc: Update patch status
The 2nd more important part was backported to 2.36 branch https://sourceware.org/git/?p=glibc.git;a=commit;h=302bc33bc53c787da6e74162a7092e9c0fb964a8 If you plan to do another SRCREV bump before glibc upgrade is merged, then we can drop these 2 changes. (I'll try to do another build tests with DEBUG_BUILD, but probably next week or so). On Tue, Aug 9, 2022 at 4:50 PM Khem Raj wrote: > These patches were appplied in master > > Signed-off-by: Khem Raj > --- > .../0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch | 2 +- > .../0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git > a/meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch > b/meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch > index 2d14a4c6196..2caff3a0d53 100644 > --- > a/meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch > +++ > b/meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch > @@ -7,7 +7,7 @@ Subject: [PATCH] x86: Fix `#define STRCPY` guard in > strcpy-sse2.S > defined. It doesn't end up mattering as the whole check is > guarded by `#if IS_IN (libc)` but is incorrect none the less. > > -Upstream-Status: Submitted [ > https://sourceware.org/bugzilla/show_bug.cgi?id=29454 > https://sourceware.org/pipermail/libc-alpha/2022-August/141289.html] > +Upstream-Status: Backport [ > https://sourceware.org/git/?p=glibc.git;a=commit;h=312ded0d6339e8c463d0395397b5825401b14f54 > ] > Signed-off-by: Martin Jansa > --- > sysdeps/x86_64/multiarch/strcpy-sse2.S | 2 +- > diff --git > a/meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch > b/meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch > index 1b347b33226..a2c951ad936 100644 > --- > a/meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch > +++ > b/meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch > @@ -8,7 +8,7 @@ strlen_pass::handle_builtin_strcpy but only for optimized > build. To avoid needing to include strcpy.S in the rtld build to > support the debug build, just do the optimization by hand. > > -Upstream-Status: Submitted [ > https://sourceware.org/bugzilla/show_bug.cgi?id=29454 > https://sourceware.org/pipermail/libc-alpha/2022-August/141290.html] > +Upstream-Status: Backport [ > https://sourceware.org/git/?p=glibc.git;a=commit;h=483cfe1a6a33d6335b1901581b41040d2d412511 > ] > Signed-off-by: Martin Jansa > --- > elf/dl-cache.c | 5 +++-- > -- > 2.37.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169254): https://lists.openembedded.org/g/openembedded-core/message/169254 Mute This Topic: https://lists.openembedded.org/mt/92916378/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] module.bbclass: rebuild the modules when kernel change
When the kernel is rebuild or some of they tasks change the kernel modules is not rebuild as well and will comes from the sstate-cache. [YOCTO #14885] https://bugzilla.yoctoproject.org/show_bug.cgi?id=14885 Signed-off-by: Jose Quaresma --- meta/classes/module.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass index a09ec3ed1e..d377a08bc6 100644 --- a/meta/classes/module.bbclass +++ b/meta/classes/module.bbclass @@ -1,5 +1,7 @@ inherit module-base kernel-module-split pkgconfig +DEPENDS += "virtual/kernel" + EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}" MODULES_INSTALL_TARGET ?= "modules_install" -- 2.37.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169253): https://lists.openembedded.org/g/openembedded-core/message/169253 Mute This Topic: https://lists.openembedded.org/mt/92962048/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] qemux86-64: Allow higher tunes
On Thu, 11 Aug 2022 at 18:04, Tom Rini wrote: > > This is less useful than it may seem, and merely moves the supported > > CPU from circa-2006 core 2 to circa-2008 core i7. You won't get AVX or > > anything newer, which requires adding these instructions to qemu > > usermode (a project I'd like to do if I had the time). > > True but it's also the case that tune-corei7.conf is the newest one in > oe-core, yes? I had previously peeked in meta-intel which has a > skylake tune, but bringing that in is something I'd leave to Intel/WR > folks to take care of. Yes, from making things consistent perspective this change is fine. The skylake tune in meta-intel gives its users two less than great choices: disable qemu usermode, or disable everything that qemu doesn't support (AVX and up). Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169252): https://lists.openembedded.org/g/openembedded-core/message/169252 Mute This Topic: https://lists.openembedded.org/mt/92961093/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] qemux86-64: Allow higher tunes
On Thu, Aug 11, 2022 at 05:51:52PM +0200, Alexander Kanavin wrote: > This is less useful than it may seem, and merely moves the supported > CPU from circa-2006 core 2 to circa-2008 core i7. You won't get AVX or > anything newer, which requires adding these instructions to qemu > usermode (a project I'd like to do if I had the time). True but it's also the case that tune-corei7.conf is the newest one in oe-core, yes? I had previously peeked in meta-intel which has a skylake tune, but bringing that in is something I'd leave to Intel/WR folks to take care of. -- Tom -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169251): https://lists.openembedded.org/g/openembedded-core/message/169251 Mute This Topic: https://lists.openembedded.org/mt/92961093/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] qemux86-64: Allow higher tunes
This is less useful than it may seem, and merely moves the supported CPU from circa-2006 core 2 to circa-2008 core i7. You won't get AVX or anything newer, which requires adding these instructions to qemu usermode (a project I'd like to do if I had the time). Alex On Thu, 11 Aug 2022 at 17:40, Tom Rini wrote: > > Back in 0be64e54a0e6 ("qemux86: Allow higher tunes") we moved the > qemux86 machine to using the core-i7 tune file, for maximum flexibility > and to allow for enabling advanced processor features if desired or > required by various packagess, without changing the default tune. Do the > same now for qemux86-64. > > Cc: Joshua Watt > Cc: Richard Purdie > Signed-off-by: Tom Rini > --- > meta/conf/machine/qemux86-64.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/conf/machine/qemux86-64.conf > b/meta/conf/machine/qemux86-64.conf > index 901353499c81..864086791179 100644 > --- a/meta/conf/machine/qemux86-64.conf > +++ b/meta/conf/machine/qemux86-64.conf > @@ -10,7 +10,7 @@ PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" > > require conf/machine/include/qemu.inc > DEFAULTTUNE ?= "core2-64" > -require conf/machine/include/x86/tune-core2.inc > +require conf/machine/include/x86/tune-corei7.inc > require conf/machine/include/x86/qemuboot-x86.inc > > UBOOT_MACHINE ?= "qemu-x86_64_defconfig" > -- > 2.25.1 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169250): https://lists.openembedded.org/g/openembedded-core/message/169250 Mute This Topic: https://lists.openembedded.org/mt/92961093/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] json-c: Add ptest for json-c
Just to be sure, did you use qemu with kvm option? I find it odd that json library tests would take this long. Can you double check what they do? We can't afford to extend ptest run time indefinitely, it's already close to 4 hours. Alex On Thu, 11 Aug 2022 at 17:26, Weiß, Simone wrote: > > Hi, > > For me it took around ~500 seconds. I considered it as slow, as > `PTESTS_FAST` should take around ~30 seconds according to the comment > on ptest-packagelists.inc. > > Simone > On Thu, 2022-08-11 at 10:23 +0200, Alexander Kanavin via > lists.openembedded.org wrote: > > CAUTION: This email originated from outside of the Elektrobit > > organization. Do not click links or open attachments unless you > > recognize the sender and know the content is safe. > > > > > > On Wed, 10 Aug 2022 at 21:40, Simone Weiss < > > simone.we...@elektrobit.com> wrote: > > > --- a/meta/conf/distro/include/ptest-packagelists.inc > > > +++ b/meta/conf/distro/include/ptest-packagelists.inc > > > @@ -87,6 +87,7 @@ PTESTS_SLOW = "\ > > > findutils-ptest \ > > > glib-2.0-ptest \ > > > gstreamer1.0-ptest \ > > > +json-c-ptest \ > > > libevent-ptest \ > > > libgcrypt-ptest \ > > > lttng-tools-ptest \ > > > > How long do the tests take to execute? Do they have to be added to > > the > > slow list? > > > > Alex > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169249): https://lists.openembedded.org/g/openembedded-core/message/169249 Mute This Topic: https://lists.openembedded.org/mt/92944223/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] qemux86-64: Allow higher tunes
Back in 0be64e54a0e6 ("qemux86: Allow higher tunes") we moved the qemux86 machine to using the core-i7 tune file, for maximum flexibility and to allow for enabling advanced processor features if desired or required by various packagess, without changing the default tune. Do the same now for qemux86-64. Cc: Joshua Watt Cc: Richard Purdie Signed-off-by: Tom Rini --- meta/conf/machine/qemux86-64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 901353499c81..864086791179 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -10,7 +10,7 @@ PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" require conf/machine/include/qemu.inc DEFAULTTUNE ?= "core2-64" -require conf/machine/include/x86/tune-core2.inc +require conf/machine/include/x86/tune-corei7.inc require conf/machine/include/x86/qemuboot-x86.inc UBOOT_MACHINE ?= "qemu-x86_64_defconfig" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169248): https://lists.openembedded.org/g/openembedded-core/message/169248 Mute This Topic: https://lists.openembedded.org/mt/92961093/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] json-c: Add ptest for json-c
Hi, For me it took around ~500 seconds. I considered it as slow, as `PTESTS_FAST` should take around ~30 seconds according to the comment on ptest-packagelists.inc. Simone On Thu, 2022-08-11 at 10:23 +0200, Alexander Kanavin via lists.openembedded.org wrote: > CAUTION: This email originated from outside of the Elektrobit > organization. Do not click links or open attachments unless you > recognize the sender and know the content is safe. > > > On Wed, 10 Aug 2022 at 21:40, Simone Weiss < > simone.we...@elektrobit.com> wrote: > > --- a/meta/conf/distro/include/ptest-packagelists.inc > > +++ b/meta/conf/distro/include/ptest-packagelists.inc > > @@ -87,6 +87,7 @@ PTESTS_SLOW = "\ > > findutils-ptest \ > > glib-2.0-ptest \ > > gstreamer1.0-ptest \ > > +json-c-ptest \ > > libevent-ptest \ > > libgcrypt-ptest \ > > lttng-tools-ptest \ > > How long do the tests take to execute? Do they have to be added to > the > slow list? > > Alex > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169247): https://lists.openembedded.org/g/openembedded-core/message/169247 Mute This Topic: https://lists.openembedded.org/mt/92944223/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] selftest/runtime_test: Use IMAGE_CLASSES for testimage
testimage should be included via IMAGE_CLASSES, not globally with INHERIT. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/runtime_test.py | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 7c3faefeaea..89c363dee44 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -121,7 +121,7 @@ class TestImage(OESelftestTestCase): if get_bb_var('DISTRO') == 'poky-tiny': self.skipTest('core-image-full-cmdline not buildable for poky-tiny') -features = 'INHERIT += "testimage"\n' +features = 'IMAGE_CLASSES += "testimage"\n' features += 'IMAGE_INSTALL:append = " libssl"\n' features += 'TEST_SUITES = "ping ssh selftest"\n' self.write_config(features) @@ -139,7 +139,7 @@ class TestImage(OESelftestTestCase): if get_bb_var('DISTRO') == 'poky-tiny': self.skipTest('core-image-full-cmdline not buildable for poky-tiny') -features = 'INHERIT += "testimage"\n' +features = 'IMAGE_CLASSES += "testimage"\n' features += 'TEST_SUITES = "ping ssh dnf_runtime dnf.DnfBasicTest.test_dnf_help"\n' # We don't yet know what the server ip and port will be - they will be patched # in at the start of the on-image test @@ -174,7 +174,7 @@ class TestImage(OESelftestTestCase): if get_bb_var('DISTRO') == 'poky-tiny': self.skipTest('core-image-full-cmdline not buildable for poky-tiny') -features = 'INHERIT += "testimage"\n' +features = 'IMAGE_CLASSES += "testimage"\n' features += 'TEST_SUITES = "ping ssh apt.AptRepoTest.test_apt_install_from_repo"\n' # We don't yet know what the server ip and port will be - they will be patched # in at the start of the on-image test @@ -224,7 +224,7 @@ class TestImage(OESelftestTestCase): qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native') qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') -features = 'INHERIT += "testimage"\n' +features = 'IMAGE_CLASSES += "testimage"\n' if 'gtk+' not in qemu_packageconfig: features += 'PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"\n' if 'sdl' not in qemu_packageconfig: @@ -269,7 +269,7 @@ class TestImage(OESelftestTestCase): except subprocess.CalledProcessError as e: self.fail("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.") qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') -features = 'INHERIT += "testimage"\n' +features = 'IMAGE_CLASSES += "testimage"\n' if 'opengl' not in qemu_distrofeatures: features += 'DISTRO_FEATURES:append = " opengl"\n' features += 'TEST_SUITES = "ping ssh virgl"\n' -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169246): https://lists.openembedded.org/g/openembedded-core/message/169246 Mute This Topic: https://lists.openembedded.org/mt/92959287/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] meta-skeleton/hello-mod: Switch to SPDX-License-Identifier
Signed-off-by: Richard Purdie --- .../recipes-kernel/hello-mod/files/hello.c | 13 + 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/meta-skeleton/recipes-kernel/hello-mod/files/hello.c b/meta-skeleton/recipes-kernel/hello-mod/files/hello.c index 6b73a795240..4f73455d200 100644 --- a/meta-skeleton/recipes-kernel/hello-mod/files/hello.c +++ b/meta-skeleton/recipes-kernel/hello-mod/files/hello.c @@ -2,18 +2,7 @@ * * Copyright (C) 2011 Intel Corporation. All rights reserved. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See - * the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * */ -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169244): https://lists.openembedded.org/g/openembedded-core/message/169244 Mute This Topic: https://lists.openembedded.org/mt/92959284/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] perf: Fix reproducibility issues with 5.19 onwards
In 5.19 onwards the build process changed and encoded full build paths into the output. Adapt the code to look more like our setuptools class calls. This seems to work ok with older kernels too. Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 95e7eae9fee..95b4362958b 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -203,7 +203,7 @@ do_configure:prepend () { if [ -e "${S}/tools/perf/Makefile.perf" ]; then sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ ${S}/tools/perf/Makefile.perf -sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \ +sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(PYTHON_SITEPACKAGES_DIR)' --root='\$(DESTDIR)',g" \ ${S}/tools/perf/Makefile.perf # backport https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8 sed -i -e 's,\($(Q)$(SHELL) .$(arch_errno_tbl).\) $(CC) $(arch_errno_hdr_dir),\1 $(firstword $(CC)) $(arch_errno_hdr_dir),g' \ -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169245): https://lists.openembedded.org/g/openembedded-core/message/169245 Mute This Topic: https://lists.openembedded.org/mt/92959285/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 5/5] lib: Add copyright statements to files without one
On Thu, 2022-08-11 at 09:19 +0100, Paul Barker wrote: > On 11/08/2022 08:59, Richard Purdie wrote: > > On Thu, 2022-08-11 at 08:57 +0100, Paul Barker wrote: > > > On 10/08/2022 20:45, Richard Purdie wrote: > > > > diff --git a/meta/lib/oeqa/runtime/cases/rtc.py > > > > b/meta/lib/oeqa/runtime/cases/rtc.py > > > > index c4e66813249..223cf7b95d9 100644 > > > > --- a/meta/lib/oeqa/runtime/cases/rtc.py > > > > +++ b/meta/lib/oeqa/runtime/cases/rtc.py > > > > @@ -1,3 +1,8 @@ > > > > +\# > > > > > > Looks like an extra '\' has slipped in here. > > > > Thanks, well spotted! I've fixed in the branch. > > I've also checked master-next with `reuse lint`, obviously it complains > that license text files aren't in the places the reuse tool wants them > to be and that's unimportant, but it does highlight some other low > hanging fruit: > > * The following are missing SPDX headers: > > * scripts/lib/devtool/menuconfig.py > * meta-skeleton/recipes-kernel/hello-mod/files/hello.c > > * The following are missing copyright headers: > > * scripts/lib/argparse_oe.py > * scripts/lib/wic/plugins/source/bootimg-partition.py > * scripts/lib/wic/plugins/source/empty.py > * scripts/lib/wic/plugins/source/isoimage-isohybrid.py > * scripts/lib/wic/plugins/source/rawcopy.py I've tweaked the patches to cover those, thanks. > * Most files under meta/conf can probaby have copyright and license > headers added without any confusion. Yes, I'd agree. > * `reuse lint` will accept the following header as valid, which could be > a path forward for recipes if other folks think it's clear enough: > > # Recipe: Copyright OpenEmbedded Contributors > # Recipe: SPDX-License-Identifier: MIT Certainly worth considering. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169243): https://lists.openembedded.org/g/openembedded-core/message/169243 Mute This Topic: https://lists.openembedded.org/mt/92944317/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] create-spdx: handle links to inaccessible locations
When a link is pointing to location inaccessible to build user (e.g. "/root/something"), filepath.is_file() throws "PermissionError: [Errno 13] Permission denied". Fix this by first checking if it is a link. Signed-off-by: Peter Marko --- meta/classes/create-spdx.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass index 10deba638f..26a77b12b1 100644 --- a/meta/classes/create-spdx.bbclass +++ b/meta/classes/create-spdx.bbclass @@ -216,7 +216,7 @@ def add_package_files(d, doc, spdx_pkg, topdir, get_spdxid, get_types, *, archiv filepath = Path(subdir) / file filename = str(filepath.relative_to(topdir)) -if filepath.is_file() and not filepath.is_symlink(): +if not filepath.is_symlink() and filepath.is_file(): spdx_file = oe.spdx.SPDXFile() spdx_file.SPDXID = get_spdxid(file_counter) for t in get_types(filepath): -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169242): https://lists.openembedded.org/g/openembedded-core/message/169242 Mute This Topic: https://lists.openembedded.org/mt/92956970/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 1/1] ltp: Add post release runtime fixes
On Sat, 2022-07-23 at 22:30 +0200, Petr Vorel wrote: > From: Petr Vorel > > Backport various post 20220527 release runtime fixes: > * The concept of max runtime > * tst_test.sh: Cleanup getopts usage > * mountns0[1-3]: wait for umount completed in thread_b > > Signed-off-by: Petr Vorel > --- > Changes v1->v2: > * add patches to SRC_URI (Khem Raj) > > ...-Fix-usage-of-PAGESIZE-from-memcg_li.patch | 121 ++ > ...ait-for-umount-completed-in-thread_b.patch | 63 +++ > ...x-usage-of-variables-from-tst_net.sh.patch | 154 ++ > ...0001-netstress-Restore-runtime-to-5m.patch | 53 ++ > ...fs05_make_tree-Restore-5-min-timeout.patch | 31 > ...igrate_pages03-restore-runtime-to-5m.patch | 44 + > meta/recipes-extended/ltp/ltp_20220527.bb | 6 + > 7 files changed, 472 insertions(+) > create mode 100644 > meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch > create mode 100644 > meta/recipes-extended/ltp/ltp/0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch > create mode 100644 > meta/recipes-extended/ltp/ltp/0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch > create mode 100644 > meta/recipes-extended/ltp/ltp/0001-netstress-Restore-runtime-to-5m.patch > create mode 100644 > meta/recipes-extended/ltp/ltp/0001-nfs05_make_tree-Restore-5-min-timeout.patch > create mode 100644 > meta/recipes-extended/ltp/ltp/0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch > > diff --git > a/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch > > b/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch > new file mode 100644 > index 00..6cc36cda79 > --- /dev/null > +++ > b/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch > @@ -0,0 +1,121 @@ > +From bda92ad659a52d38ac810099f69adff626b064c6 Mon Sep 17 00:00:00 2001 > +From: Joerg Vehlow > +Date: Mon, 27 Jun 2022 10:44:49 +0200 > +Subject: [PATCH] memcg/functional: Fix usage of PAGESIZE from memcg_lib.sh > + > +$PAGESIZES is set in memcg_lib.sh, which was moved to the bottom of the file. > + > +Fixes: 04021637f ("tst_test.sh: Cleanup getopts usage") > + > +Reviewed-by: Petr Vorel > +Signed-off-by: Joerg Vehlow > +[ upstream status: bda92ad659a52d38ac810099f69adff626b064c6 ] Thanks for these. I did merge them, I just wanted to note that in future the format for upstream status is: Upstream-Status: Backport [bda92ad659a52d38ac810099f69adff626b064c6] We have code that uses these so the format is standardised. I fixed the ones in this series up manually. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169241): https://lists.openembedded.org/g/openembedded-core/message/169241 Mute This Topic: https://lists.openembedded.org/mt/92574361/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe][OE-core][Patch 1/1] perf: depend on setuptools if building python scripting
On Thu, 2022-08-11 at 11:01 +0200, Alexandre Belloni via lists.openembedded.org wrote: > Hello Max, > > On 10/08/2022 09:21:38+0200, Max Krummenacher wrote: > > From: Max Krummenacher > > > > Starting with kernel 5.19-rc7 perf changed from using distutils > > to setuptools. > > Add this to the dependencies to be prepared. > > > > Unfortunately, this causes the following reproducibility issues: > https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20220810-ikgt3whb/packages/diff-html/ > > > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/tools/perf?id=ee87a0841aa538ab7ad49cf5679ac5ea2682c909 > > > > Signed-off-by: Max Krummenacher > > --- > > meta/recipes-kernel/perf/perf.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-kernel/perf/perf.bb > > b/meta/recipes-kernel/perf/perf.bb > > index 95e7eae9fe..4b15b11462 100644 > > --- a/meta/recipes-kernel/perf/perf.bb > > +++ b/meta/recipes-kernel/perf/perf.bb > > @@ -13,7 +13,7 @@ PR = "r9" > > > > PACKAGECONFIG ??= "scripting tui libunwind" > > PACKAGECONFIG[dwarf] = ",NO_DWARF=1" > > -PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3" > > +PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3 > > python3-setuptools-native" > > # gui support was added with kernel 3.6.35 > > # since 3.10 libnewt was replaced by slang > > # to cover a wide range of kernel we add both dependencies > > -- > > 2.35.3 I think this needs something like: diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 4b15b114620..2fdb99361fa 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -203,7 +203,7 @@ do_configure:prepend () { if [ -e "${S}/tools/perf/Makefile.perf" ]; then sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ ${S}/tools/perf/Makefile.perf -sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \ +sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(PYTHON_SITEPACKAGES_DIR)' --root='\$(DESTDIR)',g" \ ${S}/tools/perf/Makefile.perf # backport https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8 sed -i -e 's,\($(Q)$(SHELL) .$(arch_errno_tbl).\) $(CC) $(arch_errno_hdr_dir),\1 $(firstword $(CC)) $(arch_errno_hdr_dir),g' \ to work with 5.19 but we also need to keep older versions working :/ Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169240): https://lists.openembedded.org/g/openembedded-core/message/169240 Mute This Topic: https://lists.openembedded.org/mt/92932047/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] sysvinit-inittab/start_getty: Fix respawn too fast
When an entry in /dev does not exist, start_getty is returning directly. As it is started from init in a respawn mode, it will loop infinitely. In this case add a sleep inside start_getty to prevent the "Respawning too fast" message popping up every 5 minutes. This case is happening quite often when the system is started as an hypervisor guest as the standard serial line is usually taken by it and removed from the configuration. This was triggered quite often running linux as dom0 on top of Xen on arm as the serial line is taken by Xen and removed from the device tree. Use the opportunity to replace one tab with spaces as the rest of the file is using spaces. Signed-off-by: Bertrand Marquis --- meta/recipes-core/sysvinit/sysvinit-inittab/start_getty | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty b/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty index 699a1ead1a40..2bfe4310acad 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty +++ b/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty @@ -13,5 +13,8 @@ case $(readlink -f "${getty}") in esac if [ -e /sys/class/tty/$2 -a -c /dev/$2 ]; then - ${setsid:-} ${getty} -L $1 $2 $3 +${setsid:-} ${getty} -L $1 $2 $3 +else +# Prevent respawning to fast error if /dev entry does not exist +sleep 1000 fi -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169239): https://lists.openembedded.org/g/openembedded-core/message/169239 Mute This Topic: https://lists.openembedded.org/mt/92955044/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] perf: sort-pmuevents: really keep array terminators
Hi all, gentle ping with some people CC'ed. Regards, Lucas Am Dienstag, dem 21.06.2022 um 19:02 +0200 schrieb Lucas Stach: > Commit e1382583cd50 ("perf: sort-pmuevents: don't drop elements") tried > to fix a case where the array terminator elements were dropped from the > sorted list breaking the build, but it only worked for the case where > the terminator is the only element of the array. When the array has other > elements the terminator will still be silently dropped, causing invalid > memory accesses at runtime when the perf utility iterates over the array. > > Fix this by treating any unmatched entry as an array terminator and also > add a comment to make it a little more clear how things are ending up at > the right position in the sorted list. > > Signed-off-by: Lucas Stach > --- > meta/recipes-kernel/perf/perf/sort-pmuevents.py | 5 - > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-kernel/perf/perf/sort-pmuevents.py > b/meta/recipes-kernel/perf/perf/sort-pmuevents.py > index 09ba3328a7ab..0362f2d8fabc 100755 > --- a/meta/recipes-kernel/perf/perf/sort-pmuevents.py > +++ b/meta/recipes-kernel/perf/perf/sort-pmuevents.py > @@ -62,7 +62,10 @@ for struct in re.findall( struct_block_regex, data ): > #print( "name found: %s" % name.group(1) ) > entry_dict[struct[2]]['fields'][name.group(1)] = entry > > -if not entry_dict[struct[2]]['fields']: > +# unmatched entries are most likely array terminators and > +# should end up as the last element in the sorted list, which > +# is achieved by using '0' as the key > +if not cpuid and not name: > entry_dict[struct[2]]['fields']['0'] = entry > > # created ordered dictionaries from the captured values. These are ordered by > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169238): https://lists.openembedded.org/g/openembedded-core/message/169238 Mute This Topic: https://lists.openembedded.org/mt/92954692/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe][OE-core][Patch 1/1] perf: depend on setuptools if building python scripting
Hello Max, On 10/08/2022 09:21:38+0200, Max Krummenacher wrote: > From: Max Krummenacher > > Starting with kernel 5.19-rc7 perf changed from using distutils > to setuptools. > Add this to the dependencies to be prepared. > Unfortunately, this causes the following reproducibility issues: https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20220810-ikgt3whb/packages/diff-html/ > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/tools/perf?id=ee87a0841aa538ab7ad49cf5679ac5ea2682c909 > > Signed-off-by: Max Krummenacher > --- > meta/recipes-kernel/perf/perf.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-kernel/perf/perf.bb > b/meta/recipes-kernel/perf/perf.bb > index 95e7eae9fe..4b15b11462 100644 > --- a/meta/recipes-kernel/perf/perf.bb > +++ b/meta/recipes-kernel/perf/perf.bb > @@ -13,7 +13,7 @@ PR = "r9" > > PACKAGECONFIG ??= "scripting tui libunwind" > PACKAGECONFIG[dwarf] = ",NO_DWARF=1" > -PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3" > +PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3 > python3-setuptools-native" > # gui support was added with kernel 3.6.35 > # since 3.10 libnewt was replaced by slang > # to cover a wide range of kernel we add both dependencies > -- > 2.35.3 > > > > -- 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 (#169237): https://lists.openembedded.org/g/openembedded-core/message/169237 Mute This Topic: https://lists.openembedded.org/mt/92932047/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] json-c: Add ptest for json-c
On Wed, 10 Aug 2022 at 21:40, Simone Weiss wrote: > --- a/meta/conf/distro/include/ptest-packagelists.inc > +++ b/meta/conf/distro/include/ptest-packagelists.inc > @@ -87,6 +87,7 @@ PTESTS_SLOW = "\ > findutils-ptest \ > glib-2.0-ptest \ > gstreamer1.0-ptest \ > +json-c-ptest \ > libevent-ptest \ > libgcrypt-ptest \ > lttng-tools-ptest \ How long do the tests take to execute? Do they have to be added to the slow list? Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169236): https://lists.openembedded.org/g/openembedded-core/message/169236 Mute This Topic: https://lists.openembedded.org/mt/92944223/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 5/5] lib: Add copyright statements to files without one
On 11/08/2022 08:59, Richard Purdie wrote: On Thu, 2022-08-11 at 08:57 +0100, Paul Barker wrote: On 10/08/2022 20:45, Richard Purdie wrote: diff --git a/meta/lib/oeqa/runtime/cases/rtc.py b/meta/lib/oeqa/runtime/cases/rtc.py index c4e66813249..223cf7b95d9 100644 --- a/meta/lib/oeqa/runtime/cases/rtc.py +++ b/meta/lib/oeqa/runtime/cases/rtc.py @@ -1,3 +1,8 @@ +\# Looks like an extra '\' has slipped in here. Thanks, well spotted! I've fixed in the branch. I've also checked master-next with `reuse lint`, obviously it complains that license text files aren't in the places the reuse tool wants them to be and that's unimportant, but it does highlight some other low hanging fruit: * The following are missing SPDX headers: * scripts/lib/devtool/menuconfig.py * meta-skeleton/recipes-kernel/hello-mod/files/hello.c * The following are missing copyright headers: * scripts/lib/argparse_oe.py * scripts/lib/wic/plugins/source/bootimg-partition.py * scripts/lib/wic/plugins/source/empty.py * scripts/lib/wic/plugins/source/isoimage-isohybrid.py * scripts/lib/wic/plugins/source/rawcopy.py * Most files under meta/conf can probaby have copyright and license headers added without any confusion. * `reuse lint` will accept the following header as valid, which could be a path forward for recipes if other folks think it's clear enough: # Recipe: Copyright OpenEmbedded Contributors # Recipe: SPDX-License-Identifier: MIT Thanks, -- Paul Barker OpenPGP_0x74975C81B7E66BAC.asc Description: OpenPGP public key OpenPGP_signature Description: OpenPGP digital signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169235): https://lists.openembedded.org/g/openembedded-core/message/169235 Mute This Topic: https://lists.openembedded.org/mt/92944317/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 5/5] lib: Add copyright statements to files without one
On Thu, 2022-08-11 at 08:57 +0100, Paul Barker wrote: > On 10/08/2022 20:45, Richard Purdie wrote: > > diff --git a/meta/lib/oeqa/runtime/cases/rtc.py > > b/meta/lib/oeqa/runtime/cases/rtc.py > > index c4e66813249..223cf7b95d9 100644 > > --- a/meta/lib/oeqa/runtime/cases/rtc.py > > +++ b/meta/lib/oeqa/runtime/cases/rtc.py > > @@ -1,3 +1,8 @@ > > +\# > > Looks like an extra '\' has slipped in here. Thanks, well spotted! I've fixed in the branch. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169234): https://lists.openembedded.org/g/openembedded-core/message/169234 Mute This Topic: https://lists.openembedded.org/mt/92944317/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 5/5] lib: Add copyright statements to files without one
On 10/08/2022 20:45, Richard Purdie wrote: diff --git a/meta/lib/oeqa/runtime/cases/rtc.py b/meta/lib/oeqa/runtime/cases/rtc.py index c4e66813249..223cf7b95d9 100644 --- a/meta/lib/oeqa/runtime/cases/rtc.py +++ b/meta/lib/oeqa/runtime/cases/rtc.py @@ -1,3 +1,8 @@ +\# Looks like an extra '\' has slipped in here. Thanks, -- Paul Barker OpenPGP_0x74975C81B7E66BAC.asc Description: OpenPGP public key OpenPGP_signature Description: OpenPGP digital signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169233): https://lists.openembedded.org/g/openembedded-core/message/169233 Mute This Topic: https://lists.openembedded.org/mt/92944317/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] looking for a recipe for LXD container to do OE/YP builds
(not so much an OE question as a build question related to the proper design of LXD container for doing OE builds.) colleague asked me how to best create an LXD container based on a specific release (ubuntu 18.04); specifically, how to use idmapped mounts to correctly map a directory into the container so that UIDs don't step on each other, so here's the scenario. * (google repo-based) YP checkout that will, in the end, apparently generate 120BG(!!!) of output. * must be ubuntu 18.04 container based on versions of OE/YP layers being checked out the need to do this mapping is that, by default, when you shell into the LXD container, you're running as root, which of course will not work for running bitbake. and the tricky(?) part is that: 1) on my ubuntu 22.04 host, my account is rpjday/1000. 2) the non-root account created in the container is ubuntu/1000 so we already have a bit of conflict in matching UIDs attached to different usernames. i'm just trying to determine the preferred way to set up /etc/subuid and /etc/subgid and an LXC device so that i can map the entire build directory into the container, shell into the container, do the build there and have all the output go into the mapped directory so that it (obviously) ends up on my host and not in the container (where there is nowhere near 120G of space, and i don't want to resize the container to that extent). thoughts? i'm about to try a few combinations and might stumble across something that works, but if anyone else has gone through this and has a recipe, that would be just ducky. rday p.s. my first guess is that it might not be an issue that there are two different accounts with UID 1000, since ubuntu in the container will map nicely to my own account on the host. but we'll see shortly. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169232): https://lists.openembedded.org/g/openembedded-core/message/169232 Mute This Topic: https://lists.openembedded.org/mt/92953887/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-