From patchwork Fri Mar 7 09:32:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Awais Belal X-Patchwork-Id: 58452 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D37C6C19F32 for ; Fri, 7 Mar 2025 09:33:17 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web10.7483.1741339989126098444 for ; Fri, 07 Mar 2025 01:33:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Etsvvdss; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: awais.belal@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-43bcf9612f4so13438795e9.3 for ; Fri, 07 Mar 2025 01:33:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741339987; x=1741944787; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Ozi6qS60RCql7xtarpLqvQo428b1UmYRaRKuEoMwGFI=; b=EtsvvdssQp18QOajgtVqzDbWfkuvynmK7Y9gbZoJAAsCtpjYYYPXwxjEnLxBXRGO1T GUSxzS6ntKm2fL9VCpUQalAHZSoykOWeTgkIfSZss3m4HzBRPEragBNbozMFBme4g1eT NqqwHceg7T5j/wLK9gXYsNzLXV5s6YvGnuh+UAocc2JbHqb1qyWCVlJGaei0zhdodzlf nL3lnd3cGZzhUu8WsbCWNC9vtZy6gNxFyl7PmlilPHvUo4D9EP0+tdSNXh+Ht+wyAkig rMK/rN4zpx8zvH7wJGLihu/ZFbbfAw8VmDayWc9Y4Q0tWAMyZPf68WGpuJib4rt1wAQ1 1/aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741339987; x=1741944787; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ozi6qS60RCql7xtarpLqvQo428b1UmYRaRKuEoMwGFI=; b=YDFOpv3cbWpmeXFZAQM1OOObDgWyVWbXjZoXQXuCJDJfs1RdzTL5mgG3yGj+Gq80D9 tArA/JDuF9hp16Ylw2Gti1XvrjudHNhgGSGPAMukbzLx20xi6Quz/KTXEIyPce0draww 1uWXdU5kP7SUhLJRqGdOkj1E/JnKjWvxbDNgRfGQI91pu7l5FWOMrv5mFHn4e1hEQRTv ELU3WjU61s/OHj9gOKwKbtu1HlI75DNnIVLiX1gBOpEI4lQY/31mOsvAEjjtRCuIzOSi AAilSLmNpbfu6b2Utq9u4cdG8r/9xG6FWbYZDXf91lFebfxPT1b+7wNTKLuF9OSTS1q3 JHSQ== X-Gm-Message-State: AOJu0YzR9udVxWSFYxbWZHmG5gSntMmy+FCxHtoz5rUbKVBbgTYC5Us0 WUxCGagmKnK9QkKi2ExFDwaud0Cq0gWydzhBQeTcsLxnuhQdjoaQUmFNUA== X-Gm-Gg: ASbGncs5ebnbcc3XyMvQP3J7wWrwfpjN4zoxZAKxMj02gZ6tZWh8qStpzB6wv/RfYFm e+shCESji4xD5SfLzI/OI0ARvUZTRGAk4lJeb3Gs2IlcoeERbbPcko2+VSFlkjDnNSDNZM9uLw9 JRG3+2zKtT5eVpn59HW/TicAGMfiHN+rJ2F0r7Fh6wPanXWlgWwbfv+TO4vf1BAIA/LfTjRPXl6 jP1FCW1SBPcCWTP/7hGrw8Uiq6V/bxfIYeslRMk5Hk/0T7BRxzHaFGDEyj8dbblgLnQyNegodMa NYzPSbssHqAul8Pv831+A4YUq+OFeRDYJ2hogqHqJ4LceqM= X-Google-Smtp-Source: AGHT+IG8mFrSgTsBM8KUnYu7dQojLQ18aXhSfIfW0hx1kJPxvJF2SzMg3mM/6b8vbwIzlCYxEFS0vg== X-Received: by 2002:a05:600c:1d10:b0:439:a1f2:50a3 with SMTP id 5b1f17b1804b1-43c5a630678mr18468535e9.4.1741339986845; Fri, 07 Mar 2025 01:33:06 -0800 (PST) Received: from elitebook.. ([101.53.238.142]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c01952dsm4668359f8f.45.2025.03.07.01.33.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 01:33:06 -0800 (PST) From: Awais Belal To: openembedded-devel@lists.openembedded.org Cc: Awais Belal Subject: [meta-oe][scarthgap][PATCH 1/2] mongodb: fix build with python 3.12 Date: Fri, 7 Mar 2025 14:32:54 +0500 Message-Id: <20250307093255.1110778-1-awais.belal@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Mar 2025 09:33:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115780 The moduleconfig.py build script uses the 'imp' module which is deprecated in favor of 'importlib' in python 3.12. This fixes the build issue by replacing the affected portion of the code and the package now builds fine on hosts with python 3.12. Signed-off-by: Awais Belal --- ...econfig.py-python-3.12-compatibility.patch | 57 +++++++++++++++++++ .../recipes-dbs/mongodb/mongodb_git.bb | 3 +- 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-moduleconfig.py-python-3.12-compatibility.patch diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-moduleconfig.py-python-3.12-compatibility.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-moduleconfig.py-python-3.12-compatibility.patch new file mode 100644 index 0000000000..51926b9d2e --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-moduleconfig.py-python-3.12-compatibility.patch @@ -0,0 +1,57 @@ +From 37580777bc5294d606584f3731d9f5f5425bb587 Mon Sep 17 00:00:00 2001 +From: Awais B +Date: Tue, 4 Mar 2025 11:27:10 +0000 +Subject: [PATCH] moduleconfig.py: python 3.12 compatibility + +The imp module was deprecated in python 3.4 and is dropped +with python 3.12. We now need to use importlib for the +purpose of manipulating/loading modules. + +Upstream-Status: Pending +Signed-off-by: Awais B +--- + buildscripts/moduleconfig.py | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +diff --git a/buildscripts/moduleconfig.py b/buildscripts/moduleconfig.py +index b4d0bba0490..69dd91ab30d 100644 +--- a/buildscripts/moduleconfig.py ++++ b/buildscripts/moduleconfig.py +@@ -27,7 +27,8 @@ MongoDB SConscript files do. + __all__ = ('discover_modules', 'discover_module_directories', 'configure_modules', + 'register_module_test') # pylint: disable=undefined-all-variable + +-import imp ++import importlib ++import sys + import inspect + import os + +@@ -71,12 +72,18 @@ def discover_modules(module_root, allowed_modules): + print("adding module: %s" % (name)) + fp = open(build_py, "r") + try: +- module = imp.load_module("module_" + name, fp, build_py, +- (".py", "r", imp.PY_SOURCE)) +- if getattr(module, "name", None) is None: +- module.name = name +- found_modules.append(module) +- found_module_names.append(name) ++ module_name = "module_" + name ++ module_spec = importlib.util.spec_from_file_location(module_name, build_py) ++ ++ if module_spec is not None: ++ module = importlib.util.module_from_spec(module_spec) ++ sys.modules[module_name] = module ++ module_spec.loader.exec_module(module) ++ ++ if not hasattr(module, "name"): ++ module.name = name ++ found_modules.append(module) ++ found_module_names.append(name) + finally: + fp.close() + except (FileNotFoundError, IOError): +-- +2.34.1 + 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 ee5c77a85d..f7fd881713 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 @@ -36,6 +36,7 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ 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 \ + file://0001-moduleconfig.py-python-3.12-compatibility.patch \ " SRC_URI:append:libc-musl ="\ file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ @@ -145,5 +146,3 @@ SYSTEMD_SERVICE:${PN} = "mongod.service" FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" RDEPENDS:${PN} += "tzdata-core" - -SKIP_RECIPE[mongodb] ?= "Needs porting to python 3.12" From patchwork Fri Mar 7 09:32:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Awais Belal X-Patchwork-Id: 58453 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D44F1C282D0 for ; Fri, 7 Mar 2025 09:33:17 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.web10.7484.1741339990457275012 for ; Fri, 07 Mar 2025 01:33:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mXHpLab9; spf=pass (domain: gmail.com, ip: 209.85.221.53, mailfrom: awais.belal@gmail.com) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-39133f709f5so244338f8f.0 for ; Fri, 07 Mar 2025 01:33:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741339988; x=1741944788; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d8vfpxFkezYUUFvA5ZhcXasknv8pe6axopT46gywiiE=; b=mXHpLab94FVwkllX2DmQ5naW9jMZ9I8G1ytAkRy6raPKWWGYEoEDYVfC+BEncRpGl0 b5j77rjdk7y05ND/AuiosurB097+GJSEDSRoKmzELDPPtbgwpSYizWXcXHiaDvSCqp96 lHVaNoUYv83vUutmTN4UFwUYXOpUYCUUdAjAYZR5KxVchPCcunbv8demNkWposyhc7PV skVwYQDTAB4bVGysOGAdLLGXEmHP1krgSSngb1ioNbsk8Mohk+PsfKgnNIdpSVy6s3vX Vr2M0kfo751sHsz2e56lyMyVCmEAwMW6gkFI22RcP5XlTZyYXdaI7dupnJAwmvU3WaYE 0cxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741339988; x=1741944788; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d8vfpxFkezYUUFvA5ZhcXasknv8pe6axopT46gywiiE=; b=XP9GyYS0aBtjTI5gE3URb4hz20mmsnhiWlAuUlN7SLPs6qO5oF3eoccrpgbukjsMrm YQMG5btlIgqrQuqp+w9Uhzir9vAFaEqz8rdeWMSmwNE5Xz/ZqI3GBUjHLMdbniVrmMRN RDeOt7v4NVG0OA/N7ovDkN5pT3lXvcwLCVWDE3W0MGznKNb9R0P1BH93w60ZTBxbVdy8 swcjK4sNCtLsEDkmQ4MKo74lpurHsffh5i/8ev3KxzVfDJ9zLyHL3DaWrQpNYKRGS+gx 5xFDIyoZ9tEumRZIsy+83OeKcNiiLLELBcxEbnPaSz0GFbc8aheOHiH8faz6RIHy78a2 rVWQ== X-Gm-Message-State: AOJu0YxUKch7u9XJ9eqt/6t62wDbDU+7TAkuQRh/SbB5Qh14RmdobxUN g8sQAUM3O9bVeDhUqgWl9vOfjJVsckuKNUOf6hE7R8vAONr3QttKFz3R9Q== X-Gm-Gg: ASbGncv/E+77HG78Uq6NG+SnJLzm68KK01FUCRrYTeElS3N1SFlGvW+5MPiz4we4Ypu 1cmV+hfDZ2gW2JGgcmxP7ZaDdMHumGV8bNnt2FfKKp0taFmHFLr0P5KkllMFkwwan0OUePAodWN fTpWOnqhs8md+mg1Gold0XLZxr05rn9xCmchcMsdrBO3doMhCog0nIfdVt0K25rYNdg8cmWQXYU HRDlQZZJ2XWh6n5RUX/RWJ3v670imFqpPnMHBlXguWzeTjwTQScII1GTRV5Kt9QcDBuaiBVGwUP kWmv86B/9SjoFko0A30sPtzMQAUyS5pXG8UH9LZTugq1tvo= X-Google-Smtp-Source: AGHT+IFps5FfhMz5ojv1pHeTPyWa0fZ+lA7L/i7tAn82rSf+5Ke2DmAuekUiq4QpvitOEo7ps2rQqA== X-Received: by 2002:a05:6000:1a86:b0:391:952:c747 with SMTP id ffacd0b85a97d-39132d16fe7mr1387740f8f.7.1741339988382; Fri, 07 Mar 2025 01:33:08 -0800 (PST) Received: from elitebook.. ([101.53.238.142]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c01952dsm4668359f8f.45.2025.03.07.01.33.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 01:33:07 -0800 (PST) From: Awais Belal To: openembedded-devel@lists.openembedded.org Cc: Awais Belal Subject: [meta-oe][scarthgap][PATCH 2/2] mongodb: update to 4.4.29 Date: Fri, 7 Mar 2025 14:32:55 +0500 Message-Id: <20250307093255.1110778-2-awais.belal@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250307093255.1110778-1-awais.belal@gmail.com> References: <20250307093255.1110778-1-awais.belal@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Mar 2025 09:33:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115781 Move on to 4.4.29 and drop a patch that is not applicable anymore. Signed-off-by: Awais Belal --- ...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 -Date: Sun, 29 Jan 2023 17:15:30 -0800 -Subject: [PATCH] free_mon: Include missing - -gcc 13 moved some includes around and as a result 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 - -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 - #include - #include - 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 \