diff mbox series

[meta-oe,scarthgap,2/2] mongodb: update to 4.4.29

Message ID 20250307093255.1110778-2-awais.belal@gmail.com
State New
Headers show
Series [meta-oe,scarthgap,1/2] mongodb: fix build with python 3.12 | expand

Commit Message

Awais Belal March 7, 2025, 9:32 a.m. UTC
Move on to 4.4.29 and drop a patch that is not applicable anymore.

Signed-off-by: Awais Belal <awais.belal@gmail.com>
---
 ...001-free_mon-Include-missing-cstdint.patch | 28 -------------------
 .../recipes-dbs/mongodb/mongodb_git.bb        |  7 ++---
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch

Comments

Khem Raj March 8, 2025, 11:04 p.m. UTC | #1
I am seeing this  build failure on master

| File "/srv/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/mongodb/4.4.29/git/src/mongo/base/generate_error_codes.py",
line 31, in <module>
| from Cheetah.Template import Template
| File "/srv/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/mongodb/4.4.29/recipe-sysroot-native/usr/lib/python3.13/site-packages/Cheetah/Template.py",
line 24, in <module>
| import cgi # Used by .webInput() if the template is a CGI script.
| ^^^^^^^^^^
| ModuleNotFoundError: No module named 'cgi'
| Generating build/59f4f0dd/mongo/db/repl/repl_settings_gen.cpp
| scons: *** [build/59f4f0dd/mongo/base/error_codes.h] Error 1
| scons: building terminated because of errors.
| build/59f4f0dd/mongo/base/error_codes.h failed: Error 1

For details see

https://autobuilder.yoctoproject.org/valkyrie/#/builders/81/builds/441/steps/15/logs/stdio

On Fri, Mar 7, 2025 at 1:33 AM Awais Belal via lists.openembedded.org
<awais.belal=gmail.com@lists.openembedded.org> wrote:
>
> Move on to 4.4.29 and drop a patch that is not applicable anymore.
>
> Signed-off-by: Awais Belal <awais.belal@gmail.com>
> ---
>  ...001-free_mon-Include-missing-cstdint.patch | 28 -------------------
>  .../recipes-dbs/mongodb/mongodb_git.bb        |  7 ++---
>  2 files changed, 3 insertions(+), 32 deletions(-)
>  delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch
>
> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch
> deleted file mode 100644
> index 8cee14889f..0000000000
> --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From 5d8218b8a1b5bc71e2a0cf543a000e194daba599 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Sun, 29 Jan 2023 17:15:30 -0800
> -Subject: [PATCH] free_mon: Include missing <cstdint>
> -
> -gcc 13 moved some includes around and as a result <cstdint> is no
> -longer transitively included [1]. Explicitly include it
> -for uintXX_t.
> -
> -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -Upstream-Status: Pending
> ----
> - src/mongo/db/free_mon/free_mon_options.h | 1 +
> - 1 file changed, 1 insertion(+)
> -
> ---- a/src/mongo/db/free_mon/free_mon_options.h
> -+++ b/src/mongo/db/free_mon/free_mon_options.h
> -@@ -29,6 +29,7 @@
> -
> - #pragma once
> -
> -+#include <cstdint>
> - #include <string>
> - #include <vector>
> -
> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
> index f7fd881713..5d904dd4f9 100644
> --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
> +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
> @@ -11,9 +11,9 @@ DEPENDS = "openssl libpcap zlib boost curl python3 \
>
>  inherit scons dos2unix siteinfo python3native systemd useradd
>
> -PV = "4.4.24"
> -#v4.4.24
> -SRCREV = "0b86b9b7b42ad9970c5f818c527dd86c0634243a"
> +PV = "4.4.29"
> +#v4.4.29
> +SRCREV = "89d6ffe6fc67b36fd47aff6425087003966588e3"
>  SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \
>             file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \
>             file://0001-Use-long-long-instead-of-int64_t.patch \
> @@ -32,7 +32,6 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \
>             file://0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch \
>             file://0001-server-Adjust-the-cache-alignment-assumptions.patch \
>             file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \
> -           file://0001-free_mon-Include-missing-cstdint.patch \
>             file://0001-apply-msvc-workaround-for-clang-16.patch \
>             file://0001-Fix-type-mismatch-on-32bit-arches.patch \
>             file://0001-Fix-build-on-32bit.patch \
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#115781): https://lists.openembedded.org/g/openembedded-devel/message/115781
> Mute This Topic: https://lists.openembedded.org/mt/111564957/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Awais Belal March 10, 2025, 9:24 a.m. UTC | #2
>
>
> I am seeing this  build failure on master
>
> | File
> "/srv/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/mongodb/4.4.29/git/src/mongo/base/generate_error_codes.py",
> line 31, in <module>
> | from Cheetah.Template import Template
> | File
> "/srv/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/mongodb/4.4.29/recipe-sysroot-native/usr/lib/python3.13/site-packages/Cheetah/Template.py",
> line 24, in <module>
> | import cgi # Used by .webInput() if the template is a CGI script.
> | ^^^^^^^^^^
> | ModuleNotFoundError: No module named 'cgi'
> | Generating build/59f4f0dd/mongo/db/repl/repl_settings_gen.cpp
> | scons: *** [build/59f4f0dd/mongo/base/error_codes.h] Error 1
> | scons: building terminated because of errors.
> | build/59f4f0dd/mongo/base/error_codes.h failed: Error 1
>
>
 The changeset was intended for scarthgap and I haven't made sure if master
