From patchwork Fri Nov 26 04:35:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 424 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 5574DC4332F for ; Fri, 26 Nov 2021 04:36:17 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.20373.1637901376235564287 for ; Thu, 25 Nov 2021 20:36:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=EadM8AOH; spf=pass (domain: gmail.com, ip: 209.85.210.181, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f181.google.com with SMTP id z6so7698563pfe.7 for ; Thu, 25 Nov 2021 20:36:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=UK7FC1pd2sVfVkkpmgC951rn8iThjn5eprrPRV/hZnY=; b=EadM8AOH1c0nKmi0v7FlV1Iz2y4b1lU5hOPlqOKRxW/2D+PSltd9c5g6YkTEGg8v44 x28KvmyslLzji2MXNIRTUpIVMq8VF8spcgaC6Wh5MfZJ32WUysHVz1+KhbT2Q3ag3mve Lfae+Pp8kokZHGlztTocq3/QQoZWwXFLBoWq0JajUJ3Y2m00RyL3FkTHN/W6R3UyoFpy DUC5He295l9ca993y1MyVG0D3/eDtttnUA75nLcrZ7uFy/B04EtkVgI2nKvLnhgtJgl2 KzqmnrKkEc1VfcaAtjzm4eU1d4PSdEJhTX2M/5bJUhuPpNAsliV94Uz3OAfWWu7th752 7mlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UK7FC1pd2sVfVkkpmgC951rn8iThjn5eprrPRV/hZnY=; b=dxVHSE/3uXo7cuFLIDfRiM6IYtZvEO7hx0nilTn9DVqBBelIvFLLBAkw1vjsEtCuAj pQbae/4E4L2sl7e0V44aZYpFNJumdVpJ9CTD8cUdFehiSg3jBgSl2B20OPr6SCoOG5k7 YTW8h5CtZRLtTjkiIZx06lwmjSpz4ngHaD+h9p/ZKNYnHoAamDhJlSUi15KMISKhfLz2 JlIaG+B/JmNfM99pedLEno6W0rvCY0TYOiEmrR76sXz+eaaZtqkx278VASovqz6QOnAK MpggcyG/a0WMAjnHdtoW0pW9MwkCCe0Lmjf9Vic1bkrmudP/DehCgjrc0ruP2+3h9vjg 2k4Q== X-Gm-Message-State: AOAM533dZRnZMVY6cSWGHnLd9ChACJebERuObOA4R/CekxkhAaxjo8Yz wOtUu8SRtVZJELv42um4KVjdmrGbNbI= X-Google-Smtp-Source: ABdhPJyB1zOMlkIcDLcUTXB1eheKiUoIhqksTPlZxq/AAcTy79a5iqU2HH75qO/JDHkbddS0A2nsLA== X-Received: by 2002:a65:40cd:: with SMTP id u13mr19645421pgp.450.1637901375432; Thu, 25 Nov 2021 20:36:15 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:15 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 01/26] classes/distutils-*: add warning of deprecation Date: Thu, 25 Nov 2021 20:35:40 -0800 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158797 distutils has been deprecated in Python 3.10 and will be removed in Python 3.12 (predicted release date October 2023). Add a warning now that recommends using the roughly equivalent setuptools-* classes. [YOCTO #14610] Signed-off-by: Tim Orling --- meta/classes/distutils-common-base.bbclass | 3 +++ meta/classes/distutils3-base.bbclass | 3 +++ meta/classes/distutils3.bbclass | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/meta/classes/distutils-common-base.bbclass b/meta/classes/distutils-common-base.bbclass index bc994f78de3..59c750a3cf7 100644 --- a/meta/classes/distutils-common-base.bbclass +++ b/meta/classes/distutils-common-base.bbclass @@ -23,3 +23,6 @@ FILES:${PN}-dev += "\ ${libdir}/pkgconfig \ ${PYTHON_SITEPACKAGES_DIR}/*.la \ " +python __anonymous() { + bb.warn("distutils-common-base.bbclass is deprecated, please use setuptools3-base.bbclass instead") +} diff --git a/meta/classes/distutils3-base.bbclass b/meta/classes/distutils3-base.bbclass index d41873e4869..850c535bb17 100644 --- a/meta/classes/distutils3-base.bbclass +++ b/meta/classes/distutils3-base.bbclass @@ -4,3 +4,6 @@ RDEPENDS:${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-tar inherit distutils-common-base python3native python3targetconfig +python __anonymous() { + bb.warn("distutils3-base.bbclass is deprecated, please use setuptools3-base.bbclass instead") + diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass index be645d37bd0..a6d8e8763f3 100644 --- a/meta/classes/distutils3.bbclass +++ b/meta/classes/distutils3.bbclass @@ -14,6 +14,10 @@ DISTUTILS_PYTHON:class-native = "nativepython3" DISTUTILS_SETUP_PATH ?= "${S}" +python __anonymous() { + bb.warn("distutils3.bbclass is deprecated, please use setuptools3.bbclass instead") +} + distutils3_do_configure() { : } From patchwork Fri Nov 26 04:35:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 426 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 53DB8C433FE for ; Fri, 26 Nov 2021 04:36:17 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web08.20246.1637901376767808971 for ; Thu, 25 Nov 2021 20:36:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CErreP00; spf=pass (domain: gmail.com, ip: 209.85.215.170, mailfrom: ticotimo@gmail.com) Received: by mail-pg1-f170.google.com with SMTP id m15so7044240pgu.11 for ; Thu, 25 Nov 2021 20:36:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=HzOzdYGqR+RK6G3oXh9wx41hRsnHbbJQXlK9kl64lK4=; b=CErreP00ooQq5r0xbyjWkKLMFae7Y0KptbhHRlWNaoXERti2t/PdxpGNFL6WyfWE+D mtE2TYalw2z89eq1gjOwifYwJVgM2rMTOJIPdX4y+e5wr6ZzRk4SBLw4BxG4F1sL6v14 nwBw46G/MR/84OKvhihd1t0vuy2Stk3+4wetLmLys99Gzq0acioADMMCj3NdHYrh2EDK Q/duDtnkZ4FwIxLRqyDgYX73vJszmhFAZUVD0QcyiPOcmutvg4M75FUhmY34sjucpSdq 4nZ6n9W67sQP+8cx++w4joewVPOcyy769+S8pfS6kPYOmjgjrSDS5KOHdXhYUZUnecUm FHbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HzOzdYGqR+RK6G3oXh9wx41hRsnHbbJQXlK9kl64lK4=; b=QyTWYR6aQFQeWoa8Hjfe1cFZuRuKJm6JmO/xnALAyJuVvRt7oymr66AX8b73km9R9s 8mB8L+xdLcbRDPKfm5GV+uvkeRYRrAktP0leKdcPN6wqg1oNuGZ+31RZJhfpd5GQCkIC kmi9bb8OS5HGXjBT8GreO+Ilhnr6yjS0GQmdN5wPlap/l+oW08ejlSxZUVYp4UbI0giy KRjICjQ1aGGYOYDA1qpgAMAN87B3kDaw3ENm2d74cvYkZsvRpbAPGGoQqJsClIPKpOVY sYDfpGknqvQQehFCz4ZVyeJV8BI1cWB5wdyPm5RNFQ4ZHpdFEN1AeVI01fa8PEqXn8D7 tvuQ== X-Gm-Message-State: AOAM533Bf1q5OtRqPzjGfSQS+Xes/jAlN85eDqpu2wSAfO9i0mzJtwMp V1+H20MAs08vEa2k1HOqSY/M4dS/z44= X-Google-Smtp-Source: ABdhPJz5KUO812B+b6yX/GbLJRe0X5WiSI99aHu+pcYU88zKPazeCREEd4Rm+9nMC7GawEtoO/tNRA== X-Received: by 2002:a05:6a00:1312:b0:4a4:e341:213a with SMTP id j18-20020a056a00131200b004a4e341213amr18518153pfu.57.1637901375932; Thu, 25 Nov 2021 20:36:15 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:15 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 02/26] setuptools: refactor for no distutils bbclasses Date: Thu, 25 Nov 2021 20:35:41 -0800 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158798 Signed-off-by: Tim Orling --- meta/classes/setuptools3-base.bbclass | 31 +++++++++++++ meta/classes/setuptools3.bbclass | 67 ++++++++++++++++++++++++++- 2 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 meta/classes/setuptools3-base.bbclass diff --git a/meta/classes/setuptools3-base.bbclass b/meta/classes/setuptools3-base.bbclass new file mode 100644 index 00000000000..5098ae9d64e --- /dev/null +++ b/meta/classes/setuptools3-base.bbclass @@ -0,0 +1,31 @@ +DEPENDS:append:class-target = " ${PYTHON_PN}-native ${PYTHON_PN}" +DEPENDS:append:class-nativesdk = " ${PYTHON_PN}-native ${PYTHON_PN}" +RDEPENDS:${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}" + +export STAGING_INCDIR +export STAGING_LIBDIR + +# LDSHARED is the ld *command* used to create shared library +export LDSHARED = "${CCLD} -shared" +# LDXXSHARED is the ld *command* used to create shared library of C++ +# objects +export LDCXXSHARED = "${CXX} -shared" +# CCSHARED are the C *flags* used to create objects to go into a shared +# library (module) +export CCSHARED = "-fPIC -DPIC" +# LINKFORSHARED are the flags passed to the $(CC) command that links +# the python executable +export LINKFORSHARED = "${SECURITY_CFLAGS} -Xlinker -export-dynamic" + +FILES:${PN} += "${libdir}/* ${libdir}/${PYTHON_DIR}/*" + +FILES:${PN}-staticdev += "\ + ${PYTHON_SITEPACKAGES_DIR}/*.a \ +" +FILES:${PN}-dev += "\ + ${datadir}/pkgconfig \ + ${libdir}/pkgconfig \ + ${PYTHON_SITEPACKAGES_DIR}/*.la \ +" +inherit python3native python3targetconfig + diff --git a/meta/classes/setuptools3.bbclass b/meta/classes/setuptools3.bbclass index 8ca66ee708e..4b8eca3f96e 100644 --- a/meta/classes/setuptools3.bbclass +++ b/meta/classes/setuptools3.bbclass @@ -1,4 +1,69 @@ -inherit distutils3 +inherit setuptools3-base +B = "${WORKDIR}/build" +distutils_do_configure[cleandirs] = "${B}" + +SETUPTOOLS_BUILD_ARGS ?= "" +SETUPTOOLS_INSTALL_ARGS ?= "--root=${D} \ + --prefix=${prefix} \ + --install-lib=${PYTHON_SITEPACKAGES_DIR} \ + --install-data=${datadir}" + +SETUPTOOLS_PYTHON = "python3" +SETUPTOOLS_PYTHON:class-native = "nativepython3" + +SETUPTOOLS_SETUP_PATH ?= "${S}" + +setuptools3_do_configure() { + : +} + +setuptools3_do_compile() { + cd ${SETUPTOOLS_SETUP_PATH} + NO_FETCH_BUILD=1 \ + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ + build --build-base=${B} ${SETUPTOOLS_BUILD_ARGS} || \ + bbfatal_log "'${PYTHON_PN} setup.py build ${SETUPTOOLS_BUILD_ARGS}' execution failed." +} +setuptools3_do_compile[vardepsexclude] = "MACHINE" + +setuptools3_do_install() { + cd ${SETUPTOOLS_SETUP_PATH} + install -d ${D}${PYTHON_SITEPACKAGES_DIR} + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ + ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ + build --build-base=${B} install --skip-build ${SETUPTOOLS_INSTALL_ARGS} || \ + bbfatal_log "'${PYTHON_PN} setup.py install ${SETUPTOOLS_INSTALL_ARGS}' execution failed." + + # support filenames with *spaces* + find ${D} -name "*.py" -exec grep -q ${D} {} \; \ + -exec sed -i -e s:${D}::g {} \; + + for i in ${D}${bindir}/* ${D}${sbindir}/*; do + if [ -f "$i" ]; then + sed -i -e s:${PYTHON}:${USRBINPATH}/env\ ${SETUPTOOLS_PYTHON}:g $i + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i + fi + done + + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth + + # + # FIXME: Bandaid against wrong datadir computation + # + if [ -e ${D}${datadir}/share ]; then + mv -f ${D}${datadir}/share/* ${D}${datadir}/ + rmdir ${D}${datadir}/share + fi +} +setuptools3_do_install[vardepsexclude] = "MACHINE" + +EXPORT_FUNCTIONS do_configure do_compile do_install + +export LDSHARED="${CCLD} -shared" DEPENDS += "python3-setuptools-native" From patchwork Fri Nov 26 04:35:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 427 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 54BD5C433EF for ; Fri, 26 Nov 2021 04:36:18 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web11.20017.1637901377509602225 for ; Thu, 25 Nov 2021 20:36:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XY5+/qTG; spf=pass (domain: gmail.com, ip: 209.85.214.181, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f181.google.com with SMTP id m24so5863993pls.10 for ; Thu, 25 Nov 2021 20:36:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=d0r/J/jlsTQ4k+w4ggsWQy5Wy5EWvzGs5EcR7b+BIzY=; b=XY5+/qTGkn0n4WJboiDwwgOVblPUXLxwWIlIrAU2EHinzIQOXRKSlL6MF48ImXkQeE swGvyS73+5TdtwIsaUqONpVg+xXL05Xku7BF8HvEK6OWXl9sEC8gblQQFjNWedfErWLV XEM5lNrt8Lq9elu8fzvnCMVRFROLR52JycJEg3goA8pcu8VbkY0IK7Qg5KTgFq4orvrX LDimXCGtQSnzBvipp4Kzel/cyz520+4c4ifp62VXtzsxBqAYEYJ44ynVCoh6c395R+yv oRVC8ROwdLoIZOtEhawCi6phRFFJi6HLPXrChCHWrcyq5MMPn+yeylgjBgstTdMEUOd5 csgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d0r/J/jlsTQ4k+w4ggsWQy5Wy5EWvzGs5EcR7b+BIzY=; b=fatjbdAfRCrWbeNZA/V+Wj05JXKPOJAthUID4hci6pTOr4kvvBykI23Qf1yjOnCAAF 9YBgvFRh2M9uYnoG/u2+ep4o0fJJpqtsaXUruQ0ClGqqzy4PzNdLU+Bftxi4IJj4zwNx 4MK8+nxmWiWNigST2JCqPxHU4p3HBgRRtIjrHJbIQ3ChLZuAf/VjIoZ4/SLpxrlqpsxE +lRST6faFXj9IEkj9A3W+VCVfcyUX7xy5iooC/6gon1UrSUzNPRi2I3Avh3HH2CTg/Hm voweNXKRsSqumWwgk45w1YPN31plkDkGksv9+gK5qW24Xpx+jMxfOlshQmIvJ806dyTf 2Vtg== X-Gm-Message-State: AOAM5319f9dVfZv33G9GEFBM7VBaF/VMW2oHR9OJwx5AhkM9uJ7n7myz H0DhmH7EPhwFPWNjeelvv84blIciNWE= X-Google-Smtp-Source: ABdhPJyqm5LpMZJ5wRHqWGZhcbZq89TJCHZReiulUQ7tbAopVNOKJAuxky4yrShaIglCFYMAFyZLJA== X-Received: by 2002:a17:90a:72c4:: with SMTP id l4mr12810929pjk.149.1637901376493; Thu, 25 Nov 2021 20:36:16 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:16 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 03/26] python3-cython: DISTUTILS_* -> SETUPTOOLS_* Date: Thu, 25 Nov 2021 20:35:42 -0800 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158799 Refactor to new SETUPTOOLS_* variables [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-devtools/python/python3-cython_0.29.24.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-cython_0.29.24.bb b/meta/recipes-devtools/python/python3-cython_0.29.24.bb index b1d21bd15c0..26333cb2718 100644 --- a/meta/recipes-devtools/python/python3-cython_0.29.24.bb +++ b/meta/recipes-devtools/python/python3-cython_0.29.24.bb @@ -8,7 +8,7 @@ RDEPENDS:${PN} += "\ # running build_ext a second time during install fails, because Python # would then attempt to import cythonized modules built for the target # architecture. -DISTUTILS_INSTALL_ARGS += "--skip-build" +SETUPTOOLS_INSTALL_ARGS += "--skip-build" do_install:append() { # rename scripts that would conflict with the Python 2 build of Cython From patchwork Fri Nov 26 04:35:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 425 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 3F052C433F5 for ; Fri, 26 Nov 2021 04:36:18 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web08.20247.1637901377851688983 for ; Thu, 25 Nov 2021 20:36:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=q7xeux2a; spf=pass (domain: gmail.com, ip: 209.85.216.54, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f54.google.com with SMTP id nh10-20020a17090b364a00b001a69adad5ebso7157310pjb.2 for ; Thu, 25 Nov 2021 20:36:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6lLwt4GpoDevz1AN7Vy8oVSzSMr15Iek3sUK3npTvwA=; b=q7xeux2aa3UgkCwDDwYqmIu4BoCdHVyDlBI3ARz76Y0Ajrpz22bg8ODe+3lWFNny2t MwacRpiK2X4rOrl09O2Q549BpLfJRTkf8OIJ1qcn7eJCIJdlWhDkzANvzuCxOqA/Y9mh tVGK7YOH/9xeac7M8nfdLMCHZpq5cM6WXvECR4G6E2yVOmZ0P1/qxR+HtmdtObEbDL29 0jZhVZkD2ahjZ1dMPuJ2wSJ3l1qtoYAfk+WKwUhMC2ronWD33VsjCschAWqi+TU2oPyK ej9uzElpDCKj3NK3N/RTdS6TyuAKKmywo70ZHhCBqmIb25/B5DQADl5On8IkXHBveSdT u+SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6lLwt4GpoDevz1AN7Vy8oVSzSMr15Iek3sUK3npTvwA=; b=kd6hpNotMIeHQ7o1wgoCl9H6IAnyyLohSba5Erwg2MgdiqpyqYPauE/WM+ejsskOEz dSY6H6uDlJshvgJDUWPmtuks+dtAJJCL4NEHbHJ4sxLptSiDJPCvaPSfX6h6ZXv5Gd9f 4ixNStZFwD+yE7lRLzHqcCyAPF9g5YcjYtX7YLofIkIgQrhtgYuYDqNd5SkOFGZv+RHL Z7c/MX53R4V8h7VgHf8KG5VBlJpsXdQyyNHVUF+1o+OoZTUUKO7slAeaOh0MzV4GvqmM HoakVTZPcqDoHbogcx3SS04ZH5I1h2qzbUBxFJVJCCQj7c5t3nmRncdcrK4AaphDRDa7 PKUQ== X-Gm-Message-State: AOAM531AxpEo7TX97JCgUWBFzYkQAOQTLWLBybqSoF9zwbML+TBsRj8a KAJG1fF7AfzkyhqEqbRVG6Qu4NdnNVQ= X-Google-Smtp-Source: ABdhPJw5ZxqKGygNtY3SbLi4RLSfUNFXSSdvDSPSrnFX5LbCWw51V6EmT3eQCIGzLvPrQS6Czk+ciA== X-Received: by 2002:a17:90a:4d0c:: with SMTP id c12mr13103047pjg.151.1637901377090; Thu, 25 Nov 2021 20:36:17 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:16 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 04/26] dnf: inherit setuptools3-base instead of distutils Date: Thu, 25 Nov 2021 20:35:43 -0800 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158800 [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-devtools/dnf/dnf_4.10.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/dnf/dnf_4.10.0.bb b/meta/recipes-devtools/dnf/dnf_4.10.0.bb index cef2c03e4e2..6ff2a6b1e6f 100644 --- a/meta/recipes-devtools/dnf/dnf_4.10.0.bb +++ b/meta/recipes-devtools/dnf/dnf_4.10.0.bb @@ -23,7 +23,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" S = "${WORKDIR}/git" -inherit cmake gettext bash-completion distutils3-base systemd +inherit cmake gettext bash-completion setuptools3-base systemd DEPENDS += "libdnf librepo libcomps python3-iniparse" From patchwork Fri Nov 26 04:35:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 428 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 3FDA5C4332F for ; Fri, 26 Nov 2021 04:36:19 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web12.20164.1637901378310525906 for ; Thu, 25 Nov 2021 20:36:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AUM7a0TF; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id p18so5849131plf.13 for ; Thu, 25 Nov 2021 20:36:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=tghklvfHEEB1MX9anlA9EgX/tgbRc65qK+ewh6e++BA=; b=AUM7a0TFu4xUHHWfSwLhk8ZFQIcS3Qo4eW8lvl3JYYn4ihUsyOLtADXgfQiqckV/iJ s7SG6LcGemVNXohj3NMasETIeqwALZCXbkJTh7Y+MdK68k1ps8B7s5ZKCdbQ9D5K6ycg AcqE2nwqTnB0nJABkrSyfE3JY9E6vb0q3Ki8vBNxdLTi3GfMF8at8731zweigJwc7Vgu s2sjlw8BwmbnNb9299ANMxEVhJAHECEMEfCgGTn9w6DGvCEIbdI5t3MEhotkeWh8yMTv RpWn2feDdEOiGdVmB0q/nGugMmY9Gxl1UKCmo7JktpPcUaisycQ+sn7/IpQajEhTS48C Sk6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tghklvfHEEB1MX9anlA9EgX/tgbRc65qK+ewh6e++BA=; b=GgZbB+uEbWUoV7Vx6ag+U5zJP5ym46r1uK2evtVmYyBTP4xLyblICbZTydtbBJ1TpN B55h0BgWG8CvhTEyK8UMwk5BLmfzEEc9dtg+Hzb9pO/Lq5+uI8xIUkd6azZyadKGyyZk yFStHCBfJf5JZ54gj1JSSLPE/U+KAf2Kb++XyrshXMoEwvA/2ncZWkfxStSEEm3wc7mV yk3Q5RFJ13SGSeAEBFHcXuj5AchEvBdb+XGvjnEG+EXj+9P9EYCAhJjquukF2hXeXcKY Sq/KFJ8oJW9xkmL0ufSpIksrudrqOYWIRMmhdpAGHMkEe+r1TJjb2Bb4/nevc6EzVfLR fNyg== X-Gm-Message-State: AOAM530Foi9KIYMXKH5SLyFM/SW4s3o1Z6bvr6cRuu3W3ALI1Ruk6QPn 6gVEyqS/PNX+n6f1TDGddmB1z2RWA5k= X-Google-Smtp-Source: ABdhPJxD7wv46BnWAbwh/JV4IYTAzecFU5T/9zwdSfjTaWGapLfF4xHZ+O9qq8jsauujgFRISk3j/Q== X-Received: by 2002:a17:902:b712:b0:143:72b7:4096 with SMTP id d18-20020a170902b71200b0014372b74096mr35753661pls.25.1637901377604; Thu, 25 Nov 2021 20:36:17 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:17 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 05/26] libdnf: inherit setuptoools3-base not distutils Date: Thu, 25 Nov 2021 20:35:44 -0800 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158801 [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-devtools/libdnf/libdnf_0.65.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb index fbda7769c07..81da04c9ca1 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb @@ -22,7 +22,7 @@ S = "${WORKDIR}/git" DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native" -inherit gtk-doc gobject-introspection cmake pkgconfig distutils3-base +inherit gtk-doc gobject-introspection cmake pkgconfig setuptools3-base EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DWITH_MAN=OFF -DPYTHON_DESIRED=3 \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DWITH_GIR=ON', '-DWITH_GIR=OFF', d)} \ From patchwork Fri Nov 26 04:35:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 429 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 4C7F9C433F5 for ; Fri, 26 Nov 2021 04:36:20 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.20374.1637901379174272680 for ; Thu, 25 Nov 2021 20:36:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=L6fYgrba; spf=pass (domain: gmail.com, ip: 209.85.214.174, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f174.google.com with SMTP id m24so5864031pls.10 for ; Thu, 25 Nov 2021 20:36:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=NI+x7HNcjduaSqgHHEtMjDC/yb6uT3eKEFKPDLhNUuY=; b=L6fYgrbaeTnbj0tO9+O/tiwvouz0QqypwsaGo48Wq7g3Lq847rFglvTQFEbvWzTaDi hXTOr+aN9Bln+NWZ0kaGcXTKoS2484dWa0CdcIN3kGHFI+Ds1PvlLGK7SGssr/T2YGCk tEh5i26nlYnxGmmHvrKrd+hstpbSwvUcwwNX4q9v6pELBkqTb4pI1EBSqBOHdgjQ+Wao 1JcJUOoFmmGUuHogL+GMmaylESQ+TcyD7TcqydokZo1dDX0bjTtHf2lMP315qRILOsjB e9Q3cLGJFMrelN6hioV7ZGNqvP4J/iBjE+JAoGfqqKWN1gkd669HndgYeBQk5DKUJ+YT 5O+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NI+x7HNcjduaSqgHHEtMjDC/yb6uT3eKEFKPDLhNUuY=; b=cYz8/mlT0a2fCbD6g3zXKeYSNCq0ix5NspD4e7TV62qoJ9/+wHpBKyEB0cBRNZ/WYI PJDsBfr+0frf1RAOEd2H1BdYpuhKyr9i5bBc0eNpg3rWRX/KTSsSCJMVvF3oKvDpY6+2 fEupXzjak0WubitSwpZoW9jOuSBV99G0Gso8q/u/gJ9pHXV5uB6SHm6OkQLn6C915k+R S+0mHRlmFFc9Xx+AIx0z/cB9vQQwh5JaaU+XU3fROc2V6KKbRSRsWqGT8QaDCru28NB5 Z+RKnEY2e+PBh9xURFdEzQOmE+JnM1uCnHOFOrHFHIDSosSWw6/1MIkU4l1Eo70sdAmI Tv2Q== X-Gm-Message-State: AOAM533BIAo349KCuRp73XMVOO4Ff10DYIzsZ0T2Ofzl63N55Nzokx1s kQdZ+jDASf3snbjej8VfXLPViHGdSGc= X-Google-Smtp-Source: ABdhPJynGbawsz5YUGbw+EcvVWwbySMDACyOBKOGc0d+AzVzTtJfVcCb0qUIqCU93OVWQJeYTucmfw== X-Received: by 2002:a17:90a:6b44:: with SMTP id x4mr13076294pjl.27.1637901378364; Thu, 25 Nov 2021 20:36:18 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:17 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 06/26] python3-dbus: inherit setuptools3-base not distuils Date: Thu, 25 Nov 2021 20:35:45 -0800 Message-Id: <63db93f8f02ca26cb4a0ad479bdc340f41b89bde.1637900380.git.timothy.t.orling@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158802 [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-devtools/python/python3-dbus_1.2.18.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-dbus_1.2.18.bb b/meta/recipes-devtools/python/python3-dbus_1.2.18.bb index 9592fbf7169..c4687de13c2 100644 --- a/meta/recipes-devtools/python/python3-dbus_1.2.18.bb +++ b/meta/recipes-devtools/python/python3-dbus_1.2.18.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120a S = "${WORKDIR}/dbus-python-${PV}" -inherit distutils3-base autotools pkgconfig +inherit setuptools3-base autotools pkgconfig # documentation needs python3-sphinx, which is not in oe-core or meta-python for now # change to use PACKAGECONFIG when python3-sphinx is added to oe-core From patchwork Fri Nov 26 04:35:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 430 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 3FC28C433EF for ; Fri, 26 Nov 2021 04:36:21 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.20020.1637901380321003358 for ; Thu, 25 Nov 2021 20:36:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dBVSgKuF; spf=pass (domain: gmail.com, ip: 209.85.214.169, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f169.google.com with SMTP id u11so5886090plf.3 for ; Thu, 25 Nov 2021 20:36:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=FJPJ/IPzbaE4muT/9AeHTYH1/kZGY7qDYxPFjt91Aew=; b=dBVSgKuFqneJZ7hEJUni6NWACCUsmwaek6Jed54txzfU1yXBc/iFlnIMEKZ56wncGC Ha3zXBRstMJ+v0tMRY9+fKXwgtkZEj1vNCL41APks+y6pda3kzxZokONqhAXU88YWE2+ j860bjrBvXHxjAjtbOmkO+aTOsKCo8KcE0IezvwRqqezGZR8OZc34+NJrACDiVoNq8Dh 3KIg1h+NNacSlvKUysLy+1b1Y+Psjt4dYiD6cCdjz8zQhn2sG5G5xzf6fGiZzfG1lj8f RUp5TrKkBV4UHJEkHoA7NO1n/aWxgtzXq7D0GE3Wj96Ll3prHbdI4vX2NW/Eqwn1Sr9M LiZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FJPJ/IPzbaE4muT/9AeHTYH1/kZGY7qDYxPFjt91Aew=; b=d8dP5Jc/IvdnGV9WUeAYt+3qIsM59nzUeXPytXcjpkCyLv0w289af25ySmLC5VutBa 7x/NlFzp5a0dvuJ7OrTd6+ddN/Jt6ERYrvMBvMPgKxhMZpk6iVTtntSy3dboRPKUGU39 lgddC7MuI6a+mkm7CQnQPTRLAxDgXEfrjIYV920dNUoQuveHf05tP2eik2jKhBvzd6EG lBsBhmCrroeYN9v5hR3w4fuZmzRL0V2pGGp/+4F0m73Wk7WnjfGcnM9z+R0rv5wt/1k1 5K/oLWHi7Yswgww4orrN4zHbk+UDbtHI1IKvNz+9CveDY8BPGYeMkL7qRo+ls+TeLxl5 VFaw== X-Gm-Message-State: AOAM532li8c30Q0XuI2izSPT9NRaAQLFM+ItvqpqFela4/GVaRaxYlIV 80s8GKmIYEnyiUFR3s9y0UW+tfUTpN8= X-Google-Smtp-Source: ABdhPJy9cZa7dOjTXoy4SDKWQIFUvAB/1ex+Li/XK7X7vqpXWPcDM7e4HRqFs/9AzM4E9qsNEGezNQ== X-Received: by 2002:a17:902:b60b:b0:144:e601:de5 with SMTP id b11-20020a170902b60b00b00144e6010de5mr35026616pls.36.1637901379554; Thu, 25 Nov 2021 20:36:19 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:19 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 07/26] gpgme: inherit setuptools-base not distutils Date: Thu, 25 Nov 2021 20:35:46 -0800 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158803 What was distutils-common-base has been merged into setuptools3-base, since we no longer need to support python2 and python3. [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-support/gpgme/gpgme_1.16.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/gpgme/gpgme_1.16.0.bb b/meta/recipes-support/gpgme/gpgme_1.16.0.bb index 0ab30d93b9e..d31e1b3132e 100644 --- a/meta/recipes-support/gpgme/gpgme_1.16.0.bb +++ b/meta/recipes-support/gpgme/gpgme_1.16.0.bb @@ -59,7 +59,7 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ --disable-lang-python-test \ ' -inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT} multilib_header +inherit autotools texinfo binconfig-disabled pkgconfig setuptools3-base ${PYTHON_INHERIT} multilib_header export PKG_CONFIG='pkg-config' From patchwork Fri Nov 26 04:35:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 431 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 44F85C433FE for ; Fri, 26 Nov 2021 04:36:22 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web08.20249.1637901381238719028 for ; Thu, 25 Nov 2021 20:36:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ibRLpPSM; spf=pass (domain: gmail.com, ip: 209.85.214.173, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f173.google.com with SMTP id o14so5881409plg.5 for ; Thu, 25 Nov 2021 20:36:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=slFTWDu5YltNJqdbEVOkkaPEYR/Fj4s2oRnkajD7QdY=; b=ibRLpPSM0BTgMQERjuQdkdsh845t73R8tycMy+OsLW66zJbkI2COOBRIwzFjCtEekX duxPQzV2T3zx3VD48tAhOu54F9VNd3ZLo8ltCu0ir5yBiI24D8vf2EWxvr2E8nw8clSB UC4y6Bg7qYM5wkaNEwX5sZhr4tL6LFKL/A/uvfKQuh/o0MCszou+grrahS20uHRZf4p3 Pm2E1qbX3w+A9RDN9pC2x17nvakELiSs0OIW7iUY/YyDhYsbtExY/2hshrkSyL8dwZ+y 8tDsPt6FIesPJFDyJIFFueJOx86x4DJBX9r+/618NVTo/qJV8MMbFjs/cEH4mqCOYRE3 kChw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=slFTWDu5YltNJqdbEVOkkaPEYR/Fj4s2oRnkajD7QdY=; b=7pQM9OdOCQks4ckLLzxFxCJ4JGLtMX7qEPe6vrkoSeMB0IEpoWipJ3zY8XsrWP6qvU pi6dFHOTZyQMPvADiOE8QoWTMuzXB5m8gvJgMPT3ejj/eUkvomsJ3oKCgJQ8xj2Wtxgg W871Agz4CZ3MSK3VPFfwge7jB7ogn33UoFNczA7+EQ0GBdRrjTgeY26PvQichNVb/p0Q NLtFZxK3DAB27UENS176bHFF0bNOqdRlDqNPCsywHrQYjvMEsByTlJ9f667qHy3zoHxz +p0YOd9m+haP86Her1SWkYNvwzTuPDstDSt23TC/dhgHRwodYQMNKkKk+Ck5spvv/3I9 DheA== X-Gm-Message-State: AOAM533j5u0mHxRHXyDaPxQN0PwQA9hzUq6bp0kdTeWwa7nCdL9Tg0Jz wDRUgocKTdLelc/5Cxa8le7Ludg/pfM= X-Google-Smtp-Source: ABdhPJzKsbaDIC2tFubCs0WNMFoMYvO1Okk1hmyBU9wBVyQDFC9rRF6aG17D7VAOyHH9JIPo7R92lA== X-Received: by 2002:a17:90b:17cf:: with SMTP id me15mr12693115pjb.125.1637901380509; Thu, 25 Nov 2021 20:36:20 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:19 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 08/26] python3-pip: inherit setuptools3 not distutils3 Date: Thu, 25 Nov 2021 20:35:47 -0800 Message-Id: <2b050699e8854c54b423a69b69777eac9008138c.1637900380.git.timothy.t.orling@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158804 [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-devtools/python/python3-pip_21.3.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-pip_21.3.1.bb b/meta/recipes-devtools/python/python3-pip_21.3.1.bb index 6ddb1d62966..c893135059b 100644 --- a/meta/recipes-devtools/python/python3-pip_21.3.1.bb +++ b/meta/recipes-devtools/python/python3-pip_21.3.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c4fa2b50f55649f43060fa04b0919b9b" DEPENDS += "python3 python3-setuptools-native" -inherit pypi distutils3 +inherit pypi setuptools3 SRC_URI += "file://0001-change-shebang-to-python3.patch" From patchwork Fri Nov 26 04:35:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 433 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 405B2C433EF for ; Fri, 26 Nov 2021 04:36:23 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web09.20184.1637901382190017132 for ; Thu, 25 Nov 2021 20:36:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HHIHYpYM; spf=pass (domain: gmail.com, ip: 209.85.214.171, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f171.google.com with SMTP id y7so5913825plp.0 for ; Thu, 25 Nov 2021 20:36:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6vJuPRVeBMyGsGaG6HjVmDqv5w5KRsuJmj2SF0AAl1Q=; b=HHIHYpYMDmwlyOIA5TXNK2ajErxVNqUFh8hIJW3ICAA6vUbmOJaHvrDsca55grQs65 gFmJrAPX3b1xoSz/rbw76nwjKL6Zw8+j0R0dyTtwdMi62N75341AXJbAKB4c9C7VI6a9 IybQO7qTWLubYnPPq2/n4pvnOq+J8u84uxRtCQolKObYl40IKN7ejr2fAIyS7/CSkQOr 6kAg8XZq0VCs6JgVx/UPgxLjWhJdKC8LDPE+Ub1i7yz0oS2Mr1O55L/colfJ3BqsiDbv Ow8kEXKA5b/EABHOsoyD25eWti6Auo6vgJinm5xiTdpRNxmTxa9JOKBq2UY0mJpfq22h fd1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6vJuPRVeBMyGsGaG6HjVmDqv5w5KRsuJmj2SF0AAl1Q=; b=paC27F3Rz7enuQwAIisan/4GnQqhqt46mOdrSUwwZUa1Y4/Jc1MXTPrFkri7x3Hcwx YQXHDDq5/CUTsMfwA3TIcvP7BTFgvuK1IQMFmJGH93EeYvMQC5THya2/y3Ktm2HyWIkR n7mfuSiIF6J16DLOB3ub61i5VA7HK25xtiDiH3EvfXM2KLuBR+pCGwm1OTUgYOJzf2xB 6KPOdXqxcBEbyedslF4NFyYtBeLayqocv0XHuXXGeqkkqLroaVT+Jot6Zd3pm67rkgaT gXcCJ5/8QZJ3DMPUrnTx2Qa71Iz1yr7YF9ImQRaxtlaSM97+77N3aXwVIvYErOoabuTa sceg== X-Gm-Message-State: AOAM531tIBeMTvE+Dkv2vCt1MfUTMBmrTxGP2mHzjPmn5Xl82aiqtgOJ EhS9Ank4Y3IitBkvJgK5se1wVuwIpu8= X-Google-Smtp-Source: ABdhPJxBotb5B5tHGAuO2ZYtmSh7FwZx0CSzOHnpZQBrlScJm8s3bUydlNCK6yVSWvKvakQ3OLs1jg== X-Received: by 2002:a17:90a:98f:: with SMTP id 15mr12616922pjo.166.1637901381509; Thu, 25 Nov 2021 20:36:21 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:21 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 09/26] systemtap: use setuptools-base not distutils Date: Thu, 25 Nov 2021 20:35:48 -0800 Message-Id: <4c0de0b46c78230ac31a5079360b2439f2ba6e43.1637900380.git.timothy.t.orling@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158805 [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-kernel/systemtap/systemtap_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index d11d9b93a2d..04f7e03ab50 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -31,7 +31,7 @@ PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c" PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes,python3-setuptools-native" inherit autotools gettext pkgconfig systemd -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3-probes', 'distutils3-base', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3-probes', 'setuptools3-base', '', d)} # exporter comes with python3-probes PACKAGES =+ "${PN}-exporter" From patchwork Fri Nov 26 04:35:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 432 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 4D487C4332F for ; Fri, 26 Nov 2021 04:36:23 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web10.20375.1637901382942504845 for ; Thu, 25 Nov 2021 20:36:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cxVWPFE3; spf=pass (domain: gmail.com, ip: 209.85.210.171, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f171.google.com with SMTP id g18so7717223pfk.5 for ; Thu, 25 Nov 2021 20:36:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=hji0Nnp7v6IeFcv1EBmdMErsdva/9sqEuusGCzWqUKA=; b=cxVWPFE3cfUIAQIl/ZlLT8fCfDqqLXHfmsa5zWzjcFztH5B1WZYgxB/cYQGM/zkUyh EvhK31wwuVmtKaHh0LnA8mHB/PqETbvXj/9SYvrv77bzPQCQqMwRGig1W/pfEJ+yMFjt ql4GIgamkl5kCiB/EHc8M/O/P/BYXbntFIAfVzhGK8nzrl67fD/HuFSFbn8cyxSMVIMJ 5xryEJrv7T8smwhEfTschmGfgH/LM95EFGm9MjqxdFYi7lXbqYOk1Xu2yBZbnDiwLDYP atKWPoCPRqMV94CvJIDl6O7XhzlH8g9s7O8AvyxgbqSgagHqIoLzUTnG+Z8wku9OfphX zfYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hji0Nnp7v6IeFcv1EBmdMErsdva/9sqEuusGCzWqUKA=; b=TtqjNsa6Lcnj1TqLwGUKDs4lVs+zN8UXKZtsYrZ7qkU0DlZqE5pBtDHtwshG4EpJFi TE86//4n/ysDHVInu54Ub5SSGeeUQ3mDpOe5AGGZ2uZ4ffHYCEYi3MaKYrp81KYbST7O tJ3k1rQo/Vk6qtSye4C8GHj1lCB5I6O5emXYYrpVxpEh73T35ewK5ChCiKD1EAru9gLz LKlkBrpbuVLC3zMBfTEEbMdSWh931Ph7CeRzt/gzvIHerWH4LXPbIVlCe3kJjZR+YRrm QoYkb7SOO4G9F85pagiS3hNH53jhGvsnbFQCc1bwIRmE5AC0n/Meaa7P/yY8TZNrbyL9 rw6A== X-Gm-Message-State: AOAM532ecItbjyP4gH0Prvduf2oOU7QbOhualfeThi9oTvjzYCH3mnCY +TmeDtB2o2XhM13p+v45F0HAkG6+pEA= X-Google-Smtp-Source: ABdhPJyhy2X1TNmx/VAm9+CDO3wCIhYLIObcWTd0ceGPtWi6xL/07TEsHnAR4d3R1mCtrYF63eocgA== X-Received: by 2002:a63:d915:: with SMTP id r21mr20016651pgg.40.1637901382310; Thu, 25 Nov 2021 20:36:22 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:21 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 10/26] libcomps: inherit setuptools3-base not distutils Date: Thu, 25 Nov 2021 20:35:49 -0800 Message-Id: <6ed2a48c9a5c9109db2b889be7779727e04854af.1637900380.git.timothy.t.orling@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158806 [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-devtools/libcomps/libcomps_0.1.18.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb index 3fd4d5b83d4..5fa7fd3e35f 100644 --- a/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb +++ b/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb @@ -13,7 +13,7 @@ SRCREV = "dee4ae37f7818709802de28c4d16fa823bd83ae2" S = "${WORKDIR}/git" -inherit cmake distutils3-base +inherit cmake setuptools3-base DEPENDS += "libxml2 expat libcheck" From patchwork Fri Nov 26 04:35:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 434 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 405D9C433FE for ; Fri, 26 Nov 2021 04:36:24 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web08.20250.1637901383826164099 for ; Thu, 25 Nov 2021 20:36:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=k85ioSnm; spf=pass (domain: gmail.com, ip: 209.85.215.179, mailfrom: ticotimo@gmail.com) Received: by mail-pg1-f179.google.com with SMTP id p17so7063416pgj.2 for ; Thu, 25 Nov 2021 20:36:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=20k+4gHVqOm75/Uh1nIyZAF1srV8GQHUg2TXo1AxwDM=; b=k85ioSnmVslmazxlYiTC0grITxI2uQHxPK8KaiGdqDT+BJEiGiD6PjwRM1JSOqNc9H yc/40ijuj2pnZg3+KMWkR7mp+mB0++lbwYvULj62yDxgcbIIMiN3Pjb8kx7pf1WErwv3 a9hRPeQNbOD7Nls5iKaqX/sFmw6kOuC5JWZVFiFoiz/rGFulQvmJqlPBxkTgqfoOd+t9 tMwpqIM4jFwMHwFeiBCRx2BO1DPtWkqOXFNNHNZfeyIAls433obv39vChBTMRZxR6F6q CcPQ7oAv0m58bhGSw2TQfh7/SvKanaMQ8WIYMAAsfHBC5OwVAcUdDNEk3zIfGj7MgeuI VAiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=20k+4gHVqOm75/Uh1nIyZAF1srV8GQHUg2TXo1AxwDM=; b=8LkGssm9cuvtLJ9QyvXz/GjJSY+JEL9/EJMzf/Hcxfl8kD+N9QV9yflLBZJdVcrIOe ikIqmOvQgP7UyphHFnYEVYx2G3cB+YqNvjzeOSlU002b9DW041bU+ddAbbXU1Tfm4wJr Tk3EA2aQCzEkrJ1kW0yNGaRV1eWdORgVgZJaHo35rB0U4hamMvRNOONQnmo8ZRC9gmlc u5YqRgwe+pX9NrkaWYtyQx3QRIKZaNeWunVeTb+Ji7T1Mj1Kp7qOsfmyHqdiDm8N9Dpm OtkBhGK2B9MhgsDJYc3fKNXYdvNL8QiQNQFHzgXFaXGe0u8FvZQ8oKDa5FXwfDW2nmF4 SqmQ== X-Gm-Message-State: AOAM533Wi1oPzHwM59kgn/NruL9nYWdVyvdl06ySKIrdWEH0/+4D2tQl 23Gs/MVs+kBPL21JJ11DlrzF6cyFYYQ= X-Google-Smtp-Source: ABdhPJyLgUncLdEZ7W/vRtKZozcIaOBHjCjG1IF+tmOwVvzH43IMLg2gJ7IGV5nsJ0ohp8iXPNyfzg== X-Received: by 2002:a05:6a00:16c7:b0:4a4:edfe:4625 with SMTP id l7-20020a056a0016c700b004a4edfe4625mr18782616pfc.58.1637901383122; Thu, 25 Nov 2021 20:36:23 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:22 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 11/26] createrepo-c: inherit setuptools3-base not distutils Date: Thu, 25 Nov 2021 20:35:50 -0800 Message-Id: <5ad3d04ec0c6ce6fdf2b4ff6450839b19300aed6.1637900380.git.timothy.t.orling@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158807 [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-devtools/createrepo-c/createrepo-c_0.17.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.7.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.7.bb index 0c27756d2ac..0b18b8baa0d 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.7.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.7.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/git" DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm" DEPENDS:append:class-native = " file-replacement-native" -inherit cmake pkgconfig bash-completion distutils3-base +inherit cmake pkgconfig bash-completion setuptools3-base EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF -DWITH_LIBMODULEMD=OFF" From patchwork Fri Nov 26 04:35:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 436 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 4CD59C433FE for ; Fri, 26 Nov 2021 04:36:26 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web12.20167.1637901385132529026 for ; Thu, 25 Nov 2021 20:36:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NGWy1iV1; spf=pass (domain: gmail.com, ip: 209.85.215.175, mailfrom: ticotimo@gmail.com) Received: by mail-pg1-f175.google.com with SMTP id f65so7100193pgc.0 for ; Thu, 25 Nov 2021 20:36:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=DajzaPSEPKecU6XrL7zh27v4BqwIom8MKV6gvDv3kAU=; b=NGWy1iV1gRz9XtFsCkRt8cnJkpH5CyavFhFIl39wvZLmjmBzSwOmb8Mk76oBHjMYWi 5dzb6s6esLiduLNil8YLhsKd5N4Pfe150q6u8WER3LrVEMsGizM6Afy66EdMbrqVTmdY 2pg6z3KmrBAEBFjgF58rWsxNhHkFqMNUYhrndR6BSfFHtHaiNRDqqzw7EH6aGt/R2gkz lcJqoOE8Mx/k02QClsdkG+tlA5ClTaw/1oZjRvy+Y5I1fVeqZRSy1z8jm/GHAbxV2Vh/ gh8I4h/UJX6UGSzVm7M8Q6mxtBpMa6ngsvDKa7nBrjX8HkweCigpN3pcDp379rLtjn3c coRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DajzaPSEPKecU6XrL7zh27v4BqwIom8MKV6gvDv3kAU=; b=jvnfWpUyDVJVen7KA/MY53bCD991hVYgiDJC88BAct9C9lSP64XSR9mW/buPC3xzfB V1QaEKGpzC866M2g0cDtWfvYPKbxY0lzsnYcLcKXNorKF1SiYuMgePp0YhgdiphS59jg zwbeUtWv4PrVgG1Nd6EG4Thxmphx3itVZs6GYok0K6NiU7u9rch1eNDh9zB13lD8fF/V EGCEAONMPfZjek1CULWiOPXrDsN9U1USN8KXn4uLy5wcqh0SZSXIzNqsQQT0mB3DRYQy tw7ycSVCjJguN6fUxyXCXyS4z7OepN3992Aq2mlXwIHZ8hK2ibjEVlY7eqxOqcr5TQu1 ohxw== X-Gm-Message-State: AOAM531mUW0FwiR2XNAH2JE13wTU8Y4gLRE71Q46oRuXjaundnsDgLpi PSpxyCYF3Tlbp4nTGAOpCwAWrfoCFj0= X-Google-Smtp-Source: ABdhPJzFmDHnp8V52svf9ePt3U8oxTRWOhqXAlUWvNi7chsozk0c9xBGpp7Xg03k4xIBBkXkPydNGA== X-Received: by 2002:a63:6806:: with SMTP id d6mr19690301pgc.68.1637901384416; Thu, 25 Nov 2021 20:36:24 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:23 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 12/26] librepo: inherit setuptools3-base not distutils Date: Thu, 25 Nov 2021 20:35:51 -0800 Message-Id: <25502f1588a7b9e57ae9f2899c74491b1e8d187a.1637900380.git.timothy.t.orling@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158808 [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-devtools/librepo/librepo_1.14.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/librepo/librepo_1.14.2.bb b/meta/recipes-devtools/librepo/librepo_1.14.2.bb index 61a485cfe89..6cd8090b556 100644 --- a/meta/recipes-devtools/librepo/librepo_1.14.2.bb +++ b/meta/recipes-devtools/librepo/librepo_1.14.2.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/git" DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2" -inherit cmake distutils3-base pkgconfig +inherit cmake setuptools3-base pkgconfig EXTRA_OECMAKE = " \ -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} \ From patchwork Fri Nov 26 04:35:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 435 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 40196C433EF for ; Fri, 26 Nov 2021 04:36:26 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.20378.1637901385961327114 for ; Thu, 25 Nov 2021 20:36:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AOqGoBCr; spf=pass (domain: gmail.com, ip: 209.85.210.179, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f179.google.com with SMTP id z6so7698948pfe.7 for ; Thu, 25 Nov 2021 20:36:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=9PrJrr3c+TBhFhopQ++ZBR2myX+Dlbd493gXKv1r1dI=; b=AOqGoBCrWFdQRP6ec8a8Ms3oNuyPJIzWFBI2FXlgc8kwbGXlgwzt5+8gmeNmjktFcy MK2WnzzwpmLJBDYo6j+3wCY8i5fmQy93u/mtET9aKIJ5Vhv7mka8xhX7pRuDLsLPU17j hXRMrpUWgXJoQa541NjMzw5VuzI6PZN+mBNnSG7dpueHE6xfB8ZzhRZQSXZO+x2jshQd jjZ0tVgXQrWt8zLMabnELL08p/ZS2D/yXhn1hDgHy5fDSOOvDegWQV+zA5XJGR6UbeJa qbwrXHFjnqDP17EDEuNqRUacgTZ0WrWuacaJ9SvEo+rPEPHA+ogU1CNc32gBo9HIsDT1 Gx/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9PrJrr3c+TBhFhopQ++ZBR2myX+Dlbd493gXKv1r1dI=; b=Hbd9qgcyEpuE0UpZ9NlzPblGWtNF/K0XePy9sfxviK9BQMY+B9c5RmACAH2VvJzj/w UKMhi9eK7FeAL3rihwooejGElw1H93kKiBqaNfXPIDE83CemAHEieteVWwTL/R80lNUy zVx7e6wEmqAs6wwOF601Z1GsDdjSMlQsfkgpqL4VK0fYgFklkDRq74Ok4I3u7q29nRO+ nLIUdHujP6iL7GL0+LYQH2FnuKcmtrzARE+vMmhS4kIWIqMRu1h2IQ+J2TjhJ3y4Bh0G Z6cV2X2qDm1PisEqw8baY8r4GsQ79HLyBRE35kNWhKsOejN05tRj6H2B0ry4L0ZQUqwk ejnA== X-Gm-Message-State: AOAM533vp46MWiT/FclLh2OwShbBhT402w9cobxyQ1tY5PpuePiEZB6i 9ms2m1/AdRe6NciRTLzjIkZrWrDmNoQ= X-Google-Smtp-Source: ABdhPJzGNoyv+suwVRPYX4pitWLoSXuGa4Aq5U7WFSWh9e+uqm9SXVOX96rz3WqfJuMDXqbs9jgpAQ== X-Received: by 2002:aa7:9575:0:b0:49f:ddab:dcdb with SMTP id x21-20020aa79575000000b0049fddabdcdbmr18639402pfq.13.1637901385234; Thu, 25 Nov 2021 20:36:25 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:24 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 13/26] btrfs-tools: use setuptools3-base not distutils Date: Thu, 25 Nov 2021 20:35:52 -0800 Message-Id: <41ea76d033252833f99ff490a7d7baa9e7a89d25.1637900380.git.timothy.t.orling@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158809 [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.bb index 399ba17e3ed..45872e4a972 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.bb @@ -43,7 +43,7 @@ PACKAGECONFIG[crypto-libsodium] = "--with-crypto=libsodium,,libsodium" PACKAGECONFIG[crypto-libkcapi] = "--with-crypto=libkcapi,,libkcapi" inherit autotools-brokensep pkgconfig manpages -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'distutils3-base', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3-base', '', d)} CLEANBROKEN = "1" From patchwork Fri Nov 26 04:35:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 437 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 3E8D6C4332F for ; Fri, 26 Nov 2021 04:36:27 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.20379.1637901386826707186 for ; Thu, 25 Nov 2021 20:36:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=KMhLW0AH; spf=pass (domain: gmail.com, ip: 209.85.210.169, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f169.google.com with SMTP id n85so7678767pfd.10 for ; Thu, 25 Nov 2021 20:36:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VQvywFlX+LtKiUlcMzaPreT1buA/bfbMF38v6jck6+U=; b=KMhLW0AHfk99gRn23DuR2Jn/aNaQzH3llOdZKuvlW6rp2ne8OXPiUiZvjrXrRtbD6K M/D6iH84lSRnQW1rJRhC148yV+8Sr2J58SP++6aXV0i+fBxK9FlxMvaObWOCcn3eouir HMt3xZJ0IOnfEaGbGnhfZfAWY7KiE1U8U3Hv93HkKo4FbzGN761Z1BMPsWOzUGmCARq9 5O3DRtJYGreQDuqPRXlOOFEBeO+IgHG7okdU+8eUIIAtztGX//vnDzAsI8ulFvpHgwq8 UD8e5rY5NOFFEx4AhJnQesDEHrcvItnP1vQGePYrfYp7rBI/+s6ofs6DMNzUgk/XjCwC HbSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VQvywFlX+LtKiUlcMzaPreT1buA/bfbMF38v6jck6+U=; b=TovDQ1RlaXyW5BJFmVRlLjnXNpZYQXyTA9fRuz9dcAUZ6kiWbPM8ee7hs5zbrZOrFD Vz9M2Ez2u0qp03CiTLiGSEHyNJVR4KgDJZY8KT5cjdZBdDU6yybJKQk1uJhiRlpMeRpo UgPJxPVgoOpZjBmJGV3gJgZ2qRLq9F9acWuYrT/itd8cA9f894e7J7bzy2UfQDC/xHwe EQuKDuYxIKnmaescbqaiD/DT2MRSZR5eRdxOq1ZpwgTWaXEvpJz2cZ/6c8V6Y9pBSVEJ nu8PkVWqr40gDyDB3dfxwbvBWH5KsYsIQX//QpW7E4hhDlSwLPSUid7rTsdD4Vn9n9BK uZkA== X-Gm-Message-State: AOAM533USmQeDRLHiD9dFGX+r7SXTKrCX7LSddX0y0JZazKJLksemzQd ohKcToRu7GB49UwujroUCjRigOomnHU= X-Google-Smtp-Source: ABdhPJyHXONzVZQO5vNI14xjMzP6xY5DxSQ5eDcpYVcuSN0UevcOykkwl7ziwGZGbQY/KZaG1Gl1WQ== X-Received: by 2002:a63:db18:: with SMTP id e24mr17770469pgg.285.1637901386129; Thu, 25 Nov 2021 20:36:26 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:25 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 14/26] scripts/buildhistory-diff: drop use of distutils Date: Thu, 25 Nov 2021 20:35:53 -0800 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158810 The use of distutils.version.LooseVersion to check for GitPython > 0.3.1 is not really needed anymore since any supported distribution has at least 1.0.0 (centos-7 via epel7, debian-9, ubuntu-16.04) If we want to reinstate this check, alternatives would be to require python3-packaging on all hosts and use packaging.version.Version or use an imported LooseVersion in bb.version. [YOCTO #14610] Signed-off-by: Tim Orling --- scripts/buildhistory-diff | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/buildhistory-diff b/scripts/buildhistory-diff index 3bd40a2a1ea..a6e785aa238 100755 --- a/scripts/buildhistory-diff +++ b/scripts/buildhistory-diff @@ -11,7 +11,6 @@ import sys import os import argparse -from distutils.version import LooseVersion # Ensure PythonGit is installed (buildhistory_analysis needs it) try: @@ -73,10 +72,6 @@ def main(): parser = get_args_parser() args = parser.parse_args() - if LooseVersion(git.__version__) < '0.3.1': - sys.stderr.write("Version of GitPython is too old, please install GitPython (python-git) 0.3.1 or later in order to use this script\n") - sys.exit(1) - if len(args.revisions) > 2: sys.stderr.write('Invalid argument(s) specified: %s\n\n' % ' '.join(args.revisions[2:])) parser.print_help() From patchwork Fri Nov 26 04:35:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 438 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 41A41C433EF for ; Fri, 26 Nov 2021 04:36:29 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web12.20168.1637901388111266557 for ; Thu, 25 Nov 2021 20:36:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VYwXuAk9; spf=pass (domain: gmail.com, ip: 209.85.215.180, mailfrom: ticotimo@gmail.com) Received: by mail-pg1-f180.google.com with SMTP id s137so7063357pgs.5 for ; Thu, 25 Nov 2021 20:36:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=alUFk4ZSzmS2nR1AviJzq5l4+3YqgcbpjNgKZQJJ2J0=; b=VYwXuAk934C5Jqycq7mag48hJIEBvvnBqnX1Lvd+CorQlPcudldPtN0v16tw1/Zhad RS3F4+Zvq3uXUOOO0OJhUVa5xBLzqLDOFiuHu6rJ6LKLGyWl8TOHipB3WCdbeYIZvXzQ eNFe7T43PacK1CWR9e+EuQQAhuiZfk3hD3oNPwfoTEISqizA5lzKc3SVfJvuBLQ3PJiH PgNuJDRzcQ/tOkFDgVMh/s2cl8E5FWyC0pc+afWrPE0TEhCA9KGZ8aCvmE71JFiSEXkz PptlXD66EUdXcRBCz7vNAp9wIWpYbiCSLvvuSCcK3rBeL/xh80Co3Y6J7hyPbC/LKvJ+ fysQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=alUFk4ZSzmS2nR1AviJzq5l4+3YqgcbpjNgKZQJJ2J0=; b=Euh95lypGi78njIWPn6Z04A+/WYe5ifI112CB2s4LSXv64i8z/j5KAp1vYvBnmTkJ2 tcz73CfMaZ/1zxbSSh8gsB3SniNS4bbhgOauS3ca+c4cH0Tfv8OAVr3/YpE+nGB8gDCz OGW0ZuTU8z4p96k8fqng/KmMstsFwHwBykmHtbG2YTyH6dWzVppuM0V7mgtpIl5eLuBX 4T7b2T1mfcHNfpynzLbxgaGGWQRP10CpTnKio7bIbYVMSsi1d9WpR8EOTSE+rboE6KyX ehwYS/aQbdg3dThw1LGisKUm2KaTrl6wL54A5HfjGV7i09/PexAO69d5EUHAQOVeSVXk OW7g== X-Gm-Message-State: AOAM532n80Jmo4I4c9OBRPRwTO7z2Grtm0j7g8BPsR4MeGYVf+9eq1Wz PGnigY5YHqIjOcg2vzhvd+NAJTx4nA8= X-Google-Smtp-Source: ABdhPJxzKghFUqMCKujGWbT/qNH5T1/vfCOTaZvSmREjxf9XQej03BksgbKiKufHrNbuAT6E8HH7BA== X-Received: by 2002:a05:6a00:1348:b0:481:179c:ce9b with SMTP id k8-20020a056a00134800b00481179cce9bmr18471850pfu.27.1637901387406; Thu, 25 Nov 2021 20:36:27 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:26 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 15/26] python3-pygobject: setuptools instead of distutils Date: Thu, 25 Nov 2021 20:35:54 -0800 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158811 [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-devtools/python/python3-pygobject_3.42.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb b/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb index b07969c5efb..74318337bad 100644 --- a/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb +++ b/meta/recipes-devtools/python/python3-pygobject_3.42.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" GNOMEBASEBUILDCLASS = "meson" GIR_MESON_OPTION = "" -inherit gnomebase distutils3-base gobject-introspection upstream-version-is-even +inherit gnomebase setuptools3-base gobject-introspection upstream-version-is-even DEPENDS += "python3 glib-2.0" From patchwork Fri Nov 26 04:35:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 440 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 45D9FC433F5 for ; Fri, 26 Nov 2021 04:36:30 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web08.20253.1637901389082391941 for ; Thu, 25 Nov 2021 20:36:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Tx7N3hk9; spf=pass (domain: gmail.com, ip: 209.85.210.174, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f174.google.com with SMTP id p13so35654pfw.2 for ; Thu, 25 Nov 2021 20:36:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=nMbY8tf6GQoyYqplg/MDxl/3B7UeCtSZt23x1wgVVeg=; b=Tx7N3hk9WRUXvg4O/v/sjmg5vUcbJzOjwD02+LEad8hPWjXHCZclt8n1X5ejqUBIXp WlY0jcFGDg38PYvS4EkUE5GMO58wc4P2HcfsXk3z1kOTmCBWxiO/mK9wRezK/9hlaPSZ hIDGjwPhbtx4gACADpfatSE5zU8tdsVztnDYmBVFBw1hsV5gCP5V8zBGChGXtnv4GOy+ m3ndcTtnQ1bBfdwaO5DhJiTPRwtvQr/RvenIoAcsOgCOZC5QE+6FV6lSfNNjPb1QBisu 4abUwjVD9vmgMhnnj9XgdQ7htFaledBOmHFoyKizGQYco45AnZyMnEdIJf7Qrceh1qKY ip7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nMbY8tf6GQoyYqplg/MDxl/3B7UeCtSZt23x1wgVVeg=; b=vKgWOSWNhJUNKVZRRbDuATNk5vdJuEDeb1siFrQafuftB8jdr/z9vyDcwJluOIzZOg PkrecPRZjZ6YLIMBgBzx4EA8mc6bMeB45O0Lk8G91FISY02vwuuBoTFooJhdURao3MdJ ocjMoQQ0HhsyV6fm8r76/AXsP/CB5it1clPcy9Yr0qMgJKf74cj5Ji0fxSV1tFzNYLJc vERyIQyy4T3PFd7HmF9ydx2Pk86HbC2rfnceik2Q4Xi353uNLaj0kbUzxb810Emc0JI7 qrdMk7RrbNUmKTTkCfVYmjJ4T0yud+HGF/VLYo3U1BeugXuttUiJrohVs8ZD7ABYDV/4 xGuA== X-Gm-Message-State: AOAM533rInGemw7j/UNM0gFAHdtMu8WIRjm3pcALWsJiNGVXg0OyW10o FTV8KMWoj9Q8Kve2WlluSyonaKjN6GM= X-Google-Smtp-Source: ABdhPJwV+vWlEKYgTS/z3yUF6ELFGAU4WKe2SjtJ2U4gfZATFhjqF4KU7i7BMaGIUGuwSGXRQDPj4g== X-Received: by 2002:a05:6a00:1242:b0:44c:2025:29e3 with SMTP id u2-20020a056a00124200b0044c202529e3mr18919278pfi.59.1637901388314; Thu, 25 Nov 2021 20:36:28 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:27 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 16/26] bind: inherit setuptools3-base instead of distutils Date: Thu, 25 Nov 2021 20:35:55 -0800 Message-Id: <5f8000e0846ff04fc7e38747ef5a475be245649e.1637900380.git.timothy.t.orling@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158812 [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-connectivity/bind/bind_9.16.23.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/bind/bind_9.16.23.bb b/meta/recipes-connectivity/bind/bind_9.16.23.bb index c1bf250c26e..f4db113c7e1 100644 --- a/meta/recipes-connectivity/bind/bind_9.16.23.bb +++ b/meta/recipes-connectivity/bind/bind_9.16.23.bb @@ -46,7 +46,7 @@ EXTRA_OECONF = " --with-libtool --disable-devpoll --disable-auto-validation --en " LDFLAGS:append = " -lz" -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native setuptools3-base', '', d)} # dhcp needs .la so keep them REMOVE_LIBTOOL_LA = "0" From patchwork Fri Nov 26 04:35:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 439 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 41BFBC433FE for ; Fri, 26 Nov 2021 04:36:30 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web09.20185.1637901389574655376 for ; Thu, 25 Nov 2021 20:36:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=N9hA7kCe; spf=pass (domain: gmail.com, ip: 209.85.216.41, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f41.google.com with SMTP id gf14-20020a17090ac7ce00b001a7a2a0b5c3so9044385pjb.5 for ; Thu, 25 Nov 2021 20:36:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6N01THxaAn/JdSBWv1WLHPIzWfNzSqHAvYsMv2+Yso8=; b=N9hA7kCeYLpLedndVRMUHum3assK/JLyQGCwUiqO5uusOKO3SlKrE2Ub5yRyM9r9vE JkeDepwVcT3Mqk2CloaqAqf5xaxm45dyQgD7tQz//o6lNust9Usc5eEWpQhugUxB1CBQ XQH+B7pAX65CXtL2dhsLDSzRW1UGXHlTjXA8GtNr/Z024Kr2WPHrjSzGZqZuNy8c36xR eNSVdUXvj945mOVrdwsOzKdmLvnFMaCYlBNE/YngnzGy5k5Hh1kM2W0DdNYNhOz7XSYG aeEKSeNC4WlMbkmWiCMac4yN2nu0LRnyeCIxnAvVv+HOxE+KnmVTnx8ZauKB+Up1DcFY hXAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6N01THxaAn/JdSBWv1WLHPIzWfNzSqHAvYsMv2+Yso8=; b=pA4dzg2YnqH6hNLJYJG6Hs29WoZsiG2pu/tQcCeeY9uN7PQoCP/tBWAJxqQ57/NX20 YDc7QpMQmhF4ufArR77yg+4BKqZuP5KR7m7Rrqj90AuBaM/W5Q9Z1r9WSCYFZIlNqkTm kQSp2YlVErTCWMON2zTaWh1HygwKFRp8LWRtMgmIFKn+FLeCVsBDMIR2tAflMD7BFE4Z JOysfZNiaMLcCNztu0XQah338AGX5L6keSJCrKSTPTi/jQM3OminK4A8/gQMC30qYcgT QGkcVb0wopdn3/Z4/Iw3F4kqefIZE93vd6Em3eeU7zXkBulAPBlaZDYiIEdJGpgtDh5b 2QsA== X-Gm-Message-State: AOAM5339xZ4ZJMP9q5VB8SlZVZibEpLofDPe6oxHSwrX3tUY8GRp7cob Nvr9BYN2VD53YbD5LprWUajUgR/M2yQ= X-Google-Smtp-Source: ABdhPJzyW6kwiAyeibyf7moVKfA+3nX/W4zZ61NfOCa72EirVE8i6EqabtDPxQVJ8i0G6wJRxt60zg== X-Received: by 2002:a17:90b:4c02:: with SMTP id na2mr13056476pjb.94.1637901388818; Thu, 25 Nov 2021 20:36:28 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:28 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 17/26] python3-setuptools: do not depend on distutils Date: Thu, 25 Nov 2021 20:35:56 -0800 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158813 No longer depend on python3-distutils, current versions of setuptools vendor as _distutils. [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-devtools/python/python3-setuptools_59.2.0.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-setuptools_59.2.0.bb b/meta/recipes-devtools/python/python3-setuptools_59.2.0.bb index 704f58abd31..9ff4095c7a9 100644 --- a/meta/recipes-devtools/python/python3-setuptools_59.2.0.bb +++ b/meta/recipes-devtools/python/python3-setuptools_59.2.0.bb @@ -22,7 +22,6 @@ RDEPENDS:${PN} = "\ ${PYTHON_PN}-compile \ ${PYTHON_PN}-compression \ ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-distutils \ ${PYTHON_PN}-email \ ${PYTHON_PN}-html \ ${PYTHON_PN}-json \ From patchwork Fri Nov 26 04:35:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 441 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 45194C433EF for ; Fri, 26 Nov 2021 04:36:31 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web12.20169.1637901390473290125 for ; Thu, 25 Nov 2021 20:36:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=phyVL78Q; spf=pass (domain: gmail.com, ip: 209.85.214.170, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f170.google.com with SMTP id b13so5894239plg.2 for ; Thu, 25 Nov 2021 20:36:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=JM/1sH8izo0sCsEF9kjmVKBeA4HJv7GllvmOvNffNBI=; b=phyVL78QAmYnJXvvUQrqlsLXcKtJg4J3zfJJM2PYlIyDyY7TtgJY9ndz8qdxE6YJHS msi/b6VgvMFAOpEQyCjscDPPSAnhQKLmWngE3uyUd7IL5uOKjGDBzE0xAHJfeKd6nBUY ++mVJuHf03fbP6bJSCnPgNv0Jqm33ZVrbhYgNSHXKc/6AuY1p+0u2Okn0JkoSwdYeN3z iUaW8hzSOl116kAI30q6m3t+clN87CLIK1m38MabPWcSzOZMp62A6VMfm0sOP0aeo0Ro yWA7UJMwcBZPv7ArgSOqcksACCZrUP4xdybI6QitezVv+PL1mXPpxDTFqvj3PSkdD38B 9vcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JM/1sH8izo0sCsEF9kjmVKBeA4HJv7GllvmOvNffNBI=; b=6yYjCnsuqvo49lkD/ZEsF/COPW1wYZiBhPafkdNZ06sozClJfXKHeYfPoFyTnKjAHB tMJ4ovRdoQNYN7pmgirHR2CrRfirmfeQpq0KlHKkAx3wURWfqMAMMZCTnMDawS0AptUl FNzUDBaYt19V377xB2Pqd5D8vDznKNi0MePtyz75ax/ypQ+YZo30l+OlosuILO5Z+rli L1iOnKc2l2jnTeU482lGFuWpKbQtWgk1/9KId+vHvdK4AdxeccUiyT17pSEqhGhjoeat NuYja/rizFw2u0wLDW5DgMr8Rl8Ou/fvlS4t8KTvSjAE7X/7xC0LJAoFRfeEfvHre5Zs /1Xw== X-Gm-Message-State: AOAM532dZ5z60yrIH14XLOg2fW+zODyIkcd6/+KL74AKjB+Cfrp7sReD ZIXbp0RBpKFcFyXapv5Q9ykr3ryOdh4= X-Google-Smtp-Source: ABdhPJxuCN59ACLAN/d0B0J7xR1FHiyW3r/P/8m/4uS3WtQhxx3Daaoa6+LYJFFQdGgxFZufb7CgvA== X-Received: by 2002:a17:902:aa89:b0:144:ea8e:1bd7 with SMTP id d9-20020a170902aa8900b00144ea8e1bd7mr35290400plr.65.1637901389647; Thu, 25 Nov 2021 20:36:29 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:29 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 18/26] sanity.bbclass: drop usage of distutils Date: Thu, 25 Nov 2021 20:35:57 -0800 Message-Id: <0553a0d9181bccf4e030bdd6988bc858a0da96c8.1637900380.git.timothy.t.orling@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158814 Refactor to use newly imported bb.version.LooseVersion and replace `import distutils.sysconfig` with 'import sysconfig`. https://www.python.org/dev/peps/pep-0632/#id23 [YOCTO #14610] Signed-off-by: Tim Orling --- meta/classes/sanity.bbclass | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 9fbc9c18e7c..d7fdd5c04b1 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -462,7 +462,7 @@ def check_sanity_validmachine(sanity_data): # Patch before 2.7 can't handle all the features in git-style diffs. Some # patches may incorrectly apply, and others won't apply at all. def check_patch_version(sanity_data): - from distutils.version import LooseVersion + from bb.version import LooseVersion import re, subprocess try: @@ -478,7 +478,7 @@ def check_patch_version(sanity_data): # Unpatched versions of make 3.82 are known to be broken. See GNU Savannah Bug 30612. # Use a modified reproducer from http://savannah.gnu.org/bugs/?30612 to validate. def check_make_version(sanity_data): - from distutils.version import LooseVersion + from bb.version import LooseVersion import subprocess try: @@ -539,7 +539,7 @@ def check_wsl(d): # built buildtools-extended-tarball) # def check_gcc_version(sanity_data): - from distutils.version import LooseVersion + from bb.version import LooseVersion import subprocess build_cc, version = oe.utils.get_host_compiler_version(sanity_data) @@ -552,7 +552,7 @@ def check_gcc_version(sanity_data): # but earlier versions do not; this needs to work properly for sstate # Version 1.28 is needed so opkg-build works correctly when reproducibile builds are enabled def check_tar_version(sanity_data): - from distutils.version import LooseVersion + from bb.version import LooseVersion import subprocess try: result = subprocess.check_output(["tar", "--version"], stderr=subprocess.STDOUT).decode('utf-8') @@ -567,7 +567,7 @@ def check_tar_version(sanity_data): # The kernel tools assume git >= 1.8.3.1 (verified needed > 1.7.9.5) see #6162 # The git fetcher also had workarounds for git < 1.7.9.2 which we've dropped def check_git_version(sanity_data): - from distutils.version import LooseVersion + from bb.version import LooseVersion import subprocess try: result = subprocess.check_output(["git", "--version"], stderr=subprocess.DEVNULL).decode('utf-8') @@ -655,10 +655,10 @@ def check_sanity_version_change(status, d): # Check the python install is complete. Examples that are often removed in # minimal installations: glib-2.0-natives requries # xml.parsers.expat and icu - # requires distutils.sysconfig. + # requires sysconfig module in Python standard library. try: import xml.parsers.expat - import distutils.sysconfig + import sysconfig except ImportError as e: status.addresult('Your Python 3 is not a full install. Please install the module %s (see the Getting Started guide for further information).\n' % e.name) @@ -796,7 +796,7 @@ def check_sanity_everybuild(status, d): status.addresult('The system requires at least Python 3.6 to run. Please update your Python interpreter.\n') # Check the bitbake version meets minimum requirements - from distutils.version import LooseVersion + from bb.version import LooseVersion minversion = d.getVar('BB_MIN_VERSION') if (LooseVersion(bb.__version__) < LooseVersion(minversion)): status.addresult('Bitbake version %s is required and version %s was found\n' % (minversion, bb.__version__)) From patchwork Fri Nov 26 04:35:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 442 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 40D3EC433F5 for ; Fri, 26 Nov 2021 04:36:32 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web08.20254.1637901391738083034 for ; Thu, 25 Nov 2021 20:36:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=V2kKjHk4; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id j6-20020a17090a588600b001a78a5ce46aso9104819pji.0 for ; Thu, 25 Nov 2021 20:36:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=LTmVgcuVJcec5LMO47b/vUCj1wt4pAV84nKGcPiA34s=; b=V2kKjHk4y0to/2vPiZiLJOR2+rJS0DvOfnhYjlwQGBb2OUxyzZrK1mZB4td2j05Nnv krvuLPnPQSNyUT/IBlnFS55NpHhheRQilTUJdBTF8kC3GMrpvjtF4HRKYA4DNf6TfP9X Gg3GEzz8LVwRLQNlsddXuV5wTnPHLy2cf56p9FsJoXPMCKslDKmst8S7FprdCjV1dz+H is22vhNZhsnaxXulfuNbod+p5oAu+juQv4V2Mp6t9VCgB7piW7obnuFDxcbYqT/mTPSz Q2qcpkgCQjw4SkdE8vPTIGjZrVMozovA0oYLrJC5zAtsmi5NDjUcmEBGTBI9mgynw4lo Q2vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LTmVgcuVJcec5LMO47b/vUCj1wt4pAV84nKGcPiA34s=; b=HlxccvluAa1VcxobvKUmEZJvGkWfAB3fzfppjXu65X4ekh+HjT0dec3gbrLa7vrK/r bJkBsz6SeIfiCh5ztuiKbJblnM4fEdgeCsvZy4YJwdQxmddxZu4097lgd6SRg5neuWdz lnuMk1tGn/AiztvT7Y5k5Dfq4++skTH5fisadaZwGbtrdwBEjRCnE4UqI6kyuJKhZWcz oOj94qE+pIEJzr4EYG4vfusZFO7oPebRjrNqw4YXYVBp9S/yOQO0cKF3h+r8Qhm+q530 UOIx4Q4kjZ+OEeC7Md6gZUtTLOcx6BWHtZNJpLyET1UESeWPaL+HvitEwq1EzVrPsflC xt6g== X-Gm-Message-State: AOAM533TJOUI8hUcHRN1CVnAQqWbahCunpZx6RhebVCINw87V4t31hJl ISV1+ntKYIJC3UdU7eM27Urd+zlAPWM= X-Google-Smtp-Source: ABdhPJwuDhJhjfBK8T/D630N3TSFQFh9mlT4bDlySlb68RBM5oJYKrKzdoNyl1JrzFI1h0nFawmqkA== X-Received: by 2002:a17:902:7d96:b0:142:87dc:7dd3 with SMTP id a22-20020a1709027d9600b0014287dc7dd3mr34574371plm.11.1637901391073; Thu, 25 Nov 2021 20:36:31 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:30 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 19/26] gstreamer1.0-python: inherit setuptools3-base Date: Thu, 25 Nov 2021 20:35:58 -0800 Message-Id: <2dffa5743a046fb17731e7b42215c876a3c5bee4.1637900380.git.timothy.t.orling@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158815 Drop distutils3-base usage as it is now deprecated. [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb index 045aea44099..1dd7d0d09a3 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb @@ -23,4 +23,4 @@ EXTRA_OEMESON += "-Dlibpython-dir=${libdir}" REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" GIR_MESON_OPTION = "" -inherit meson pkgconfig distutils3-base upstream-version-is-even gobject-introspection features_check +inherit meson pkgconfig setuptools3-base upstream-version-is-even gobject-introspection features_check From patchwork Fri Nov 26 04:35:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 443 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 41D9EC433EF for ; Fri, 26 Nov 2021 04:36:33 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web12.20170.1637901392653637791 for ; Thu, 25 Nov 2021 20:36:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=StjK6L8Y; spf=pass (domain: gmail.com, ip: 209.85.210.173, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f173.google.com with SMTP id z6so7699161pfe.7 for ; Thu, 25 Nov 2021 20:36:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ZwjJ7kd8p+FFNsUTBseGuoegUx/Iwr4thw/t4y2Mm3w=; b=StjK6L8YwU1oWDC/BICk9BllvTQJcYA5DIbLgqihbDA5AXXpKpX7wFxkWmehYDTEj3 p7lXtR3CFGoEir+PKKYPiGIdcJctc7saDZwKQhzJtEJjQDd+ubYcXlWeZZNG1wq/e1K5 fY/uLw3tRFFqyW9c0lBNAF4+teNnOb740nw1C+gdXbpmQvBVZYeGgtccUFHaFuDxJ5IP KQGIL+xSxn2/C4CJbr4YsoJpP9Rxl+tVcu6xkmvaP6UzJw85epMXrvfE7KCCYqiokmCr ldd3f0tXd1sUHUTcbauVp0nbgmVb1CChaJzsk8vYFTSi7TEeCRvt3/+QJoYgVegthhDz ogEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZwjJ7kd8p+FFNsUTBseGuoegUx/Iwr4thw/t4y2Mm3w=; b=ZU1yyVREwOIOD1fZOg5hiYGhGsrLK08sCVr1Fc1hpy5sY7b2V8sVmcOGkNS9j6bLxA qHOVfetn+KYAmkNxazfldCD7J5cikkPt3qLqdg7Zi7bakGOmRxkTcyVj+HPryh0t8Q1W 3gowDxVLPK7xzWWqnbY4YHXTojFeZAMs967vUdULqChAv7xxDgc6tcGFT/NYr9G+V8NE SqV7NwgEM4pflGvRfjxzv2adu6NhOIS98yF5HsrYOpG6DXDFsXrnl5w4Ka/ljoZ2X3iY nICN9bWKciM1QCEX63fbrDIlccUmW7lt0e9IJDVzLxGkCqr9bpz+/7K/xAX+YtMckIY7 ZS3w== X-Gm-Message-State: AOAM53200uAHwRRCOH4x0y3qMW15/8vY1cNScmw8ipVt3+QtAX7uDcBP 0FBWO4U1T5SZmNaJtqBdhcqvX1M5pgM= X-Google-Smtp-Source: ABdhPJw36euZHY6y1/kcqhDBeqfL4rvTR+5Zm+0YXjUCWSC9MEu8FlPDY/FYMaA4KQQ/8+zco54ipA== X-Received: by 2002:aa7:8b14:0:b0:4a3:a714:30ed with SMTP id f20-20020aa78b14000000b004a3a71430edmr18408765pfd.2.1637901391803; Thu, 25 Nov 2021 20:36:31 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:31 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 20/26] recipetool/create_buildsys_python.py: less distutils Date: Thu, 25 Nov 2021 20:35:59 -0800 Message-Id: <29ca205dca70847b0ef6d4db6f70eddce2544f9a.1637900380.git.timothy.t.orling@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158816 distutils is deprecated in Python 3.10 with removal in Python 3.12 (~October 2023). Replace distutils.command.build_py with setuptools.command.build_py. There is still a check which decides to inherit setuptools3 vs distutils3 that will need to be refactored when we add pyproject.toml and setup.cfg support for more modern PEP 517 packages. Once distutils3.bbclass is dropped, any recipe inheriting distutils3 will throw a parsing error. The plan is to move distutils*.bbclasses to meta-python. However if meta-python is not in bblayers, the parsing error would still occur. [YOCTO #14610] Signed-off-by: Tim Orling --- scripts/lib/recipetool/create_buildsys_python.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/recipetool/create_buildsys_python.py b/scripts/lib/recipetool/create_buildsys_python.py index 0b6b042ed17..570be7e81b2 100644 --- a/scripts/lib/recipetool/create_buildsys_python.py +++ b/scripts/lib/recipetool/create_buildsys_python.py @@ -8,7 +8,7 @@ import ast import codecs import collections -import distutils.command.build_py +import setuptools.command.build_py import email import imp import glob @@ -459,7 +459,7 @@ class PythonRecipeHandler(RecipeHandler): else: package_dir = {} - class PackageDir(distutils.command.build_py.build_py): + class PackageDir(setuptools.command.build_py.build_py): def __init__(self, package_dir): self.package_dir = package_dir From patchwork Fri Nov 26 04:36:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 444 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 58D8EC433F5 for ; Fri, 26 Nov 2021 04:36:34 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web09.20186.1637901393108565946 for ; Thu, 25 Nov 2021 20:36:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=BbSf0VaS; spf=pass (domain: gmail.com, ip: 209.85.216.51, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f51.google.com with SMTP id cq22-20020a17090af99600b001a9550a17a5so9074219pjb.2 for ; Thu, 25 Nov 2021 20:36:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qEtCKm7SuJfYMoMm/j4FpguJb6f9GEobi4x0WQOYXyQ=; b=BbSf0VaSwKCJIETnyp9rSPZ4yWrbBdzrxoNaK+dQHsGqyGYTBbU3WFY+VSsj9Bt9Mj 9kJ+kDszePIUf8voQ315fiXoqMGiYM/+V8PlA36kLzFQU5uALr6P9kSsYKgnao0Ndwsb 4CmZ5dg8MXACvpEqJSNEjRrbFZkBb7POe8z6eFKV0gMVKIrGWqn3a07cm0dNC1zTOrbC VK51ztyRfyV6KYtggjP08TTyYR68a6pPaRRyqmKgpUPcxjX81mLljLoI+b20z+hEO6nB 6uPNxDs/kD2bzK6k2uknjo07uhyOOEv+qCYhXnCNqgVp4LdY+PMzdMbbV8/slbgt/tOY x4Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qEtCKm7SuJfYMoMm/j4FpguJb6f9GEobi4x0WQOYXyQ=; b=qpfgZnPs8kjuQViZqrUJO76Lype/v/zr5HvMUYFH1bZKXQ1hJC7z/OmCIQKN25zSLE jwQ/RaC4BBDYfPLKc0RRdcd65zBSZFL7hvFcXvRQUBHptQ0+bfaED64NOT1LAXtKgs0/ e9GQLSbDWozBzUNZ3OuAjOycma52l4FOaXr4O4ky1wvrNVF37EeiXqaQEe+vUfRof9Xh KamEXBTLOBc+7rkSxjDitKEGm2Zjx9TysHXKXtjUCNmIOhPAGCiH2YQLp4dzXcrUCGdI tiNKLA2kCluKbDb7QSsxpRqchXW6F05x5cr06hJbHspf6KqHuObBqRVu0BTV6I25C7AU NtkA== X-Gm-Message-State: AOAM5339ln6877UNs4k/gmMhMm+E0rq4Zz5iGpTKSEd5zvOBc6bz1JWC fpQOSf6avqVSb14Tve18OpXnlGIJe9k= X-Google-Smtp-Source: ABdhPJwkplzlbkKxFg3OLTycinTzX4UtfdAiSREu8F9U/QUOGnTWhuSiAuuign8Y6AOpvbWCtuggJQ== X-Received: by 2002:a17:90a:ac08:: with SMTP id o8mr13058998pjq.87.1637901392403; Thu, 25 Nov 2021 20:36:32 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:32 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 21/26] waf.bbclass: drop usage of distutils Date: Thu, 25 Nov 2021 20:36:00 -0800 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158817 Refactor to use newly imported bb.version.LooseVersion [YOCTO #14610] Signed-off-by: Tim Orling --- meta/classes/waf.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass index df0ab8d73ff..f9e240c272a 100644 --- a/meta/classes/waf.bbclass +++ b/meta/classes/waf.bbclass @@ -43,7 +43,7 @@ BB_HASHBASE_WHITELIST += "WAFLOCK" python waf_preconfigure() { import subprocess - from distutils.version import StrictVersion + from bb.version import StrictVersion subsrcdir = d.getVar('S') python = d.getVar('WAF_PYTHON') wafbin = os.path.join(subsrcdir, 'waf') From patchwork Fri Nov 26 04:36:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 445 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 41566C433FE for ; Fri, 26 Nov 2021 04:36:34 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.20380.1637901393833376073 for ; Thu, 25 Nov 2021 20:36:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eVKIRWuI; spf=pass (domain: gmail.com, ip: 209.85.210.179, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f179.google.com with SMTP id x5so7770745pfr.0 for ; Thu, 25 Nov 2021 20:36:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=QoU9TfqkFEx3cdVlUfxScpbz7MVNaMf6r0f9bzwuouU=; b=eVKIRWuIrswnZ7ZctZiZC7/ZE/eLJkzbmKw27zKVfcvX2WIy5KSROwpJBvEoYe7VWp 7jQUHe7QMwPOPKSNbXwh//n5IJncDxZCjcugwHpYQ/Mrn8yQDSTXeB/UoVjR6JpbjTik hCVgV8NRvdX9KexUY2iQjEYBi82nMxifmxGW4x0+BQa/0C9XOo3AlRiNfOrrWSUgWYg3 kRowAsG29M9gOHtjFZuRy0WFZy9/G8v4+HJsQZsN7iYChdZTToHX3Ovz67o0GGAUTCVf NS85oookB++bI/srvW9/XSubluZTpUZgAdthzYlkjLx1yA5Cr+lTFfU4k5mmCF5hx3wm Ldkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QoU9TfqkFEx3cdVlUfxScpbz7MVNaMf6r0f9bzwuouU=; b=vUU5LdaNTL1xpzG4OUF05oiOzKUjOmxfU1gm9uvqJWLXYnNnkUChMt0jAPDgCkPmf1 CkUj9tFzDR5o5fSVKr/iA8vSGfWSjTenp/+yGCyzQrg+FI31XBMWYl2o4TDh3pCzMXUc NBSh27nj56iAjlBJjDmCgd0wrwLpIzTy7wwicmD3iZKkwc8qQjybBb+spVcvzE2AKsRK SH09xqwsjoQwZxy6psXLw3OBsCn+VN9EL43vOLncfgw8tPGm6k9qbBqzNQc1VNUh/Emq zfLKPjtkgDcY2Guy8liQXvt2PVbVawospeyGk9WhtDkdspED1xXqNa8pG6b46DjadFIN sibw== X-Gm-Message-State: AOAM531K4bcugRFNNcuu/tBs+63fpAUTVIHfmGRLGG1OIQ/K3KKFpRfH Rc0t3gkWyKJF1qJs9bH3Ww1Cz6o0oXk= X-Google-Smtp-Source: ABdhPJy/LjZcGJk+lnGr4IlngwEG7ozs2r22JxPXjpnYyyQVnQONHJHI9aWxuJpPcvTSAaO8zf01Wg== X-Received: by 2002:aa7:9acc:0:b0:4a2:b8b5:8813 with SMTP id x12-20020aa79acc000000b004a2b8b58813mr18849798pfp.4.1637901393203; Thu, 25 Nov 2021 20:36:33 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:32 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 22/26] dnf: drop python3-disutils dependency Date: Thu, 25 Nov 2021 20:36:01 -0800 Message-Id: <9e4370858bcb3f91f2e013911d92b32be09aec23.1637900380.git.timothy.t.orling@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158818 Upstream dropped the now deprecated distutils: 18995d65 Remove distutils which are deprecated in python3.10 (RhBug:1950229) Usage was replaced with sysconfig, which is in pyton3-core [YOCTO #14610] Signed-off-by: Tim Orling --- meta/recipes-devtools/dnf/dnf_4.10.0.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-devtools/dnf/dnf_4.10.0.bb b/meta/recipes-devtools/dnf/dnf_4.10.0.bb index 6ff2a6b1e6f..3fc24b132df 100644 --- a/meta/recipes-devtools/dnf/dnf_4.10.0.bb +++ b/meta/recipes-devtools/dnf/dnf_4.10.0.bb @@ -38,7 +38,6 @@ RDEPENDS:${PN} += " \ python3-netclient \ python3-email \ python3-threading \ - python3-distutils \ python3-logging \ python3-fcntl \ librepo \ From patchwork Fri Nov 26 04:36:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 446 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 474BCC4332F for ; Fri, 26 Nov 2021 04:36:35 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web08.20255.1637901394899543630 for ; Thu, 25 Nov 2021 20:36:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XYDoqW82; spf=pass (domain: gmail.com, ip: 209.85.210.176, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f176.google.com with SMTP id o4so7669480pfp.13 for ; Thu, 25 Nov 2021 20:36:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=HlsrSK1+n9wvzYytW+2UzJftn02d82bjGVeD+vKAaac=; b=XYDoqW82If8hWizIGxHhT86kYcmugoLyNB0W8ZFJnEmlOPrnWTLgBj+aLwjQKadQmA /27GY2gKs3fgsiAcoOxnIG0Od9WbO38q0G2+X+962WwoYy9X85Ml3+/4uktuKxE17+jV GwZTx5FOrEkrh0RumSNmE7UfjuZ8K3dSAL7h9mtUUp5UwOdwXHHfIqSFIzBKHhlLT4+5 ylmVplGm4Y0v+Tej76PFDQ9VbJK8hlMcOUC8p5jMh2byFb7RyztU9OBT3zvMt7/dJAMu nzCNTxpSewh78J76PABwnZOU+vYTeZy3UYFiMnSqkGgewxb/F5D+X2JkX6a5UjHvCG0K iC8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HlsrSK1+n9wvzYytW+2UzJftn02d82bjGVeD+vKAaac=; b=Lvg+6q3+M+9s8mPGc/Opn64JANclQEXwunQ7Lc76dZFFZLyjIaTxTFV0YXFGU/v0sM AjMmnLcrukKcYmXPWqKwgvKVOJObPfvOw7WuAAgCL84Lem83W8yoMPpoJaQXwDLP09yx 79hw24ChQ69G3wXqDa+jAfrPbVAKci4iQYbHlrUAJqm4IYmS95kicnNhhiPSnsKd6vuT 0pdShac4EYFCnZEZe5kxt99TMzL3G6XwY9906JiqeRl1zrV7lHvmPsILo0a/PL4vot2v /ItNcDvIEbnGR/7mxwF4Zp9sPSk7OBeMdt+rYMIdTjNaNWqGTbT0XoQwphgI+IS8UYG3 A2Lw== X-Gm-Message-State: AOAM530yOU58V74bHzM5k/5TzjAeMD6HbkrZJNrCd8RGQzNGiPpdH2/y /mB3UpsCpkthdU5//YVJEsvVo6W3qmY= X-Google-Smtp-Source: ABdhPJxvABl7KrIcAyZClgr+PtaIGyeLFI751nATG9JZdN+RLM5ma77skpIrxzDy8Thv2MIJjOwRfg== X-Received: by 2002:a62:1e81:0:b0:4a3:7a97:d868 with SMTP id e123-20020a621e81000000b004a37a97d868mr18948496pfe.52.1637901393984; Thu, 25 Nov 2021 20:36:33 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:33 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 23/26] python3: refactor python-config patch Date: Thu, 25 Nov 2021 20:36:02 -0800 Message-Id: <7967250b8b7c22b80fa8cbe84a776ff28ea26b1a.1637900380.git.timothy.t.orling@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158819 Drop legacy python-config.patch distutils is deprecated in Python 3.10 and will be removed in Python 3.12 (~October 2023). Rather than wholesale import the distutils.sysconfig module, refactor to replicate legacy distutils usage that we need. This merges changes to get_python_inc from 12-distutils-prefix-is-inside-staging-area.patch [YOCTO #14610] Signed-off-by: Tim Orling --- ...n-implement-legacy-disutils-behavior.patch | 68 +++++++++++++++++++ .../python/python3/python-config.patch | 55 --------------- .../recipes-devtools/python/python3_3.10.0.bb | 2 +- 3 files changed, 69 insertions(+), 56 deletions(-) create mode 100644 meta/recipes-devtools/python/python3/0001-python-config.in-implement-legacy-disutils-behavior.patch delete mode 100644 meta/recipes-devtools/python/python3/python-config.patch diff --git a/meta/recipes-devtools/python/python3/0001-python-config.in-implement-legacy-disutils-behavior.patch b/meta/recipes-devtools/python/python3/0001-python-config.in-implement-legacy-disutils-behavior.patch new file mode 100644 index 00000000000..71fad65def0 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-python-config.in-implement-legacy-disutils-behavior.patch @@ -0,0 +1,68 @@ +From 9bc5f12a31f1c90913bfa90f71ec12cea95de040 Mon Sep 17 00:00:00 2001 +From: Tim Orling +Date: Thu, 25 Nov 2021 17:48:23 -0800 +Subject: [PATCH] python-config.in: implement legacy disutils behavior + +The sysconfig behavior does not provide the correct paths for our usage, +but rather than continue to use the deprecated distutils.sysconfig +behavior, refactor the code paths we need to use supported standard +library functionality. + +[YOCTO #14610] + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Tim Orling +--- + Misc/python-config.in | 31 +++++++++++++++++++++++++++---- + 1 file changed, 27 insertions(+), 4 deletions(-) + +diff --git a/Misc/python-config.in b/Misc/python-config.in +index ebd99daa0c..5959d74453 100644 +--- a/Misc/python-config.in ++++ b/Misc/python-config.in +@@ -35,14 +35,37 @@ if '--help' in opt_flags: + + for opt in opt_flags: + if opt == '--prefix': +- print(getvar('prefix')) ++ # borrow the legacy behavior of distutils.sysconfig.PREFIX ++ print(os.path.normpath(sys.prefix)) + + elif opt == '--exec-prefix': +- print(getvar('exec_prefix')) ++ # borrow the legacy behavior of distutils.sysconfig.EXEC_PREFIX ++ print(os.path.normpath(sys.exec_prefix)) + + elif opt in ('--includes', '--cflags'): +- flags = ['-I' + sysconfig.get_path('include'), +- '-I' + sysconfig.get_path('platinclude')] ++ # borrowing the logic from legacy/deprecated distutils.sysconfig.get_python_inc ++ ++ # Calculate the build qualifier flags if they are defined. Adding the flags ++ # to the include and lib directories only makes sense for an installation, not ++ # an in-source build. ++ build_flags = '' ++ try: ++ if not sysconfig._PYTHON_BUILD: ++ build_flags = sys.abiflags ++ except AttributeError: ++ # It's not a configure-based build, so the sys module doesn't have ++ # this attribute, which is fine. ++ pass ++ ++ incdir = os.path.join(sysconfig.get_config_var('srcdir'), 'Include') ++ if prefix is None and os.environ.get('STAGING_LIBDIR', ""); ++ prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename) ++ elif prefix is None: ++ prefix = sysconfig._BASE_EXEC_PREFIX or sysconfig._BASE_PREFIX ++ python_dir = 'python' + sysconfig.get_python_version() + build_flags ++ #platincdir = sysconfig._sys_home or sysconfig._PROJECT_BASE ++ flags = ['-I' + os.path.normpath(incdir), ++ '-I' + os.path.join(prefix, "include", python_dir)] + if opt == '--cflags': + flags.extend(getvar('CFLAGS').split()) + print(' '.join(flags)) +-- +2.30.2 + diff --git a/meta/recipes-devtools/python/python3/python-config.patch b/meta/recipes-devtools/python/python3/python-config.patch deleted file mode 100644 index c53f646af35..00000000000 --- a/meta/recipes-devtools/python/python3/python-config.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 57d073c12e7bede29919117b0141df14015eb27f Mon Sep 17 00:00:00 2001 -From: Tyler Hall -Date: Sun, 4 May 2014 20:06:43 -0400 -Subject: [PATCH] python-config: Revert to using distutils.sysconfig - -The newer sysconfig module shares some code with distutils.sysconfig, but the same modifications as in - -12-distutils-prefix-is-inside-staging-area.patch makes distutils.sysconfig - -affect the native runtime as well as cross building. Use the old, patched -implementation which returns paths in the staging directory and for the target, -as appropriate. - -Upstream-Status: Inappropriate [Embedded Specific] - -Signed-off-by: Tyler Hall - ---- - Misc/python-config.in | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Misc/python-config.in b/Misc/python-config.in -index ebd99da..13e57ae 100644 ---- a/Misc/python-config.in -+++ b/Misc/python-config.in -@@ -6,7 +6,9 @@ - import getopt - import os - import sys --import sysconfig -+import warnings -+warnings.filterwarnings("ignore", category=DeprecationWarning) -+from distutils import sysconfig - - valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', - 'ldflags', 'extension-suffix', 'help', 'abiflags', 'configdir', -@@ -35,14 +35,14 @@ if '--help' in opt_flags: - - for opt in opt_flags: - if opt == '--prefix': -- print(getvar('prefix')) -+ print(sysconfig.PREFIX) - - elif opt == '--exec-prefix': -- print(getvar('exec_prefix')) -+ print(sysconfig.EXEC_PREFIX) - - elif opt in ('--includes', '--cflags'): -- flags = ['-I' + sysconfig.get_path('include'), -- '-I' + sysconfig.get_path('platinclude')] -+ flags = ['-I' + sysconfig.get_python_inc(), -+ '-I' + sysconfig.get_python_inc(plat_specific=True)] - if opt == '--cflags': - flags.extend(getvar('CFLAGS').split()) - print(' '.join(flags)) diff --git a/meta/recipes-devtools/python/python3_3.10.0.bb b/meta/recipes-devtools/python/python3_3.10.0.bb index e3300b6495b..6b965af0509 100644 --- a/meta/recipes-devtools/python/python3_3.10.0.bb +++ b/meta/recipes-devtools/python/python3_3.10.0.bb @@ -17,7 +17,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'tk', '', 'file://avoid_warning_about_tkinter.patch', d)} \ file://0001-Do-not-use-the-shell-version-of-python-config-that-w.patch \ - file://python-config.patch \ file://0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch \ file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \ file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \ @@ -33,6 +32,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://makerace.patch \ file://0001-sysconfig.py-use-platlibdir-also-for-purelib.patch \ file://0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch \ + file://0001-python-config.in-implement-legacy-disutils-behavior.patch \ " SRC_URI:append:class-native = " \ From patchwork Fri Nov 26 04:36:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 447 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 42321C433F5 for ; Fri, 26 Nov 2021 04:36:36 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web09.20187.1637901395302094956 for ; Thu, 25 Nov 2021 20:36:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VSC0zPoa; spf=pass (domain: gmail.com, ip: 209.85.215.178, mailfrom: ticotimo@gmail.com) Received: by mail-pg1-f178.google.com with SMTP id m15so7044962pgu.11 for ; Thu, 25 Nov 2021 20:36:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=r563C9Lg3PSjEQa5Y81F96RgOxBdG7ZN8zou7ObigP4=; b=VSC0zPoah+xY8xVWOojv+m4YLHHuO2AlJ68mPQuY3e7HMg3SAzycb4pHh2zK2+7jQj Q4BiSlcYTrGBRvaPIhdYLtTOpJ0ZfzHmJwiuD/W3sbWlSEaRiuPQapuG6885Qey2rIP9 zEyI+Bt1skZTi2IlsChdbt3VmvnMGE99OhQsy34wYrcE/Q0TKpQfHcEWgg61eEB7v46t HnmdUrRW5PU80Q4S6mXMRaYCMpk7UvIz25EBqaaZodZ8K1ItNpyNbZjsrsmAEc9iR6uk evACLI8wEh0P1sG8jIeyOet691/lHDcWN0NM9l7XCB5SFk3aAFpmhptfUtXRAhtx8dMu lcYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r563C9Lg3PSjEQa5Y81F96RgOxBdG7ZN8zou7ObigP4=; b=dNAtlJtW9eJEzPcIVBxeujLTDxVm14cf7BcOAI+Vk+X+vZeArTqQSVj48LaCCmpH8O gKKZg7xF+PxlIPMqIVwD/K8PW+ks5bnhab5iDoIZLZNs4pSLI0Ec62oHoJ3f4nJXQ49w e0o9e/et9YkcFD1ootnlQXl9MC06H1JyytpsA2Y/dhvDa23OSTfShSTYWb1Sz9z/ZfjD S2P2zunLITr/MwNf77bUTtiB6/SNq9GELODL2wA/JWYaM7U0rkXa4x92LCaIFTUHBsmz S9rOxKZ7bS6bDWA6koBTNes6ieeN990dQCJT8NDGF+4Fn2tuEs0iQSAx/C942l0DBGtJ eYKA== X-Gm-Message-State: AOAM533kh1G+7ayJecojRRU9hJcvr81/D3YSKUdLRixh90XJ49Q2sSpq y9pwjvGHjRPfrTLyY2ud/u+ixLmghdg= X-Google-Smtp-Source: ABdhPJybbWbnz9AfTiY6g4xOlw0oq18i6ldtnfp+9lwIK0AJl1Z9M0ZgQM8Fs7yxqYGuHBC7DdFw9g== X-Received: by 2002:a05:6a00:10d2:b0:44d:f03e:46c7 with SMTP id d18-20020a056a0010d200b0044df03e46c7mr18542623pfu.0.1637901394672; Thu, 25 Nov 2021 20:36:34 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:34 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 24/26] lib/oe/terminal.py: use bb.version.LooseVersion Date: Thu, 25 Nov 2021 20:36:03 -0800 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158820 distutils has been deprecated in Python 3.10 and is slated for removal in Python 3.12 (~October 2023). Refactor to use the newly imported bb.version.LooseVersion instead of distutils.version.LooseVersion. [YOCTO #14610] Signed-off-by: Tim Orling --- meta/lib/oe/terminal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index 59aa80de669..6681b0831a5 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py @@ -5,7 +5,7 @@ import logging import oe.classutils import shlex from bb.process import Popen, ExecutionError -from distutils.version import LooseVersion +from bb.version import LooseVersion logger = logging.getLogger('BitBake.OE.Terminal') From patchwork Fri Nov 26 04:36:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 448 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 42D15C433FE for ; Fri, 26 Nov 2021 04:36:37 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.20023.1637901396457075624 for ; Thu, 25 Nov 2021 20:36:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=F/RUTc1C; spf=pass (domain: gmail.com, ip: 209.85.215.172, mailfrom: ticotimo@gmail.com) Received: by mail-pg1-f172.google.com with SMTP id s137so7063599pgs.5 for ; Thu, 25 Nov 2021 20:36:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6jLkv//PEfv79VGc1qi0lbHc2P+fX5z5r1nuqZ8uXEo=; b=F/RUTc1CYl7sBTl643XGywGDJFhl1Fnpvew5M6EYcPCYmfNWjzrYk5AN+Wy5/cONet sfICMJ008XhiCvrGak2jjyeqjgG81QSJAX6PLvvgT1r2tVq5+Izgt+YZueTRMFcjqrD8 JSGvZ+D9eO1JPSH0ACKLS8p6Z7flmvbfJ+EuAvgV9s4e+hUDurVxQSCrY49VnP8EsYDk 2DNqKQ+fz5FLS6DvkioJtr57g3tCyXoLX+HgX9R6GkFFAaFw4y5SHb+BYFLNQ+y+hJfk hVF1CYYVzmiheQbfqIPZhVp46IGGRJgQ6iCDJrUm1QItUQHbqIuIFqWO3mVX412qRUiV f6zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6jLkv//PEfv79VGc1qi0lbHc2P+fX5z5r1nuqZ8uXEo=; b=OOYLvLmgyXnKHT6T4Y+mSEvKIVU+ktMU+fsKUT+1XIUxTFPH1jIVYhfNBCWhTZSxXi sEcMu1MtxXmNQd/Q71b/DkxYjtprwEkx4+HjQkK9VC+vfMKxk8Dc9Et0TL2W998p5hPI NrFErgK2EXmf/Cf6iE/yPZiFjVcIsWr95sAzwUDQr/NIkLXiYK2dHy2rrc+b0Enfg/6N yHXRUNSFL+4LPLnt+riwXReet/1KrSknmpspzhpVGNc30IucpTG/2k8q/JbRIfAa8rY+ XUJ7ZVce6n9YGMAm3K+xXlud4xIJhG+Vi67Kw+BA/oaH7soTw6Uee2uqA27z4CnpczNr qA0w== X-Gm-Message-State: AOAM532ULKTpHAy1iJWlzUSm4shGCnRibdqBJ62xoX638K+6n/dAldHP QFW4fy0pFyCWancs1Xgv3uCHti+exnA= X-Google-Smtp-Source: ABdhPJxHYLdPkExJuoQTLblQ8u0tYI7qPUuO2JlcIyqzrMR7OEeKp6zBBIOBciE8MyRlzsJHQg48KA== X-Received: by 2002:a05:6a00:10cf:b0:4a3:124d:bb81 with SMTP id d15-20020a056a0010cf00b004a3124dbb81mr18928860pfu.75.1637901395419; Thu, 25 Nov 2021 20:36:35 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:34 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 25/26] python3native.bbclass: distutils -> sysconfig Date: Thu, 25 Nov 2021 20:36:04 -0800 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158821 In the comment it says we patch distutils modules, but we now are patching sysconfig and not using disutils. [YOCTO #14610] Signed-off-by: Tim Orling --- meta/classes/python3native.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/python3native.bbclass b/meta/classes/python3native.bbclass index 13fbaa5f9c7..3783c0c47eb 100644 --- a/meta/classes/python3native.bbclass +++ b/meta/classes/python3native.bbclass @@ -4,7 +4,7 @@ PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3" EXTRANATIVEPATH += "python3-native" DEPENDS:append = " python3-native " -# python-config and other scripts are using distutils modules +# python-config and other scripts are using sysconfig modules # which we patch to access these variables export STAGING_INCDIR export STAGING_LIBDIR From patchwork Fri Nov 26 04:36:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 449 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 41B47C433EF for ; Fri, 26 Nov 2021 04:36:38 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web12.20173.1637901397380469061 for ; Thu, 25 Nov 2021 20:36:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=o7mBu1mW; spf=pass (domain: gmail.com, ip: 209.85.215.179, mailfrom: ticotimo@gmail.com) Received: by mail-pg1-f179.google.com with SMTP id f65so7100664pgc.0 for ; Thu, 25 Nov 2021 20:36:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=EjQDhFGcKsBIHzqkZSk1Rq6UQYrfPu/SBJl/wGMq3q4=; b=o7mBu1mWvmzniYAQycYy4olKvLEvkz3zclwZV5hkcsXlJZKTVLdGuEmbz135X/Btwa DRUZ2IVj5uF2OxYND9PokxohOKEypZao4pdEm/wDbbrNhFm5JdrVQIQRaLsAmtEvQGK7 WLtSg5eA88nYkDaPPJyRBzY6dBJ6a8AS/Kzlu5J5vDLolE30hr0DMQUbWiegorO+to11 vhRVZ+Qo1KyNaaFsoALcnEPI+mIBsKwhjD/T+9/ddzeHZoJ0nc3aqwRJZ9EwTu5o8WYE bk3VCLLLyW8yoOAqyS6rCgifcLmFVodzJKXzM+6bCP/Fu5umdhtBZafrk26bTCwzieO6 1HyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EjQDhFGcKsBIHzqkZSk1Rq6UQYrfPu/SBJl/wGMq3q4=; b=G8FEWKhTyCiE9yfBl62jkkyMGpJ2GXgcKUHwpzrTd5Fp7NrV0szrQQoFAMouuZa5yM kqfLK76/DgBoQ2wqGj/yhEPDTrScPBtduUzTzK2qgu2+UYu4l75XQjnTkdaVK9kF7FZC 8TXYCA/vIZD6c3zJTDv48kw9s2ng477Hz1VFY+QPMEkJ9ABy9SBkHLOORVnkUN4qpF47 1c63kdduttkPtG5qgx4oSeBN5x5CvMEEFJNTDPzqSVQ9+Dg/9O7mSDfqBZedMHPrBqwt SjOkiR5uZLOWvQSRLr96/eNG/33m9pEdYSVdSf4ShKR5sUa+Ldq12L1LShZh7fE+mTKb RbMA== X-Gm-Message-State: AOAM532QVwlyYMN5oV3GxOw/BrfGBy3bT+5dqqrNV7zmNbCcMFujSPti m9jCA6cIvyF0czBteKCxtkO15sGnWic= X-Google-Smtp-Source: ABdhPJzrHlGVJBrUJERXGa/JlqWiUcMG9mkvmUwVirLZJJRMxwfjVxdL0zCJWGj17dEEiX1xLB9zMg== X-Received: by 2002:a05:6a00:acc:b0:44b:ff29:621b with SMTP id c12-20020a056a000acc00b0044bff29621bmr18512105pfl.32.1637901396714; Thu, 25 Nov 2021 20:36:36 -0800 (PST) Received: from nereus.local ([2601:1c0:6000:1830:2111:e66e:a58a:6736]) by smtp.gmail.com with ESMTPSA id fw21sm8909282pjb.25.2021.11.25.20.36.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 20:36:35 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 26/26] rootfs_rpm.bbclass: distutils -> sysconfig module Date: Thu, 25 Nov 2021 20:36:05 -0800 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: 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, 26 Nov 2021 04:36:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/158822 Change a comment to reference our custom changes to the sysconfig module, as dnf no longer uses distutils. [YOCTO #14610] Signed-off-by: Tim Orling --- meta/classes/rootfs_rpm.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 3d8d784f792..bec4d63ed6c 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -4,7 +4,7 @@ ROOTFS_PKGMANAGE = "rpm dnf" -# dnf is using our custom distutils, and so will fail without these +# dnf is using our custom sysconfig module, and so will fail without these export STAGING_INCDIR export STAGING_LIBDIR