builds. Is that a requirement? The cgi module was dropped in python 3.13
which is what master is following at this point. I might send a separate
series for master once I move on to that.
Khem Raj March 10, 2025, 12:34 p.m. UTC | #3
On Mon, Mar 10, 2025 at 2:24 AM Awais Belal <awais.belal@gmail.com> wrote:

>
>> I am seeing this  build failure on master
>>
>> | File
>> "/srv/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/mongodb/4.4.29/git/src/mongo/base/generate_error_codes.py",
>> line 31, in <module>
>> | from Cheetah.Template import Template
>> | File
>> "/srv/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/mongodb/4.4.29/recipe-sysroot-native/usr/lib/python3.13/site-packages/Cheetah/Template.py",
>> line 24, in <module>
>> | import cgi # Used by .webInput() if the template is a CGI script.
>> | ^^^^^^^^^^
>> | ModuleNotFoundError: No module named 'cgi'
>> | Generating build/59f4f0dd/mongo/db/repl/repl_settings_gen.cpp
>> | scons: *** [build/59f4f0dd/mongo/base/error_codes.h] Error 1
>> | scons: building terminated because of errors.
>> | build/59f4f0dd/mongo/base/error_codes.h failed: Error 1
>>
>>
>  The changeset was intended for scarthgap and I haven't made sure if
> master builds. Is that a requirement? The cgi module was dropped in python
> 3.13 which is what master is following at this point. I might send a
> separate series for master once I move on to that.
>

Patches are routed by master to release branches if they are needed in
master. They are done for master and then backported

>
diff mbox series

Patch

diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch
deleted file mode 100644
index 8cee14889f..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch
+++ /dev/null
@@ -1,28 +0,0 @@ 
-From 5d8218b8a1b5bc71e2a0cf543a000e194daba599 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 29 Jan 2023 17:15:30 -0800
-Subject: [PATCH] free_mon: Include missing <cstdint>
-
-gcc 13 moved some includes around and as a result <cstdint> is no
-longer transitively included [1]. Explicitly include it
-for uintXX_t.
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
----
- src/mongo/db/free_mon/free_mon_options.h | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/mongo/db/free_mon/free_mon_options.h
-+++ b/src/mongo/db/free_mon/free_mon_options.h
-@@ -29,6 +29,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
index f7fd881713..5d904dd4f9 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
@@ -11,9 +11,9 @@  DEPENDS = "openssl libpcap zlib boost curl python3 \
 
 inherit scons dos2unix siteinfo python3native systemd useradd
 
-PV = "4.4.24"
-#v4.4.24
-SRCREV = "0b86b9b7b42ad9970c5f818c527dd86c0634243a"
+PV = "4.4.29"
+#v4.4.29
+SRCREV = "89d6ffe6fc67b36fd47aff6425087003966588e3"
 SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \
            file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \
            file://0001-Use-long-long-instead-of-int64_t.patch \
@@ -32,7 +32,6 @@  SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \
            file://0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch \
            file://0001-server-Adjust-the-cache-alignment-assumptions.patch \
            file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \
-           file://0001-free_mon-Include-missing-cstdint.patch \
            file://0001-apply-msvc-workaround-for-clang-16.patch \
            file://0001-Fix-type-mismatch-on-32bit-arches.patch \
            file://0001-Fix-build-on-32bit.patch \