From patchwork Sun Dec 31 12:23:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37127 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 5C6D0C3DA6E for ; Sun, 31 Dec 2023 12:23:43 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web11.218938.1704025417956355452 for ; Sun, 31 Dec 2023 04:23:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=b2/rRw7X; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-40d87ecf579so2129015e9.3 for ; Sun, 31 Dec 2023 04:23:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025416; x=1704630216; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Ie47pa00TfucbbJ39Qf7bgwQnRP93h3MsuKrFnw1v5U=; b=b2/rRw7XF9FfTHbvjBUfP1zcvcixplJTl9z9oB+ximoH4nV/V61uwBUv0J4vRA0Y9K QMhXrCT51HsCHDgaI3B0MILpU5HV1OFnCabRn3CwdCbTZvqlbNDojAlymsAq+fSbD0bY 4brxT1syMxvBHGmLELBhWWPB7G4Bj1Gq9CkU2er4SbcSaecPgD1bawvlDoH7OR1D7GhW 7NOotPXBNKt3ueh+oGyga179NB97e5den4HLG3uAqNXc0RcggdPH/GZp3sJcuvlu34GF nSi/7oklVgc3q/UKiVkIcLkpqLNKzNSGFnBj4CprV5SiKiJ4uArQnjYk3BilAbEHOpdZ hxhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025416; x=1704630216; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ie47pa00TfucbbJ39Qf7bgwQnRP93h3MsuKrFnw1v5U=; b=V1ia5jiyob+0aHKOogJKPditnyDqcOT8Csc5HvW5RXf4dUWPbvlqHcG/QNm6ZhIkEo Nycl2k781/ac2UbS9cdBgiwvdFXXqhG/I81Y5TRR1y9Kgevo7mnaDCNV658Vg+GBVAZ+ s0nKEUtGd50f465CjToVQsMmvgbAULCuLWj44FdX/V70+Wwvku9glbItd4MAVCB/sqCl J6leOwdzs1r7ns7pdxhlmVspHaYC3bwsLQ5vZwovVz8EJ5H239Fjix4N4G1ptbcTW1su QdAfaqNsnMcA3QA739FFvqRpJpdY9APnH/mgH58RSSbcd1fKVkoVL9CATOwztB6glF8Y BnqA== X-Gm-Message-State: AOJu0YxxI1Up45lobnhNqwNz2I3lvtCfaWc23LEvFG4/q7UVpBq7PG/Q 2w4koETq+D6VpfaLymrsn28NOT9GLfY= X-Google-Smtp-Source: AGHT+IEGPnjTzmrKpy5PM3f7WW6fH9zHZ6vKubRl8agOCp5fw3648ExCDSX24ViXO9asb2CEPOGgqA== X-Received: by 2002:a05:600c:3844:b0:40d:86e7:f77e with SMTP id s4-20020a05600c384400b0040d86e7f77emr253991wmr.72.1704025416179; Sun, 31 Dec 2023 04:23:36 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:35 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/23] fontforge: add a readline PACKAGECONFIG Date: Sun, 31 Dec 2023 13:23:07 +0100 Message-Id: <20231231122329.405225-1-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 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 ; Sun, 31 Dec 2023 12:23:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107952 This helps with build determinism; also if readline is not in sysroot but readline-native is, fontforge erroneously decides to build with it. Signed-off-by: Alexander Kanavin --- meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb index 404e86b86..31dd495fd 100644 --- a/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb +++ b/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb @@ -24,6 +24,8 @@ SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \ S = "${WORKDIR}/git" EXTRA_OECMAKE = "-DENABLE_DOCS=OFF" +PACKAGECONFIG = "readline" +PACKAGECONFIG[readline] = "-DENABLE_READLINE=ON,-DENABLE_READLINE=OFF,readline" CFLAGS += "-fno-strict-aliasing" LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" From patchwork Sun Dec 31 12:23:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37134 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 AFA8EC4725D for ; Sun, 31 Dec 2023 12:23:43 +0000 (UTC) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by mx.groups.io with SMTP id smtpd.web11.218939.1704025418307046180 for ; Sun, 31 Dec 2023 04:23:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HdqeogdJ; spf=pass (domain: gmail.com, ip: 209.85.208.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-555e07761acso1491964a12.0 for ; Sun, 31 Dec 2023 04:23:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025417; x=1704630217; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WhpEjbew/pPPv+0pB/5UEicoxT88z7DLGuIoetdu97I=; b=HdqeogdJZlsnh0rGJgcvcRpNFwxfXlJIEyF+y/OWAVq2YKtEY4eoMDlikjDsv9lNAN J4efNggyC/4nF2Tku3rinPP52gygDwVju0eKySaUL8xbZoqCv4SncE/su8JiAfyn13Xf Qu/j6PRpSo/GyHAY7Rj8k5L93dbJwJXrh+A14O9D3sOFI82rw3/lmo8ANUhQIclLvvaC 5fZUy14E/UZUpXh+/wds3DQ//xf07upl4ZjQcafQh0dRB/ouiVVJYAt8aTY0Lwx44zwx t8aCcfNZEp+QC2S/nnoZIzRKeVZMCkx5nBkVARnXG999QJaav8pPM2GaWr9LkQEJ6rn3 vMUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025417; x=1704630217; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WhpEjbew/pPPv+0pB/5UEicoxT88z7DLGuIoetdu97I=; b=n5ZYH2ZOkjniUBP3XWLDnnzysO8sD6s14k5jG1Io6pWvepVCMlTfWH1Uj+jsmrHDG8 vmjKkD1AgZxynJy5N+IdMyZl1o+Wjc5RfDhlXgDa2DSXmgjYG4TOtmo4McNO9Busl3OU yc7CtZy+hoi+iPzEF9g/PUbc6agGpTKE63bPjMZ6f3GYXM1PZUjHnGvk0T3xsYedfwxR n3hSfy/v0t4pvlCkWjaruWV83F6iTYa5eJh5ph84GMHqVGCCu31w59KIRZ85frYJgZan OIwhLCnXUDhX5AAgzQyjVZTCpg7xIwVZSU/aoQijSTSG47pbjqPUIS6bGdMHL9Xjz1LE PtOA== X-Gm-Message-State: AOJu0YwXqFiWIT284dvG49zx7d2Jo3SFHpRHOTTFZvl4BQN8QnnuENoi HHKhoa7NFtcsP6vBUe0Bod6F4T7fyN8= X-Google-Smtp-Source: AGHT+IEhN0NviBzw01m62qLocCtM/30Bj9M027SVNPVDZSVMFstCRu31UXlC07IJNgTnmvm4w/egew== X-Received: by 2002:a50:ab54:0:b0:550:4412:e8f with SMTP id t20-20020a50ab54000000b0055044120e8fmr6280361edc.17.1704025416778; Sun, 31 Dec 2023 04:23:36 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:36 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/23] volume-key: disable python bindings Date: Sun, 31 Dec 2023 13:23:08 +0100 Message-Id: <20231231122329.405225-2-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107953 No longer compatible with python 3.12; there hasn't been a release since 2018: https://pagure.io/volume_key/releases Signed-off-by: Alexander Kanavin --- meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb b/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb index aff555ad5..cc03ab4fe 100644 --- a/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb +++ b/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb @@ -27,7 +27,7 @@ DEPENDS += " \ swig-native \ " -PACKAGECONFIG ??= "python3" +PACKAGECONFIG ??= "" PACKAGECONFIG[python3] = "--with-python3,--without-python3,python3,python3" EXTRA_OECONF = "--without-python" From patchwork Sun Dec 31 12:23:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37135 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 B434DC47422 for ; Sun, 31 Dec 2023 12:23:43 +0000 (UTC) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by mx.groups.io with SMTP id smtpd.web10.219012.1704025418837004130 for ; Sun, 31 Dec 2023 04:23:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Yz1NIi+W; spf=pass (domain: gmail.com, ip: 209.85.218.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a22f59c6ae6so952288766b.1 for ; Sun, 31 Dec 2023 04:23:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025417; x=1704630217; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2G8e62Wmu8V4X8z1xs/RdP9ZR9NhH/RpR3korQiFdV4=; b=Yz1NIi+WeSEMbgTBiL2cDv724ZUGPoU77f7O5sPPD+P/ooDnjbecOCYQmJCa3JWe6Z 2yvbXvbIz9IYOKTwA2lE6keqWyPWZD7NnsUu7pNVPzNiMIC8jC6qnswW4wmYgLFaYX44 TEec6XGGdNODbv4Ek6Na31jPZ2qy1/SjjNXDMOZqWEkxG1dwszWKRvmFJJAhWVoVlULU 81GDutfnmsk/6wUF1blmqeteoYlH3WLQnO2dY9i6n9U+VVYleV5jUEIP6wA7heNIudQ3 xHeQrw4V5mVXb3k3YGxOoQXGgLu7ebET4wQCoOzkTxtn899mhr0vn/CkBAdRtR06st4k 7jYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025417; x=1704630217; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2G8e62Wmu8V4X8z1xs/RdP9ZR9NhH/RpR3korQiFdV4=; b=mxWpkDMDx2WpcuSAsn5Eulcbm59xlONlBCvjA2F0iZbbnzSReOgLD6+YaKkL6zOP9p YsQPD7tsm+L7D8cwrbWlX+MZgSRKXGBn2A2UYaQvOW7/xfypKRxrFyUJ982oFDBSom/Z eYC4IlapUQ3+w1Afzm8GOlP7MothAvc73ND2L/rwZJdN9ERUvYQvz/wZMprDtKzCLUc0 DP4I/0F4DDUjENUauMM33IHhw6M65c8bNsIqZcjvvoHQ1v3wRdaERTGGgr/dOApIiCVV GdoBEIO8xFhGaCZamdwpG6EPfU3g6vVWfCML+ixEF8emQYozbK8V9VZyvXkkBCQ3CLtA YwYA== X-Gm-Message-State: AOJu0Yyug6HS3UAjtOYZZkEgJPL5Jqya5bjkI3Xl6GiZNvBmHJrgJX8Y MbN9WI6qZ/IE07iVIgc8yMS2QMJnyxQ= X-Google-Smtp-Source: AGHT+IHcSWA6J1DD9VY1MZvIRllmom2jyIzTALuI3tuzE0o6P1tvmUXFWfXz0anQrtcLksubhjM/tA== X-Received: by 2002:a17:906:1742:b0:a1d:fed:38d0 with SMTP id d2-20020a170906174200b00a1d0fed38d0mr3450448eje.174.1704025417313; Sun, 31 Dec 2023 04:23:37 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:37 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/23] audit: disable python bindings as incompatible with python 3.12 Date: Sun, 31 Dec 2023 13:23:09 +0100 Message-Id: <20231231122329.405225-3-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107954 Signed-off-by: Alexander Kanavin --- meta-oe/recipes-security/audit/audit_3.1.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-security/audit/audit_3.1.2.bb b/meta-oe/recipes-security/audit/audit_3.1.2.bb index 5380e9022..1f2c821f0 100644 --- a/meta-oe/recipes-security/audit/audit_3.1.2.bb +++ b/meta-oe/recipes-security/audit/audit_3.1.2.bb @@ -32,7 +32,7 @@ DEPENDS = "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native" EXTRA_OECONF = " --with-libwrap \ --enable-gssapi-krb5=no \ --with-libcap-ng=yes \ - --with-python3=yes \ + --with-python3=no \ --libdir=${base_libdir} \ --sbindir=${base_sbindir} \ --without-python \ From patchwork Sun Dec 31 12:23:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37136 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 9A8F5C47255 for ; Sun, 31 Dec 2023 12:23:43 +0000 (UTC) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by mx.groups.io with SMTP id smtpd.web11.218940.1704025419392636119 for ; Sun, 31 Dec 2023 04:23:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HDXW+Mx8; spf=pass (domain: gmail.com, ip: 209.85.218.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a235eb41251so911589866b.3 for ; Sun, 31 Dec 2023 04:23:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025418; x=1704630218; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Oqv/Ig/NzYgrUdbSZ1sM227QHOICZMxa+lo9GP3n3VA=; b=HDXW+Mx8XPAPRTBEaO3cIaZ+BrbHROi8MALI9Uxvc/OwgHa1cMvcg5mOPUZPMNNFPL 4+KJeYgmDK43W6VhAKvXf6dtDDEETJPv0entWf0BQp0f8ZBxa1U89Anrp60B6TKVum0b nZ6+A1i5p6f/P98fXBN6BHDyN1FMj5hkV/vru4REaHY4kY/czAGH1pVIxJGAVyts8OLN FBvDxnC7md2LzAWMC+ZaVJvbtOYqqKfyH30vthNQLC7jC8Z59FPFsYovmZ7/w/AdVuF0 iMCoObdROZ2FGNQI3w5+5O/KiamgdW+EXJBGSKILLppAur+oqjjIviKvYrkE9PcibxGC T0HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025418; x=1704630218; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Oqv/Ig/NzYgrUdbSZ1sM227QHOICZMxa+lo9GP3n3VA=; b=fSFrAoFdkxm2aKo226hLwQoox2+g2IkumC809s/L3BKNPmkvzAlry6iPqDGMDWYzhs OlMbRRybCFOJ7yQoQGf2Mgw2ZGOT0WltN9ZsrU6UUcYq+bzaBr52OynhuSbqRN43c1/8 L6RvO1rPbBRr3V1bSKMkAWgog13pJoe+PhfZPNrmtuOd/ie86zukvfemVxpxJgYAepeo L9IOP9wAk3xpvTSyirvayZ4jhhOmBIwQG3qzijVKhvFeFgS1wGcsZWCG9HOb6jVG4cXf HkJpYR33+zz1EQtI7+mTAOnP3E+ZwpUDKnVsL6+RZi6VIb9Iz1y/cDbDBfIgRiubyTcw BeiA== X-Gm-Message-State: AOJu0Yxa/DdHouIwW9x/NsBfQnhv7hgWTAIaKskTSxFMcCEXFzXI2OIj kc3uFO9rTnYbhlF/EejCFP+KiayszEw= X-Google-Smtp-Source: AGHT+IHduwP1SXYxBQUDCBV29z0v9bT3l4WVC4RDtfNmUOjvxNXqfVyxSEP56itDZ+e+BFQ1b+RDSQ== X-Received: by 2002:a17:906:5a96:b0:a22:f592:9e46 with SMTP id l22-20020a1709065a9600b00a22f5929e46mr3598600ejq.228.1704025417834; Sun, 31 Dec 2023 04:23:37 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:37 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/23] cmpi-bindings: update 1.0.1 -> 1.0.4 Date: Sun, 31 Dec 2023 13:23:10 +0100 Message-Id: <20231231122329.405225-4-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107955 Drop several obsolete patches; either upstream fixed the issue or there's a standard way to cross-build python items. Add setuptools dependency as distutils is still needed. Signed-off-by: Alexander Kanavin --- ...BI-suffix-to-the-python-library-name.patch | 22 ---------- .../cmpi-bindings/0001-Fix-error.patch | 12 ++---- .../cmpi-bindings/0001-Modify-cmakelist.patch | 41 ------------------- ...-fix-the-build-error-when-python-3.0.patch | 33 --------------- .../cmpi-bindings-0.4.17-no-ruby-perl.patch | 14 +++---- .../cmpi-bindings-0.4.17-sblim-sigsegv.patch | 18 +++++--- .../cmpi-bindings-0.9.5-python-lib-dir.patch | 17 -------- ...ndings_1.0.1.bb => cmpi-bindings_1.0.4.bb} | 22 ++++------ 8 files changed, 30 insertions(+), 149 deletions(-) delete mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch delete mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch delete mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch delete mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch rename meta-oe/recipes-extended/cmpi-bindings/{cmpi-bindings_1.0.1.bb => cmpi-bindings_1.0.4.bb} (61%) diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch deleted file mode 100644 index fa029da2b..000000000 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch +++ /dev/null @@ -1,22 +0,0 @@ -From a701ed30ac1bc2f77d063c237d6ae040a2d53f6b Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 16 May 2016 16:52:24 +0300 -Subject: [PATCH] Add 'm' suffix to the python library name. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - swig/python/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/swig/python/CMakeLists.txt -+++ b/swig/python/CMakeLists.txt -@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GE - SET( NAME pyCmpiProvider ) - ADD_LIBRARY( ${NAME} SHARED ${SWIG_OUTPUT}) - #TARGET_LINK_LIBRARIES( ${NAME} ${PYTHON_LIBRARIES} ) --TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION} ) -+TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}${PYTHON_ABI} ) - TARGET_LINK_LIBRARIES( ${NAME} pthread ) - TARGET_LINK_LIBRARIES( ${NAME} dl ) - TARGET_LINK_LIBRARIES( ${NAME} util ) diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch index 1d8013be6..1f147d52f 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch @@ -1,20 +1,19 @@ -From b8e791ce93a467081fb1594b91841e2f57c634a0 Mon Sep 17 00:00:00 2001 +From 3ab3ac2876cbf4a34a94f0d3256a5be9d1202370 Mon Sep 17 00:00:00 2001 From: Qian Lei Date: Fri, 16 Jan 2015 18:37:26 +0800 Subject: [PATCH] Fix error Signed-off-by: Qian Lei ---- Upstream-Status: Pending - +--- swig/python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt -index 3976296..8073fc8 100644 +index 93b4755..a7268f0 100644 --- a/swig/python/CMakeLists.txt +++ b/swig/python/CMakeLists.txt -@@ -27,7 +27,7 @@ SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/../cmpi.i" ) +@@ -26,7 +26,7 @@ SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/../cmpi.i" ) ADD_CUSTOM_COMMAND ( OUTPUT ${SWIG_OUTPUT} COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Python ..." @@ -23,6 +22,3 @@ index 3976296..8073fc8 100644 COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i --- -1.8.3.1 - diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch deleted file mode 100644 index 92e5e5662..000000000 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 070822507befe7c1b8bb1be2d36cb12141d03b8f Mon Sep 17 00:00:00 2001 -From: Qian Lei -Date: Tue, 6 Jan 2015 18:38:32 +0800 -Subject: [PATCH] Change the install path in cmakelist - -Upstream-Status: Pending -Signed-off-by: Qian Lei ---- - swig/python/CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt -index 3976296..93c87c1 100644 ---- a/swig/python/CMakeLists.txt -+++ b/swig/python/CMakeLists.txt -@@ -56,18 +56,18 @@ TARGET_LINK_LIBRARIES( ${NAME} util ) - - INSTALL(TARGETS ${NAME} LIBRARY DESTINATION ${CMPI_LIBRARY_DIR}) - # .py: swig generated --INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmpi.py DESTINATION ${PYTHON_SITE_DIR} ) -+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmpi.py DESTINATION $ENV{ENV_INSTALL_PATH} ) - - - # - # cmpi_pywbem_bindings.py: provider implementation - # --INSTALL(FILES cmpi_pywbem_bindings.py DESTINATION ${PYTHON_SITE_DIR} ) -+INSTALL(FILES cmpi_pywbem_bindings.py DESTINATION $ENV{ENV_INSTALL_PATH} ) - #INSTALL(FILES Py_UnixProcessProvider.py DESTINATION /usr/lib/pycim ) - --INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}${PYTHON_SITE_DIR}/cmpi.py', dfile='${PYTHON_SITE_DIR}/cmpi.py')\")") -+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}$ENV{ENV_INSTALL_PATH}/cmpi.py', dfile='\$ENV{ENV_INSTALL_PATH}/cmpi.py')\")") - --INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}${PYTHON_SITE_DIR}/cmpi_pywbem_bindings.py', dfile='${PYTHON_SITE_DIR}/cmpi_pywbem_bindings.py')\")") -+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}$ENV{ENV_INSTALL_PATH}/cmpi_pywbem_bindings.py', dfile='$ENV{ENV_INSTALL_PATH}/cmpi_pywbem_bindings.py')\")") - - - --- -1.8.3.1 - diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch deleted file mode 100644 index 5d5652a5f..000000000 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 323ced03a66e6cd963d8277b66cfcc7dce740be7 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Fri, 17 Jul 2015 01:33:43 -0700 -Subject: [PATCH] fix Xthe build error when python>3.0 - -Signed-off-by: Lei Maohui ---- -Upstream-Status: Pending - - src/target_python.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/target_python.c b/src/target_python.c -index 90b43a1..2b76c9e 100644 ---- a/src/target_python.c -+++ b/src/target_python.c -@@ -167,7 +167,12 @@ PyGlobalInitialize(const CMPIBroker* broker, CMPIStatus* st) - - Py_SetProgramName("cmpi_swig"); - Py_Initialize(); -- SWIGEXPORT void SWIG_init(void); -+#if PY_VERSION_HEX >= 0x03000000 -+SWIGEXPORT PyObject* -+#else -+ SWIGEXPORT void -+#endif -+ SWIG_init(void); - SWIG_init(); - cmpiMainPyThreadState = PyGILState_GetThisThreadState(); - PyEval_ReleaseThread(cmpiMainPyThreadState); --- -2.1.0 - diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch index 2072da72b..1f9e2394c 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch @@ -1,4 +1,4 @@ -From 7dd01e33f9dac75f177113de9a8ff458d4263a11 Mon Sep 17 00:00:00 2001 +From 0871fb048a48a02ec598c941e577f13d8d24f574 Mon Sep 17 00:00:00 2001 From: Lei Maohui Date: Mon, 24 Aug 2015 11:00:13 +0900 Subject: [PATCH] cmpi-bindings-0.4.17 no ruby perl @@ -7,17 +7,18 @@ Port from Fedora20 Upstream-Status: Pending Signed-off-by: Qian Lei + --- swig/CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt -index 8b5555c..c2655b9 100644 +index 00bf40c..d3cab38 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt -@@ -15,15 +15,15 @@ IF (PYTHON_LIBRARY) - ENDIF (PYTHON_LINK_LIBS) - ENDIF (PYTHON_LIBRARY) +@@ -49,15 +49,15 @@ ELSE (BUILD_PYTHON2) + MESSAGE(STATUS "*****") + ENDIF (BUILD_PYTHON3) -FIND_PACKAGE(Perl) -IF (PERL_EXECUTABLE) @@ -42,6 +43,3 @@ index 8b5555c..c2655b9 100644 +# ADD_SUBDIRECTORY(ruby) +# OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES ) +#ENDIF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) --- -1.8.4.2 - diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch index b99337204..04abd5e4b 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch @@ -1,12 +1,20 @@ -Port from Fedora20 +From bc32342fa63b8359f985fe1e187e811455c96a50 Mon Sep 17 00:00:00 2001 +From: Qian Lei +Date: Tue, 25 Aug 2015 13:19:51 +0800 +Subject: [PATCH] Port from Fedora20 Upstream-Status: Pending Signed-off-by: Qian Lei -diff -up cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py.orig cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py ---- cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py.orig 2012-03-01 17:05:31.878367281 +0100 -+++ cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py 2012-03-01 17:06:34.718110137 +0100 -@@ -350,10 +350,10 @@ class BrokerCIMOMHandle(object): +--- + swig/python/cmpi_pywbem_bindings.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/swig/python/cmpi_pywbem_bindings.py b/swig/python/cmpi_pywbem_bindings.py +index d643990..7f0cc77 100644 +--- a/swig/python/cmpi_pywbem_bindings.py ++++ b/swig/python/cmpi_pywbem_bindings.py +@@ -361,10 +361,10 @@ class BrokerCIMOMHandle(object): allow_null_ns = False else: allow_null_ns = True diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch deleted file mode 100644 index b6a51ec0d..000000000 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -Port from Fedora20 - -Upstream-Status: Pending -Signed-off-by: Qian Lei - -diff -up cmpi-bindings-0.9.5/swig/python/CMakeLists.txt.old cmpi-bindings-0.9.5/swig/python/CMakeLists.txt ---- cmpi-bindings-0.9.5/swig/python/CMakeLists.txt.old 2013-08-06 15:57:03.576285764 +0200 -+++ cmpi-bindings-0.9.5/swig/python/CMakeLists.txt 2013-08-06 15:57:14.891345941 +0200 -@@ -9,7 +9,7 @@ SET (BUILD_SHARED_LIBS ON) - - FIND_PACKAGE(PythonInterp REQUIRED) - --EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_LIB_DIR) -+EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR) - - IF (NOT PYTHON_SITE_DIR) - SET (PYTHON_SITE_DIR ${PYTHON_LIB_DIR}) diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb similarity index 61% rename from meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb rename to meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb index 3b7453536..781dc83da 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb @@ -4,39 +4,31 @@ HOMEPAGE = "http://github.com/kkaempf/cmpi-bindings" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064" SECTION = "Development/Libraries" -DEPENDS = "swig-native python3 sblim-cmpi-devel" +DEPENDS = "swig-native sblim-cmpi-devel python3-setuptools-native" SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=master \ file://cmpi-bindings-0.4.17-no-ruby-perl.patch \ file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \ - file://cmpi-bindings-0.9.5-python-lib-dir.patch \ - file://0001-Modify-cmakelist.patch \ file://0001-Fix-error.patch \ - file://0001-fix-the-build-error-when-python-3.0.patch \ - file://0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch \ - " + " -SRCREV = "62f60e065aa1b901f826e4f530c0573ae32d065e" +SRCREV = "69077ee4d249816ed428155fc933dca424167e77" S = "${WORKDIR}/git" -inherit cmake python3native +inherit cmake python3targetconfig EXTRA_OECMAKE = "-DLIB='${baselib}' \ -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \ -DPYTHON_ABI=${PYTHON_ABI} \ + -DBUILD_PYTHON3=YES \ + -DPython3_SITE_DIR=${PYTHON_SITEPACKAGES_DIR} \ " # With Ninja it fails with: # ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$) OECMAKE_GENERATOR = "Unix Makefiles" -do_configure:prepend() { - export STAGING_LIBDIR=${STAGING_LIBDIR} - export STAGING_INCDIR=${STAGING_INCDIR} - export ENV_INSTALL_PATH=${PYTHON_SITEPACKAGES_DIR} -} - -FILES:${PN} =+"${libdir}/cmpi/libpyCmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*" +FILES:${PN} =+"${libdir}/cmpi/libpy3CmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*" FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so" BBCLASSEXTEND = "native" From patchwork Sun Dec 31 12:23:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37133 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 93470C47258 for ; Sun, 31 Dec 2023 12:23:43 +0000 (UTC) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.groups.io with SMTP id smtpd.web11.218941.1704025420013025452 for ; Sun, 31 Dec 2023 04:23:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YNiQ7udr; spf=pass (domain: gmail.com, ip: 209.85.221.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-33677fb38a3so8183705f8f.0 for ; Sun, 31 Dec 2023 04:23:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025418; x=1704630218; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yefNwaG9lIkB36dVsMrr/Vq0BNaZzPQvK6POGFI7MWs=; b=YNiQ7udr2nvTT9Z9gFajs/ekdYs4+7HFx8STWp2EhmqlzATVm6MdtaFfEvpBJp+jwc unPOdyT2uiTH2U3UCLk9P5xqotFV8QRl/tMONQIQ/OeFTeFCHjzhMtd6KqUTzdtuB39V k3uL8q2/i29HMy9M0J9VLWat03LIadfRVqFr6jgEX/3u+KWjgv+t+xOFqKLbHsvvze2C mA9P00KQNu88dp5b+0oYXBz8AUL97GquisgtUEO+MoQXzGRqRqaluSgrgHEiQwSTcf4V +slrhZSNBccb9HWlTxxCXK9BUz8uCYw/7Jm901tWbHeefvHgUQ/BJgVvlGa12unYqnVB cQBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025418; x=1704630218; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yefNwaG9lIkB36dVsMrr/Vq0BNaZzPQvK6POGFI7MWs=; b=SFFNqnAoRfQpsP6/VO6lEffS5HM2kdho62FbNYAn+IGFVC8h2N2KIRqUiWOHNpPo05 I/sXbdct9nEygQuW/R83MDXeF7fsXoW6/5frLm4LIkwOMfu8mns+3tqN+jMsyY7hRDos KZ+a0H4obcQo6O0LnaqmsiH27p5PMau6/oGRIM5tnvSTR77StOwv4cWQRxuMn/on+FAv NzCJoGWqDqaF049PIr2388b+Neq7yOCbapINl13mZUZ5VwtWWyzXG9tleIKlLPj10sNF 5ejj270Sidm6lYqqc7ngxGfy7D5tYyW91mF7Z1zBR3mSJVvFVb/QfVkldmEnOYSFUWuS 8Aww== X-Gm-Message-State: AOJu0Yz/hVcJ4TO5GZfSOldKbk8VTLG+MBDWn3nFbYcCej5yjaLKzXO0 T25qHgq1FrHDWAaCwtt3++cG+hoVOL4= X-Google-Smtp-Source: AGHT+IEiA/j2ftDptZv7POM6UPg3WyBK+3v4nIuqjlZcMLex2w4dIAo6ZeHvv139/7JguXul2HN4VA== X-Received: by 2002:a5d:5486:0:b0:336:6e1b:9021 with SMTP id h6-20020a5d5486000000b003366e1b9021mr6786449wrv.106.1704025418444; Sun, 31 Dec 2023 04:23:38 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:38 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/23] libpwquality: backport a python 3.12 compatibility patch Date: Sun, 31 Dec 2023 13:23:11 +0100 Message-Id: <20231231122329.405225-5-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107956 This also allows dropping a previous patch. Signed-off-by: Alexander Kanavin --- ...-Use-setuptools-instead-of-distutils.patch | 78 +++++++++++++++++++ ...missing-python-include-dir-for-cross.patch | 43 ---------- .../libpwquality/libpwquality_1.4.5.bb | 6 +- 3 files changed, 81 insertions(+), 46 deletions(-) create mode 100644 meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch delete mode 100644 meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch diff --git a/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch b/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch new file mode 100644 index 000000000..7eaca66b5 --- /dev/null +++ b/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch @@ -0,0 +1,78 @@ +From ad95b7684365dea8335c34527d4c1463c1668af0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Fri, 31 Mar 2023 14:52:19 +0200 +Subject: [PATCH] Use setuptools instead of distutils + +distutils is removed from Python 3.12+: +https://peps.python.org/pep-0632/ + +Upstream-Status: Backport [https://github.com/libpwquality/libpwquality/commit/7b5e0f0097faebdcc6a8b783237bbba7a983147a] +Signed-off-by: Alexander Kanavin +--- + libpwquality.spec.in | 11 ++--------- + python/Makefile.am | 2 +- + python/setup.py.in | 6 +++--- + 3 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/libpwquality.spec.in b/libpwquality.spec.in +index 70a6f53..0809126 100644 +--- a/libpwquality.spec.in ++++ b/libpwquality.spec.in +@@ -33,9 +33,11 @@ BuildRequires: gettext + BuildRequires: pam-devel + %if %{with python2} + BuildRequires: python2-devel ++BuildRequires: python2-setuptools + %endif + %if %{with python3} + BuildRequires: python3-devel ++BuildRequires: python3-setuptools + %endif + + URL: https://github.com/libpwquality/libpwquality/ +@@ -103,15 +105,6 @@ cp -a . %{py3dir} + pushd %{py3dir} + %endif + %if %{with python3} +-# setuptools >= 60 changes the environment to use its bundled copy of distutils +-# by default, not the Python-bundled one. To run the Python's standard library +-# distutils, the environment variable must be set. +-# Although technically setuptools is not needed for this package, if it's +-# pulled by another package, it changes the environment and consequently, +-# the build fails. This was reported in: +-# https://github.com/pypa/setuptools/issues/3143 +-export SETUPTOOLS_USE_DISTUTILS=stdlib +- + %configure \ + --with-securedir=%{_moduledir} \ + --with-pythonsitedir=%{python3_sitearch} \ +diff --git a/python/Makefile.am b/python/Makefile.am +index 1d00c0c..6e51744 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,7 +14,7 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix} + + clean-local: + rm -rf py$(PYTHONREV) +diff --git a/python/setup.py.in b/python/setup.py.in +index a741b91..f934c50 100755 +--- a/python/setup.py.in ++++ b/python/setup.py.in +@@ -6,9 +6,9 @@ + + import os + +-from distutils.core import setup, Extension +-from distutils.command.build_ext import build_ext as _build_ext +-from distutils.command.sdist import sdist as _sdist ++from setuptools import setup, Extension ++from setuptools.command.build_ext import build_ext as _build_ext ++from setuptools.command.sdist import sdist as _sdist + + def genconstants(headerfile, outputfile): + hf = open(headerfile, 'r') diff --git a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch b/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch deleted file mode 100644 index 636b29407..000000000 --- a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1ea09e09ab2387c326bb7170835361ece6e25477 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 3 Aug 2015 13:43:14 +0800 -Subject: [PATCH] setup.py.in: add missing python include dir for cross - compiling - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Hongxu Jia ---- - python/Makefile.am | 2 +- - python/setup.py.in | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/python/Makefile.am b/python/Makefile.am -index 1d00c0c..52816b2 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -14,7 +14,7 @@ all-local: - CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) - - install-exec-local: -- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} -+ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR} - - clean-local: - rm -rf py$(PYTHONREV) -diff --git a/python/setup.py.in b/python/setup.py.in -index a741b91..6759a95 100755 ---- a/python/setup.py.in -+++ b/python/setup.py.in -@@ -33,7 +33,7 @@ class sdist(_sdist): - - pwqmodule = Extension('pwquality', - sources = ['pwquality.c'], -- include_dirs = ['../src'], -+ include_dirs = ['../src', os.path.join(os.environ['STAGING_INCDIR'], os.environ['PYTHON_DIR'])], - library_dirs = ['../src/.libs'], - libraries = ['pwquality']) - --- -2.17.1 - diff --git a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb index 5287430c4..91afedcb6 100644 --- a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb +++ b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb @@ -5,11 +5,11 @@ SECTION = "devel/lib" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2" -DEPENDS = "cracklib" +DEPENDS = "cracklib python3-setuptools-native" SRC_URI = "git://github.com/libpwquality/libpwquality;branch=master;protocol=https \ - file://add-missing-python-include-dir-for-cross.patch \ -" + file://0001-Use-setuptools-instead-of-distutils.patch \ + " SRCREV = "5490e96a3dd6ed7371435ca5b3ccef98bdb48b5a" S = "${WORKDIR}/git" From patchwork Sun Dec 31 12:23:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37131 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 87D74C4707C for ; Sun, 31 Dec 2023 12:23:43 +0000 (UTC) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by mx.groups.io with SMTP id smtpd.web11.218942.1704025420485474894 for ; Sun, 31 Dec 2023 04:23:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=gcxTZm3Z; spf=pass (domain: gmail.com, ip: 209.85.218.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a271a28aeb4so421236266b.2 for ; Sun, 31 Dec 2023 04:23:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025419; x=1704630219; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gElGiaI2qWJZ9lxLPwjndkZeIXhQw/1/m6DM6s02IgM=; b=gcxTZm3ZLskWA3hhY+ovMPmofHwsYNQS7k3dWYOTCj1YkQfsZe5UNeSXp66gmi+nMX eCV3bgINOQm0nfz0zkB7EsekA7lSz+B3AeYnL1IBP3kLUTH4jWNswYH1Wb5l0CGVLEg9 XJRsUVdU+cuUE8aCRJNX/9aImvOrONRhlOBYVweDWP3hqan9nXnR53j6BFpReOzgKfHu +28c3GY8KC+0MSb8Xr4GdmaiyR2y8Xdh2IGEfzjAmwwCTuhFwhgsksVQOqVQQq/CGpEa uPzdViOEjoANav8gX60GN6TEQH7CiGhoB7KNj7lBJQ/9yQD/ASsLlHkPogCoV/GOCBbs domg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025419; x=1704630219; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gElGiaI2qWJZ9lxLPwjndkZeIXhQw/1/m6DM6s02IgM=; b=Wk35cf+mF347PQQmGEG/FEoWgEi45aqTzpmgIfRbMtp843J4lFc5r8xhiLJ8RaCUqG cNurwmg7bNa9ruhuLbxAMqZPLQKSswIY3HXMWQA2XM4wVH8gcJCkAkW9uU8q/nb2FkKk 2amTls46o0FURyVCGccAjtY1TpC8XAW6eN8N2zARwqd+VmyCM7rw7GJPQYzkSBSQtTV7 Zi3EW7zM4nWFsVDpsu6kLcJvxK5I0cIsN6QoNNXK62JxwTWenigOlxcP6OIQYF7mTNGU 3hIpk95sBkJdosaIKQvinw+zcFlukxLMVHZMYWvLXoYIWj7UWNP6zlrivfiI9ITiC+0g WPFw== X-Gm-Message-State: AOJu0Yybcpiz+69nX365rRAlQJM3QaGScbz6TEuIkw9BbN3ghP9c5nZJ f+lS/EP0abDzRMJUfCIJ6BTsWqxgseE= X-Google-Smtp-Source: AGHT+IFBfRt8BnphplbNepxYrMpx+017tgKHczdPOo9XunTr44s26/G3oei9dGqrTOCbQdzooYD9oQ== X-Received: by 2002:a17:906:440a:b0:a27:a507:a179 with SMTP id x10-20020a170906440a00b00a27a507a179mr1302095ejo.83.1704025418997; Sun, 31 Dec 2023 04:23:38 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:38 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/23] mycroft: do not depend on python3-xmlrunner Date: Sun, 31 Dec 2023 13:23:12 +0100 Message-Id: <20231231122329.405225-6-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107957 Nothing in the source tree refers to it. Signed-off-by: Alexander Kanavin --- meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb b/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb index 679789980..444bc1cf3 100644 --- a/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb +++ b/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb @@ -61,7 +61,7 @@ RDEPENDS:${PN} += "python3-requests python3-pillow \ python3-xxhash python3-pako \ python3-six python3-cryptography \ python3-requests-futures \ - python3-xmlrunner python3-fasteners \ + python3-fasteners \ python3-python-vlc \ python3-padatious python3-padaos \ python3-petact python3-precise-runner \ From patchwork Sun Dec 31 12:23:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37129 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 820A3C47079 for ; Sun, 31 Dec 2023 12:23:43 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web10.219013.1704025421311465672 for ; Sun, 31 Dec 2023 04:23:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=KHjpXRNV; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-33678156e27so7502414f8f.1 for ; Sun, 31 Dec 2023 04:23:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025420; x=1704630220; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=04y2Etxsgr6lt1idvWiH5IEEqT3GxxsZZUhecAlm1rA=; b=KHjpXRNVvLnAs6KFEtmKKfJddk/2OU9wun379vudlVyjRTlLpk32tMtphZfPPioE4a jaXuYYy7VVva0hClw23YiA8UiTZJk2TOpk0ScrwZ/Am0GXy/kyMSoywudc9NyAn3aVam Aj5nM8yYtl3fstBZtYJj2VoPWLKn07rKXYMdZ2lKOrPXa/x/gBulbtB8kzqwi43UqFHV x1R0U01KxmE9uBnVJDIeoO7uKIK34iNUzjRm6FPeEdDiWf2J9OQ8HChZeLv/XlJk2/cp 10u1H7j0jrfzlwqXsL2449ULAjeFzlhz9ETrErpOT9rBY7BOUOmKetCK2vE2QZapk4C6 cIug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025420; x=1704630220; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=04y2Etxsgr6lt1idvWiH5IEEqT3GxxsZZUhecAlm1rA=; b=sDMVJZE9QLUT+uBODbb5luTEsLUor5zOYrTHefaOOulXO+fmStXauZUrHDHP7N84sH mF1EQPg9q4feVoTSmUZ0XQ6oYSqLdxTwkWJF90Z0WHhK/UhTqlxt9HfEfJM8QcM9Ga59 ExHqrzD6aJXrP1Co2LW3Uod5+crIQfQ/7tXuWutTvt9NiR+WK2ndqJWhElyJfnTyyOOR wLd6L/A0VpiglXWUXo3O5PmsOUmyE1FtR0hPzbWlin3+VEy4zW1vGap1cWrqk27cAcnZ km+tHDZ+kGA1NNt79VnYYXpKQE9HC7e978n57bP/mTYgdVTY3LzvVwImL6aF7fasVy+U X1cg== X-Gm-Message-State: AOJu0Yxoct8pbq5sZaO27eVqGPtNXnywXDvruPTKXlXfuvAyI7misfKU 3UPks3ITLhme4/9BcabWAJbCWHXOQ6E= X-Google-Smtp-Source: AGHT+IFuZQj2MwQtGr5Kc8p4LGBftTTYoJj++K++mzpfgQVq0iFt44o4B7JRgMEnTg2xY3q/cdljtA== X-Received: by 2002:adf:eb4d:0:b0:337:33a:c86a with SMTP id u13-20020adfeb4d000000b00337033ac86amr3827554wrn.46.1704025419509; Sun, 31 Dec 2023 04:23:39 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:39 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/23] python3-xmlrunner: remove the recipe Date: Sun, 31 Dec 2023 13:23:13 +0100 Message-Id: <20231231122329.405225-7-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107958 Last release in 2014, not compatible with python 3.12. Signed-off-by: Alexander Kanavin --- .../packagegroups/packagegroup-meta-python.bb | 1 - .../python/python3-xmlrunner_1.7.7.bb | 11 ----------- 2 files changed, 12 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 7b7d7bee9..0500ba19e 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -459,7 +459,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-wtforms \ python3-xlrd \ python3-xlsxwriter \ - python3-xmlrunner \ python3-xmltodict \ python3-xmodem \ python3-xstatic \ diff --git a/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb b/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb deleted file mode 100644 index 7259c3fad..000000000 --- a/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "unittest-based test runner with Ant/JUnit like XML reporting" -HOMEPAGE = "https://github.com/pycontribs/xmlrunner" -LICENSE = "LGPL-3.0-only" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=fa964f202b6ae067ed5828fe43c77c1a" - -SRC_URI[md5sum] = "7b0b152ed2d278516aedbc0cac22dfb3" -SRC_URI[sha256sum] = "5a6113d049eca7646111ee657266966e5bbfb0b5ceb2e83ee0772e16d7110f39" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "python3-unittest" From patchwork Sun Dec 31 12:23:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37130 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 6F9A5C47073 for ; Sun, 31 Dec 2023 12:23:43 +0000 (UTC) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.web11.218943.1704025421519499349 for ; Sun, 31 Dec 2023 04:23:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JJ35Ijsr; spf=pass (domain: gmail.com, ip: 209.85.218.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a27cc66d67eso76468666b.2 for ; Sun, 31 Dec 2023 04:23:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025420; x=1704630220; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=scrbgmprLNLAsavBwKZkOZW90dxnS6dg3Ts7cTRBxKw=; b=JJ35IjsrECU0SiltpXCdJHnS/7EBEBxkHYrcT9elxOf8NOyt9IrRRidR/ks2hKHvpQ 5EENJntLGvnUjUObR/hQt9NXFx7S1ux+j6mNswCkaSuRXvVtQCmCrReWWYIBmIUu2jh9 VEMWUDIAP0y5msmg/VMzE5SZPF/2MQPidAvbiEUQ8rDkzOQi/sA+CY2s3or+Q95qzJnb K/5SY1zUG2hmkHg6MpyoBZOvvXeHD3e9EpdMAEiC8YsT0qTrLGftOQivmr8lGfs83Uos AcclrlRMW1WJr5NJxh/f64QEVw/UiYmXYI0zEQyQLnoOeS59bMRmkiKCUdt86F46jnje qScw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025420; x=1704630220; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=scrbgmprLNLAsavBwKZkOZW90dxnS6dg3Ts7cTRBxKw=; b=YjdhadK97hDERQzNXgPgu76MZpCO55dHP2SxSaDhS/2EjYF4te4NaNJX3Kx1cJbuoQ 4NMG+QjdkBZddtDIisfrVK4/qccYpRSw3dpgLSE74ffHRI1at8GHao0mZA28SzO0P+JJ fEztc/WY0pgLL4kl8DtKIMubgLNz0WisU3uc1UiN7BfIFsRxuKviPmnCA03192EW3JAY LpISP8prJJ6DU1iaVd5UQiDnENbYvc4W9PiiDQ1RnJp2VmBDvEEg7soQXQ5XkSN5Y5tC HXDTgCh1qiGrWecE/LTk14FLUlFKD/rXCe3lLt1hkhkaHHXqrRt8byIbALqyxG/JPHGk 4R3g== X-Gm-Message-State: AOJu0Yxxsfpd0b1d9QGRpeYuTtAMtZ+d3SnUs7TW3ulNCL/2gvu/KcSd DsoFxICfdYUbDezkE59LKeGUvyhyCSs= X-Google-Smtp-Source: AGHT+IGdUQYb3t9Ur4reok744W9yx137BFlrajxOmDzsWnzFDKpixINCWJRNT1iyn2E0BLY4Otaoeg== X-Received: by 2002:a17:907:9709:b0:a27:7dd8:5674 with SMTP id jg9-20020a170907970900b00a277dd85674mr2609720ejc.133.1704025419999; Sun, 31 Dec 2023 04:23:39 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:39 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/23] system-config-printer: rely on setuptools to obtain distutils copy Date: Sun, 31 Dec 2023 13:23:14 +0100 Message-Id: <20231231122329.405225-8-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107959 Signed-off-by: Alexander Kanavin --- .../system-config-printer/system-config-printer_1.5.18.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb b/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb index ead875824..cee907884 100644 --- a/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb +++ b/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb @@ -11,7 +11,7 @@ inherit autotools gettext pkgconfig python3native features_check REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -DEPENDS = "cups glib-2.0 libusb xmlto-native desktop-file-utils-native autoconf-archive-native" +DEPENDS = "cups glib-2.0 libusb xmlto-native desktop-file-utils-native autoconf-archive-native python3-setuptools-native" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)}" PACKAGECONFIG[systemd] = ",--without-systemdsystemunitdir,systemd" From patchwork Sun Dec 31 12:23:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37132 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 6F9F5C4707B for ; Sun, 31 Dec 2023 12:23:43 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web11.218944.1704025422060381305 for ; Sun, 31 Dec 2023 04:23:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=OxuVKjBm; spf=pass (domain: gmail.com, ip: 209.85.128.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-40d5b159350so41223005e9.2 for ; Sun, 31 Dec 2023 04:23:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025420; x=1704630220; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=towHQuLyDqvJD+G7pjJB4hOSk1A+0XmK8mqEW9Rn4D4=; b=OxuVKjBm39gq0CSNJ7RVmIxMqqbn4s02srbFWYHIFDfQwAzbqg8YzsAPekRfTA8rXA L1jZLaiZQ86eRp8Xx0jt/TCOViUZTbN99B9G8YtL+t96Sx5N5jZB9Jkg1Vvr12mO+P4Q EOOCEvr/YDZRTOPx7U3JW+yzqBJQNfJov57wNjcb+LsBqx6y2YsWDTiw6z1n5JUMibOx u666ZdjqbwXzryDuyRElMM/ZZ9wW6Gyx6S2ssLfGXL3qbH7vIJi4dT0mBpgdFrGSdMiB sPO33CrQsnbDFKujak3W2kVzPpzKR7Rix6zyC1NMvJRhMnDLhP798+kPWgK0+BoBUrIW wOhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025420; x=1704630220; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=towHQuLyDqvJD+G7pjJB4hOSk1A+0XmK8mqEW9Rn4D4=; b=PAabeqU/aC/vvfrWgW9rThN9FkSLorSQMFZUSFUfxksUAr27iAFB4kaNeuSG6ypHUG HeEEGbDPYiqvMvfI/FKFctCv/v8RsnsHAtpQIdPIaUvaQNmcbWYyQkzJXQuGkEZUAJfU SVhMsKOj44lXrz4QFrh2GfMy58Ufh++2rGLQnzVP4Cklon3epdWBMBXZzNr/WWiFkbxw pjZ0c3D0HdqpjYdFtmvggs7zAKdZ0ri8jjLr4E/IpPXZ/qeyoQjZXPxvVl0w+WHwulsq pjz38/e2tmMmyaXX+P/WYu+yr44F6zDNljpuWbbUh/TOsMB75OXfzEYScxu+aHbb6OGj mdOw== X-Gm-Message-State: AOJu0YxVX/HMYAZdtMKQB+RqlG/rBNVtxGx9xUwh+upq4dINQRCap7dW Q1jVYoLproxNVBGCA4gQYSwELWZsUPU= X-Google-Smtp-Source: AGHT+IH1ciaDzuvi2nzdz0OynZVeDgDRcJUKakly4EDUQTaWAr1dRVujci/fRKutXSmCzw1bNo2dfw== X-Received: by 2002:a05:600c:705:b0:40d:47b5:8e3 with SMTP id i5-20020a05600c070500b0040d47b508e3mr6954849wmn.31.1704025420483; Sun, 31 Dec 2023 04:23:40 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:40 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/23] python3-gmpy2: fix python 3.12 issues Date: Sun, 31 Dec 2023 13:23:15 +0100 Message-Id: <20231231122329.405225-9-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107960 Signed-off-by: Alexander Kanavin --- .../0001-src-fix-python-3.12-builds.patch | 263 ++++++++++++++++++ .../python/python3-gmpy2_2.1.5.bb | 1 + 2 files changed, 264 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch diff --git a/meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch b/meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch new file mode 100644 index 000000000..1171322e2 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch @@ -0,0 +1,263 @@ +From 43f132103cedfd92b85173bcdacfbabd5916d9fc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 27 Dec 2023 14:52:16 +0100 +Subject: [PATCH] src: fix python 3.12 builds + +This is a backport for 3.1.x versions provided separately in https://github.com/aleaxit/gmpy/issues/446 + +Upstream-Status: Inappropriate [can be dropped when 2.2.x is released] + +Signed-off-by: Alexander Kanavin +--- + src/gmpy2_convert.h | 21 +++++++ + src/gmpy2_convert_gmp.c | 129 +++++++++++++------------------------- + src/gmpy2_convert_utils.c | 2 +- + 3 files changed, 65 insertions(+), 87 deletions(-) + +diff --git a/src/gmpy2_convert.h b/src/gmpy2_convert.h +index f887d47..3e8cb2b 100644 +--- a/src/gmpy2_convert.h ++++ b/src/gmpy2_convert.h +@@ -142,6 +142,27 @@ extern "C" { + #define IS_TYPE_COMPLEX_ONLY(x) ((x > OBJ_TYPE_REAL) && \ + (x < OBJ_TYPE_COMPLEX)) + ++/* Compatibility macros (to work with PyLongObject internals). ++ */ ++ ++#if PY_VERSION_HEX >= 0x030C0000 ++# define TAG_FROM_SIGN_AND_SIZE(is_neg, size) ((is_neg?2:(size==0)) | (((size_t)size) << 3)) ++# define _PyLong_SetSignAndDigitCount(obj, is_neg, size) (obj->long_value.lv_tag = TAG_FROM_SIGN_AND_SIZE(is_neg, size)) ++#elif PY_VERSION_HEX >= 0x030900A4 ++# define _PyLong_SetSignAndDigitCount(obj, is_neg, size) (Py_SET_SIZE(obj, (is_neg?-1:1)*size)) ++#else ++# define _PyLong_SetSignAndDigitCount(obj, is_neg, size) (Py_SIZE(obj) = (is_neg?-1:1)*size) ++#endif ++ ++#if PY_VERSION_HEX >= 0x030C0000 ++# define GET_OB_DIGIT(obj) obj->long_value.ob_digit ++# define _PyLong_IsNegative(obj) ((obj->long_value.lv_tag & 3) == 2) ++# define _PyLong_DigitCount(obj) (obj->long_value.lv_tag >> 3) ++#else ++# define GET_OB_DIGIT(obj) obj->ob_digit ++# define _PyLong_IsNegative(obj) (Py_SIZE(obj) < 0) ++# define _PyLong_DigitCount(obj) (_PyLong_IsNegative(obj)? -Py_SIZE(obj):Py_SIZE(obj)) ++#endif + + /* Since the macros are used in gmpy2's codebase, these functions are skipped + * until they are needed for the C API in the future. +diff --git a/src/gmpy2_convert_gmp.c b/src/gmpy2_convert_gmp.c +index cf0891e..8b8df81 100644 +--- a/src/gmpy2_convert_gmp.c ++++ b/src/gmpy2_convert_gmp.c +@@ -59,33 +59,24 @@ GMPy_MPZ_From_PyIntOrLong(PyObject *obj, CTXT_Object *context) + } + #endif + +- switch (Py_SIZE(templong)) { +- case -1: +- mpz_set_si(result->z, -(sdigit)templong->ob_digit[0]); ++ len = _PyLong_DigitCount(templong); ++ negative = _PyLong_IsNegative(templong); ++ ++ switch (len) { ++ case 1: ++ mpz_set_si(result->z, (sdigit)GET_OB_DIGIT(templong)[0]); + break; + case 0: + mpz_set_si(result->z, 0); + break; +- case 1: +- mpz_set_si(result->z, templong->ob_digit[0]); +- break; + default: +- mpz_set_si(result->z, 0); +- +- if (Py_SIZE(templong) < 0) { +- len = - Py_SIZE(templong); +- negative = 1; +- } else { +- len = Py_SIZE(templong); +- negative = 0; +- } +- +- mpz_import(result->z, len, -1, sizeof(templong->ob_digit[0]), 0, +- sizeof(templong->ob_digit[0])*8 - PyLong_SHIFT, templong->ob_digit); ++ mpz_import(result->z, len, -1, sizeof(GET_OB_DIGIT(templong)[0]), 0, ++ sizeof(GET_OB_DIGIT(templong)[0])*8 - PyLong_SHIFT, ++ GET_OB_DIGIT(templong)); ++ } + +- if (negative) { +- mpz_neg(result->z, result->z); +- } ++ if (negative) { ++ mpz_neg(result->z, result->z); + } + return result; + } +@@ -105,33 +96,24 @@ mpz_set_PyIntOrLong(mpz_t z, PyObject *obj) + } + #endif + +- switch (Py_SIZE(templong)) { +- case -1: +- mpz_set_si(z, -(sdigit)templong->ob_digit[0]); ++ len = _PyLong_DigitCount(templong); ++ negative = _PyLong_IsNegative(templong); ++ ++ switch (len) { ++ case 1: ++ mpz_set_si(z, (sdigit)GET_OB_DIGIT(templong)[0]); + break; + case 0: + mpz_set_si(z, 0); + break; +- case 1: +- mpz_set_si(z, templong->ob_digit[0]); +- break; + default: +- mpz_set_si(z, 0); +- +- if (Py_SIZE(templong) < 0) { +- len = - Py_SIZE(templong); +- negative = 1; +- } else { +- len = Py_SIZE(templong); +- negative = 0; +- } +- +- mpz_import(z, len, -1, sizeof(templong->ob_digit[0]), 0, +- sizeof(templong->ob_digit[0])*8 - PyLong_SHIFT, templong->ob_digit); ++ mpz_import(z, len, -1, sizeof(GET_OB_DIGIT(templong)[0]), 0, ++ sizeof(GET_OB_DIGIT(templong)[0])*8 - PyLong_SHIFT, ++ GET_OB_DIGIT(templong)); ++ } + +- if (negative) { +- mpz_neg(z, z); +- } ++ if (negative) { ++ mpz_neg(z, z); + } + return; + } +@@ -186,12 +168,7 @@ GMPy_PyLong_From_MPZ(MPZ_Object *obj, CTXT_Object *context) + + /* Assume gmp uses limbs as least as large as the builtin longs do */ + +- if (mpz_sgn(obj->z) < 0) { +- negative = 1; +- } else { +- negative = 0; +- } +- ++ negative = mpz_sgn(obj->z) < 0; + size = (mpz_sizeinbase(obj->z, 2) + PyLong_SHIFT - 1) / PyLong_SHIFT; + + if (!(result = _PyLong_New(size))) { +@@ -200,31 +177,20 @@ GMPy_PyLong_From_MPZ(MPZ_Object *obj, CTXT_Object *context) + /* LCOV_EXCL_STOP */ + } + +- mpz_export(result->ob_digit, &count, -1, sizeof(result->ob_digit[0]), 0, +- sizeof(result->ob_digit[0])*8 - PyLong_SHIFT, obj->z); ++ mpz_export(GET_OB_DIGIT(result), &count, -1, sizeof(GET_OB_DIGIT(result)[0]), 0, ++ sizeof(GET_OB_DIGIT(result)[0])*8 - PyLong_SHIFT, obj->z); + + if (count == 0) { +- result->ob_digit[0] = 0; ++ GET_OB_DIGIT(result)[0] = 0; + } + + /* long_normalize() is file-static so we must reimplement it */ + /* longobjp = long_normalize(longobjp); */ +- while ((size>0) && (result->ob_digit[size-1] == 0)) { ++ while ((size>0) && (GET_OB_DIGIT(result)[size-1] == 0)) { + size--; + } +-#if PY_VERSION_HEX >= 0x030900A4 +- Py_SET_SIZE(result, size); +-#else +- Py_SIZE(result) = size; +-#endif + +- if (negative) { +-#if PY_VERSION_HEX >= 0x030900A4 +- Py_SET_SIZE(result, - Py_SIZE(result)); +-#else +- Py_SIZE(result) = - Py_SIZE(result); +-#endif +- } ++ _PyLong_SetSignAndDigitCount(result, negative, size); + return (PyObject*)result; + } + +@@ -476,33 +442,24 @@ GMPy_XMPZ_From_PyIntOrLong(PyObject *obj, CTXT_Object *context) + } + #endif + +- switch (Py_SIZE(templong)) { +- case -1: +- mpz_set_si(result->z, -(sdigit)templong->ob_digit[0]); ++ len = _PyLong_DigitCount(templong); ++ negative = _PyLong_IsNegative(templong); ++ ++ switch (len) { ++ case 1: ++ mpz_set_si(result->z, (sdigit)GET_OB_DIGIT(templong)[0]); + break; + case 0: + mpz_set_si(result->z, 0); + break; +- case 1: +- mpz_set_si(result->z, templong->ob_digit[0]); +- break; + default: +- mpz_set_si(result->z, 0); +- +- if (Py_SIZE(templong) < 0) { +- len = - Py_SIZE(templong); +- negative = 1; +- } else { +- len = Py_SIZE(templong); +- negative = 0; +- } +- +- mpz_import(result->z, len, -1, sizeof(templong->ob_digit[0]), 0, +- sizeof(templong->ob_digit[0])*8 - PyLong_SHIFT, templong->ob_digit); ++ mpz_import(result->z, len, -1, sizeof(GET_OB_DIGIT(templong)[0]), 0, ++ sizeof(GET_OB_DIGIT(templong)[0])*8 - PyLong_SHIFT, ++ GET_OB_DIGIT(templong)); ++ } + +- if (negative) { +- mpz_neg(result->z, result->z); +- } ++ if (negative) { ++ mpz_neg(result->z, result->z); + } + return result; + } +@@ -639,7 +596,7 @@ GMPy_MPQ_From_PyStr(PyObject *s, int base, CTXT_Object *context) + } + + cp = PyBytes_AsString(ascii_str); +- ++ + { + char *whereslash = strchr((char*)cp, '/'); + char *wheredot = strchr((char*)cp, '.'); +diff --git a/src/gmpy2_convert_utils.c b/src/gmpy2_convert_utils.c +index d676eaf..8908d17 100644 +--- a/src/gmpy2_convert_utils.c ++++ b/src/gmpy2_convert_utils.c +@@ -123,7 +123,7 @@ static unsigned long + GMPy_Integer_AsUnsignedLongWithType_v2(PyObject *x, int xtype) + { + if IS_TYPE_PyInteger(xtype) { +- if (Py_SIZE(x) < 0) { ++ if (_PyLong_IsNegative(((PyLongObject*)x))) { + VALUE_ERROR("n must be > 0"); + return (unsigned long)-1; + } diff --git a/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb b/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb index 9a66af9a9..d9e9bd50e 100644 --- a/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb +++ b/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb @@ -10,5 +10,6 @@ PYPI_PACKAGE = "gmpy2" SRC_URI[sha256sum] = "bc297f1fd8c377ae67a4f493fc0f926e5d1b157e5c342e30a4d84dc7b9f95d96" inherit pypi setuptools3 python3native +SRC_URI += "file://0001-src-fix-python-3.12-builds.patch" BBCLASSEXTEND = "native nativesdk" From patchwork Sun Dec 31 12:23:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37128 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 5DCCDC47077 for ; Sun, 31 Dec 2023 12:23:43 +0000 (UTC) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by mx.groups.io with SMTP id smtpd.web10.219017.1704025422777062751 for ; Sun, 31 Dec 2023 04:23:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eE8hta8Y; spf=pass (domain: gmail.com, ip: 209.85.218.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a2339262835so830872266b.3 for ; Sun, 31 Dec 2023 04:23:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025421; x=1704630221; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KzbfHap1veE+augwRU6aJUT/4hO0qm223icoe6tZN4c=; b=eE8hta8YeosIERUAkMKuQRKutePREZWUUdlzYGDGcOtQ0ViULx+290VNRyDAsSRKK/ Qxay+Syp2afAQDdvcb81LUZ+e/7pHbkGmkmbB8zOLtBMXmsXdJTKldOlXCS6HqZHBr+g sqGSlU0lEEbKsYx2YGb5uNJ0Ji3ePF3Q4ksTa4zw+U0R6dPLVmWiD8dRWBsIkWWKz7A+ gWay5KTr7MAeMv7TWBTZLQA0afkgt48ns9rzFddR2hDq28B8SGu/9Yf8M5uwYQU4+Q38 QOERldpFAmr9Zo/dMBSbNZv1j8MMs5XgsfhaIEuU8FJbVb1qmEAKw3DBmSoaRT/izpCm 5Y0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025421; x=1704630221; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KzbfHap1veE+augwRU6aJUT/4hO0qm223icoe6tZN4c=; b=s4/8yM6F4QTPVXzZTPclzsoMSpCat+MfH5Z9Xf2F/KqA122NXfhyTNpaAgUH7VppDo dy6cP2mcQD+h5nM6iSxO4AIya0cNg1OkV2PhgxP/uNq1luGCBo+gnPlWWwhgzgdlPrS0 FBSK1izkd9r1Tie+dMtZ3GnKHH83bT7Odj3hhU9KZSKdoBYk0+G9Mm4Q7SdSA3haroeD amYWaKwwAliwbc+7FJoOjgC7DSMEFA453pZhnGtM3h9hkvfJTlRb1mwDnpSq5YTIecSn dyrEDpn0Q03mW5zddyFi5Krp6X+8OAvdB5Z4J6g3VobFlIuBXOa5+cgdgV/uit3PrxJW NwoA== X-Gm-Message-State: AOJu0Yzo7t560drvtNAa5opgMensKqbLTqOHveneLstt/padLVzUOwRT yQOvr1YGoRC5bmg5zi7b0RkZK2Lt5OA= X-Google-Smtp-Source: AGHT+IH9V1iXunt0G+OxMIKSuFI6eaj+otffdQg94GEZ1Ap/NGO8lOY6C4CvGXj8qk+RizFjepj+Pw== X-Received: by 2002:a17:906:bc88:b0:a27:fe31:ad84 with SMTP id lv8-20020a170906bc8800b00a27fe31ad84mr139813ejb.15.1704025421024; Sun, 31 Dec 2023 04:23:41 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:40 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/23] python3-custom-inherit: fix python 3.12 builds Date: Sun, 31 Dec 2023 13:23:16 +0100 Message-Id: <20231231122329.405225-10-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107961 Signed-off-by: Alexander Kanavin --- ...oneer.py-do-not-use-SafeConfigParser.patch | 29 +++++++++++++++++++ .../python/python3-custom-inherit_2.4.1.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta-python/recipes-devtools/python/files/0001-versioneer.py-do-not-use-SafeConfigParser.patch diff --git a/meta-python/recipes-devtools/python/files/0001-versioneer.py-do-not-use-SafeConfigParser.patch b/meta-python/recipes-devtools/python/files/0001-versioneer.py-do-not-use-SafeConfigParser.patch new file mode 100644 index 000000000..34caaca98 --- /dev/null +++ b/meta-python/recipes-devtools/python/files/0001-versioneer.py-do-not-use-SafeConfigParser.patch @@ -0,0 +1,29 @@ +From 0920bd21ceab75bc4b655c571a37835526dd2468 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 27 Dec 2023 15:12:19 +0100 +Subject: [PATCH] versioneer.py: do not use SafeConfigParser + +This has been deprecated for a long time, and finally removed in python 3.12 + +Upstream-Status: Submitted [https://github.com/rsokl/custom_inherit/pull/49] +Signed-off-by: Alexander Kanavin +--- + versioneer.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/versioneer.py b/versioneer.py +index 64fea1c..3aa5da3 100644 +--- a/versioneer.py ++++ b/versioneer.py +@@ -339,9 +339,9 @@ def get_config_from_root(root): + # configparser.NoOptionError (if it lacks "VCS="). See the docstring at + # the top of versioneer.py for instructions on writing your setup.cfg . + setup_cfg = os.path.join(root, "setup.cfg") +- parser = configparser.SafeConfigParser() ++ parser = configparser.ConfigParser() + with open(setup_cfg, "r") as f: +- parser.readfp(f) ++ parser.read_file(f) + VCS = parser.get("versioneer", "VCS") # mandatory + + def get(parser, name): diff --git a/meta-python/recipes-devtools/python/python3-custom-inherit_2.4.1.bb b/meta-python/recipes-devtools/python/python3-custom-inherit_2.4.1.bb index 478abbf1f..e7409f77e 100644 --- a/meta-python/recipes-devtools/python/python3-custom-inherit_2.4.1.bb +++ b/meta-python/recipes-devtools/python/python3-custom-inherit_2.4.1.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f910a85a4c3da51edf780f17a7608434" PYPI_PACKAGE = "custom_inherit" +SRC_URI += "file://0001-versioneer.py-do-not-use-SafeConfigParser.patch" SRC_URI[sha256sum] = "7052eb337bcce83551815264391cc4efc2bf70b295a3c52aba64f1ab57c3a8a2" inherit pypi setuptools3 From patchwork Sun Dec 31 12:23:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37138 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 A70DFC3DA6E for ; Sun, 31 Dec 2023 12:23:53 +0000 (UTC) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.web11.218945.1704025423395183325 for ; Sun, 31 Dec 2023 04:23:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VFzpaDvx; spf=pass (domain: gmail.com, ip: 209.85.218.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a28005f9b9cso8335466b.3 for ; Sun, 31 Dec 2023 04:23:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025422; x=1704630222; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GsdV/Ju/Bx0eq9Jzd0ylEGBjR+NLOAXneLFS69sGf+g=; b=VFzpaDvxLSdRFsvCc4vMOYQ1vx9Uqm5GDJRP45aIvecYm1jKfi6muQtoG4fso21fGu PGuCemHujPQReR+kIXonwulZ3uGMBIfMa0LnWH8ZTg3zAslI9G3NYHEH6dgK7JUEvV/E c/a8caiv2cEdo/xxhEb2Y8xnkptwZNiO79EQhOwqC6wM1Dh7okqKa999d+EuO0IqIBTP FGJKr3EOPpqsykQ2LJ39ADc6WZkIWUVMToUc78Ee243DPbTCSsked6rWiA7Oph7/MOjI hJ3Z5C5+etGwKbPAGJlsXMy5FGGSN7qwK3htJpdWyqTu8eIvrZATetMYO743sah9ZuBE wx1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025422; x=1704630222; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GsdV/Ju/Bx0eq9Jzd0ylEGBjR+NLOAXneLFS69sGf+g=; b=iz28MaT7weUe+4l85WJm2MJ1gE9PbnVvxrCJoQGku84hzZrvVgb5IC4mzfZf5Sgk6N p1oowbsCTftXPpzuelWfV60KI5dRAY6qtobyJirOJuo5t4/qmYjRBmvfJJtnYFBDImpp /6OZiXPDqU+okVW1b4tXTj+lI2rWSlRVrdT985irDQlnLBlWye6JRQtg2eOVTS2dfTm2 2N/I2UgjYvg630+YcbHOk3hILxJfYeRJWVEj3rGrNJP0Zb+w7n8vXhF+SagaGxP80QmZ 4mJjkG0FQfhWetVhF7spmADstb30PuxU4cBr2D8FThcnHWACukW8qPz4F6AU78LPUrGz 6Njg== X-Gm-Message-State: AOJu0YxeKRW3NKEqlhGNYZuOpZVm3CHOxSjdkon3hinQxzMR0EGV+YTO 8xzs2JpEqHvHu4FCcezmLMEDzgf8NR4= X-Google-Smtp-Source: AGHT+IEd3d37Dh3kd9hwcxE+iOTUa47dyTM3ZHjfrBKVB0dg2/KeljcX6ezRItareTqAr/rvuf4O5g== X-Received: by 2002:a17:906:f910:b0:a26:965a:e866 with SMTP id lc16-20020a170906f91000b00a26965ae866mr7340826ejb.111.1704025421874; Sun, 31 Dec 2023 04:23:41 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:41 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/23] python3-jsonrpcserver: remove Date: Sun, 31 Dec 2023 13:23:17 +0100 Message-Id: <20231231122329.405225-11-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107962 No activity in over a year, and depends on oslash, which has had no activity since 2020. Signed-off-by: Alexander Kanavin --- .../packagegroups/packagegroup-meta-python.bb | 1 - .../python/python3-jsonrpcserver_5.0.9.bb | 23 ------------------- 2 files changed, 24 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.9.bb diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 0500ba19e..32e962aff 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -210,7 +210,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-jsonpath-rw \ python3-jsonpointer \ python3-jsonref \ - python3-jsonrpcserver \ python3-jsonschema \ python3-jstyleson \ python3-kconfiglib \ diff --git a/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.9.bb b/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.9.bb deleted file mode 100644 index 7e058a757..000000000 --- a/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.9.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Library to process JSON-RPC requests" -HOMEPAGE = "https://github.com/explodinglabs/jsonrpcserver" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=61b63ea9d36f6fb63ddaaaac8265304f" - -SRC_URI[sha256sum] = "a71fb2cfa18541c80935f60987f92755d94d74141248c7438847b96eee5c4482" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "\ - python3-apply-defaults \ - python3-asyncio \ - python3-core \ - python3-json \ - python3-jsonschema \ - python3-logging \ - python3-netclient \ - python3-pkgutil \ - python3-oslash \ - python3-typing-extensions \ -" - -BBCLASSEXTEND = "native nativesdk" From patchwork Sun Dec 31 12:23:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37146 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 207F4C47DA7 for ; Sun, 31 Dec 2023 12:23:54 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web10.219018.1704025423954037436 for ; Sun, 31 Dec 2023 04:23:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=J/mPNdOu; spf=pass (domain: gmail.com, ip: 209.85.221.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-336990fb8fbso6124411f8f.1 for ; Sun, 31 Dec 2023 04:23:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025422; x=1704630222; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oerWq5SmqQlOWWaqgscfKMORokw64bY7pPeIAgpfkGk=; b=J/mPNdOu/aCqoEfbqBIiJAHPKpvBInK/r+aIflNpdQaI5j0e+ymNg5hQK57J+meS9z lVKAe5TvZ5DYonZXQ7K+0oJgViDHzpxrRQvn554KTShIS7OisGChOI0tFA01xFm+M7oN 8wAH3sqg1Tlrm353Pq4ZIjgew7gkhC556G2GBR4Jz0EDtbAK52jiN3AjIOZRuLh4LLRf PQsQNa8y4dl+tqqJDyvJvCl1M24uHg6W3cLwBMxFZtRzMlYwZE0Dpi8yO/FoL7dpTp+3 rg0UcQOcF0h229dxi3aIi3q93tVT3xjcCVTGIyc5a9+R3IK3d+5NOrMZ8Xrv73IearE4 safw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025422; x=1704630222; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oerWq5SmqQlOWWaqgscfKMORokw64bY7pPeIAgpfkGk=; b=KUva7t2EzmanTtn3GcfKXU/XYVurFOtnculDm5KwuvJkbpmFQJqYUrRODIZnvEPutQ if8Xbqhm+VmkTBueUJs4wELor/OJ02yCWvJE98z4Z+9xy1mrR1mJLbUZfFlJEmENhevz mAHYFG0SZht6Fohqwfit9ZYCFTDejm8SOgPrmLRVHWUa5mXh9Us/5yyhXt/82lVFe1Tp EJi7lHiBYChpDFwTefl4KxPh4hrBzMmptj2OP1+FbJzqdoXpQJxWSrpsUQWxQ9sEXkPM YQkq+OXe1f/N8T7yS8c7rnb4PgpKhYOdQNbALms/bkVjqN/BghNdFPFmcD/65DF66Kfw EecA== X-Gm-Message-State: AOJu0YyL9OU6wqrCnsxfZAl1tnQpPRTx1+BxR2155R8WaknxrNi/11qB dCsfbvDwDUlY9Q60R3+58fGxY1SsH0o= X-Google-Smtp-Source: AGHT+IG4lqA86wH2FGvr7SuWQ7sOvUbLzrMDzzqEDhqtV06BA4qO4fRHw5d9kbVw2NED9BEvsbMJ2g== X-Received: by 2002:a05:6000:1ac5:b0:337:400c:eb75 with SMTP id i5-20020a0560001ac500b00337400ceb75mr116136wry.94.1704025422449; Sun, 31 Dec 2023 04:23:42 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:42 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/23] python3-oslash: remove Date: Sun, 31 Dec 2023 13:23:18 +0100 Message-Id: <20231231122329.405225-12-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107963 Not compatible with python 3.12; dead upstream (no activity since 2020). Signed-off-by: Alexander Kanavin --- .../python/python3-oslash_0.6.3.bb | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb diff --git a/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb b/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb deleted file mode 100644 index b926484db..000000000 --- a/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Functors, Applicatives, And Monads in Python" -HOMEPAGE = "https://github.com/dbrattli/oslash" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.md;md5=ed79d2637878dfe97de89e357b5c02dd" - -DEPENDS += "\ - ${PYTHON_PN}-pip-native \ - ${PYTHON_PN}-pytest-runner-native\ -" - -SRC_URI[sha256sum] = "868aeb58a656f2ed3b73d9dd6abe387b20b74fc9413d3e8653b615b15bf728f3" - -PYPI_PACKAGE = "OSlash" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - python3-json \ - python3-typing-extensions \ -" - -BBCLASSEXTEND = "native nativesdk" From patchwork Sun Dec 31 12:23:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37147 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 13CA2C47DA2 for ; Sun, 31 Dec 2023 12:23:54 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web10.219019.1704025424607626446 for ; Sun, 31 Dec 2023 04:23:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=gTtNFzUJ; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a269a271b5bso896708666b.1 for ; Sun, 31 Dec 2023 04:23:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025423; x=1704630223; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VJ0Nrnk83DBgxBbOa3bt0C1mDfhyB2bZ5zgYIxDFINY=; b=gTtNFzUJhSHG7zFJaK+R2MqOyGQYvEeQuvj4wpGqsFdhV9JmUgV6QxAPKS8to8mgLS mx3+dIvNfKLuFKYZD2NGfr7ZDegVh3arrkmB5JWU99T5TH/fn8q4oW0F3RqoRPt0YefL s6UG2nojD5rPdQp71PmvtgpUVnHP73Ui0IDiZtk4L3fvZBJP5IzbV6o2i7inEZf0hl7M qdGbEV9zWaHQVNmyYsXX5n1pBBtoqn7rg7ruIMYHPLRZ/bQlw/WRJ1nR8gkdWQbe2xW9 Y1VM+KSjzP4bReWSl+AqVlLx+FRCcvyjXbtVVokNG1Va+HRj4Fn4/qqL+BbS66bLCupO oU2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025423; x=1704630223; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VJ0Nrnk83DBgxBbOa3bt0C1mDfhyB2bZ5zgYIxDFINY=; b=SjU2t3Ok61sNwblHUcNVr0uBGgC6zRMBbI0y1IzOi6Q4s5BgMq5LSYTkmZY3djkMOz 29V6TFKCTCJdQf3/5KNNwZH7E4y8rfOUWGkOeb3sRsVx5bqtHDTkSLID0jLXMhsoESh6 Hl4IrtabFXiFftgxvxHKGrjxh7jyluP4+3yb2IGmBT09Qer2js2VbkBaWjakBWHfAJMw ljb4Gbp1HfT6KUKAR3W0UNrud7PtKkTgVcDjKJkrbqV/ZkjSVS3DrZ9NfrFArLofqm88 dVX+QyiQ4AKW8iCR75EQ6c9WR05gwFObZ3LolBZG7he1zI9W76lLIZT5yaVaH7hklr6m AReQ== X-Gm-Message-State: AOJu0YxCIu7+DHdk7r+YuWqGuMCcUHxRwJ2Pt1oX9yE0j/lcAiznifmn a9PYrW1MOkgGuPTeR7dmt/VkBEA8OX8= X-Google-Smtp-Source: AGHT+IEzfIRIKflXEy1hGb6Hplv+hcUv8g+xTV+GK2u3b7827cHqA/mhFR9BjXmSGEfHkBEvVo1uaA== X-Received: by 2002:a17:906:4a54:b0:a27:9887:c497 with SMTP id a20-20020a1709064a5400b00a279887c497mr1657978ejv.42.1704025422939; Sun, 31 Dec 2023 04:23:42 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:42 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/23] nmap: disable ndiff Date: Sun, 31 Dec 2023 13:23:19 +0100 Message-Id: <20231231122329.405225-13-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107964 In 7.80 this requires distutils (no longer provided in python 3.12). This may be resolved in newer nmap versions, so if you care about it please provide a version update: https://nmap.org/dist/ Signed-off-by: Alexander Kanavin --- meta-oe/recipes-security/nmap/nmap_7.80.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-security/nmap/nmap_7.80.bb b/meta-oe/recipes-security/nmap/nmap_7.80.bb index 52c62cde3..f9fe82a91 100644 --- a/meta-oe/recipes-security/nmap/nmap_7.80.bb +++ b/meta-oe/recipes-security/nmap/nmap_7.80.bb @@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4 inherit autotools-brokensep pkgconfig python3native -PACKAGECONFIG ?= "ncat nping ndiff pcap" +PACKAGECONFIG ?= "ncat nping pcap" PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap" PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre" From patchwork Sun Dec 31 12:23:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37149 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 0A85BC47DA6 for ; Sun, 31 Dec 2023 12:23:54 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web10.219020.1704025425183613649 for ; Sun, 31 Dec 2023 04:23:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XFoYkFBM; spf=pass (domain: gmail.com, ip: 209.85.128.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-40d2376db79so74656185e9.0 for ; Sun, 31 Dec 2023 04:23:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025423; x=1704630223; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1K1aN5nEeqluZMJH3FgcW0ri+CS0e/nL5BWJhZDCKEM=; b=XFoYkFBMpGRd5Q1nLr/qiIQRH1+h01qFLYQeEZwcwxS4RzVJoLE4Z5cvNpvLasN6JT Od2RULh0YWaRycAMiJPfrRnIO21s5kZWhyRMGXDAAoPHVG8W/bbOR9OyD738i2/lKXR1 mIYTy3RHO3lyEeTkxrSi9G6YzD4GlRlfXP2ErAJbaYZsByvJKQnoHHicGrFIaoesGwAA r98CHdywP/zW8Hzwl+gK3PeCVbqQwSlRW0bLkJvixx5kjeTMXQ2n5SQtr2n9gMRdfL66 xDGwV3P1uxInEZrlrpP/erdnFy2n88nvEKGdbpfuvjqor3dGySOyH4Le25ZiVHf3ypey Hs9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025423; x=1704630223; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1K1aN5nEeqluZMJH3FgcW0ri+CS0e/nL5BWJhZDCKEM=; b=MTEXAkS+rTv7ZFaFtmepU1P1rs0WmEGYYstxR4JfSvgHx+wF6ZQnaDkBR6cm5PgVvw FeGKOt1u3B6pKW0N5wYR6R0XkFEh/b6kCDowRke+f/XRqnK0KZthu2ZjZZgg8YVmgb/v jDApHybjsUAVKjMOytAbLzr5vEqFAjUj/oGdgI2OGKw1/PP78IHt5FseN5QwWBVBvE2w K0UZ+/z2TVenEQNygB7IXvzKKHfPm8FX/X3svrWlkcvKKYghh8ANf0E8OcOM4zDcH7sE Xl94Tu0SMfNqRlKWSerajbP2a+8/VwQpQKEDZII3odgOKtjBZ+ZkSH3l516oEu/OyNgf CqaQ== X-Gm-Message-State: AOJu0YySzUAVNW2BuBQdj92iGX6Z9tAIMj971uNQjdMGqIPFRg1KuGvR PSVka5pqqeMezAKTAv+OVwNodBX0O4M= X-Google-Smtp-Source: AGHT+IE1IbthaQSG12lSQQ4Xdu7gNJWrAxHFdNVYBuN9Bw/jfCjcfZVe7+q4s+TfKcXPIy4XheoRSw== X-Received: by 2002:a05:600c:3516:b0:40d:8812:2aa6 with SMTP id h22-20020a05600c351600b0040d88122aa6mr261378wmq.36.1704025423546; Sun, 31 Dec 2023 04:23:43 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:43 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 14/23] wireshark: update 4.0.10 -> 4.2.0 Date: Sun, 31 Dec 2023 13:23:20 +0100 Message-Id: <20231231122329.405225-14-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107965 This resolves python 3.12 issues. Signed-off-by: Alexander Kanavin --- ...-a-try_run-test-when-cross-compiling.patch | 66 -------------- ...-do-not-use-lemon-data-from-the-host.patch | 32 +++++++ ...ireshark-src-improve-reproducibility.patch | 16 ++-- .../0002-flex-Remove-line-directives.patch | 14 ++- .../0004-lemon-Remove-line-directives.patch | 87 +++++-------------- ...wireshark_4.0.10.bb => wireshark_4.2.0.bb} | 6 +- 6 files changed, 73 insertions(+), 148 deletions(-) delete mode 100644 meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch create mode 100644 meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch rename meta-networking/recipes-support/wireshark/{wireshark_4.0.10.bb => wireshark_4.2.0.bb} (94%) diff --git a/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch b/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch deleted file mode 100644 index 0d51ce1b8..000000000 --- a/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b4f29807225cf3744c2f4f971902fbdd7486fc19 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= -Date: Fri, 26 May 2023 13:29:23 +0100 -Subject: [PATCH] CMake: Fix a try_run() test when cross-compiling - -Upstream-Status: Backport -Signed-off-by: Armin Kuster - ---- - ConfigureChecks.cmake | 36 ++++++++++++++++++++---------------- - 1 file changed, 20 insertions(+), 16 deletions(-) - -diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake -index dd8268e077..d8bca54115 100644 ---- a/ConfigureChecks.cmake -+++ b/ConfigureChecks.cmake -@@ -122,26 +122,30 @@ check_type_size("ssize_t" SSIZE_T) - # Check if the libc vsnprintf() conforms to C99. If this fails we may - # need to fall-back on GLib I/O. - # --check_c_source_runs(" -- #include -- int main(void) -- { -- /* Check that snprintf() and vsnprintf() don't return -- * -1 if the buffer is too small. C99 says this value -- * is the length that would be written not including -- * the nul byte. */ -- char buf[3]; -- return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1; -- }" -- HAVE_C99_VSNPRINTF --) --if (NOT HAVE_C99_VSNPRINTF) -- message(FATAL_ERROR -+# If cross-compiling we can't check so just assume this requirement is met. -+# -+if(NOT CMAKE_CROSSCOMPILING) -+ check_c_source_runs(" -+ #include -+ int main(void) -+ { -+ /* Check that snprintf() and vsnprintf() don't return -+ * -1 if the buffer is too small. C99 says this value -+ * is the length that would be written not including -+ * the nul byte. */ -+ char buf[3]; -+ return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1; -+ }" -+ HAVE_C99_VSNPRINTF -+ ) -+ if (NOT HAVE_C99_VSNPRINTF) -+ message(FATAL_ERROR - "Building Wireshark requires a C99 compliant vsnprintf() and this \ - target does not meet that requirement. Compiling for ${CMAKE_SYSTEM} \ - using ${CMAKE_C_COMPILER_ID}. Please report this issue to the Wireshark \ - developers at wireshark-dev@wireshark.org." -- ) -+ ) -+ endif() - endif() - - # --- -2.25.1 - diff --git a/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch b/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch new file mode 100644 index 000000000..1903f38f5 --- /dev/null +++ b/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch @@ -0,0 +1,32 @@ +From 802d3cafa888b36aa72007d48232a010dbb0231d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 27 Dec 2023 16:57:28 +0100 +Subject: [PATCH] UseLemon.cmake: do not use lemon data from the host + +We use native lemon, and not the host one, so +the data should be taken from the source tree as well. + +Upstream-Status: Inappropriate [cross-specific] +Signed-off-by: Alexander Kanavin +--- + cmake/modules/UseLemon.cmake | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake +index fa4034e..83a7ca3 100644 +--- a/cmake/modules/UseLemon.cmake ++++ b/cmake/modules/UseLemon.cmake +@@ -13,11 +13,12 @@ if(LEMON_EXECUTABLE) + ${_out}.out + COMMAND ${LEMON_EXECUTABLE} + -l +- -T/usr/share/lemon/lempar.c ++ -T${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c + -d. + ${_in} + DEPENDS + ${_in} ++ ${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c + ) + endmacro() + add_custom_target(lemon) diff --git a/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch b/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch index 6ad8a62c2..202de6260 100644 --- a/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch +++ b/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch @@ -1,4 +1,4 @@ -From 0a9ab056ce7582033a21d6bc541ece520bf2b0b6 Mon Sep 17 00:00:00 2001 +From d9c4cdad0c48becab491ea4e80e5cd81f7d1dc97 Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy Date: Thu, 26 Nov 2020 05:38:31 -0800 Subject: [PATCH] wireshark-src: improve reproducibility @@ -8,15 +8,15 @@ comments. Upstream-Status: Pending Signed-off-by: Oleksiy Obitotskyy + --- - tools/make-plugin-reg.py | 2 +- - tools/ncp2222.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + tools/ncp2222.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: wireshark-4.0.6/tools/ncp2222.py -=================================================================== ---- wireshark-4.0.6.orig/tools/ncp2222.py -+++ wireshark-4.0.6/tools/ncp2222.py +diff --git a/tools/ncp2222.py b/tools/ncp2222.py +index f14d0c5..05073b9 100755 +--- a/tools/ncp2222.py ++++ b/tools/ncp2222.py @@ -5891,7 +5891,7 @@ def produce_code(): print("/*") diff --git a/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch b/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch index 069b5793d..0e6249c93 100644 --- a/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch +++ b/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch @@ -1,4 +1,4 @@ -From 3e571e24c730f747d18ed02ba7451e9e00480fc7 Mon Sep 17 00:00:00 2001 +From e4e88c2f55286cf24af230b265d0e059363baa6c Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy Date: Thu, 26 Nov 2020 12:00:43 -0800 Subject: [PATCH] flex: Remove #line directives @@ -8,12 +8,13 @@ generate #line directives with absolute file patch. Upstream-Status: Pending Signed-off-by: Oleksiy Obitotskyy + --- cmake/modules/FindLEX.cmake | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake -index 0008bc4..ec68f84 100644 +index 20caa09..174f452 100644 --- a/cmake/modules/FindLEX.cmake +++ b/cmake/modules/FindLEX.cmake @@ -32,11 +32,19 @@ MACRO(ADD_LEX_FILES _source _generated) @@ -22,25 +23,22 @@ index 0008bc4..ec68f84 100644 - ADD_CUSTOM_COMMAND( - OUTPUT ${_outc} ${_outh} -- COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in} +- COMMAND ${LEX_EXECUTABLE} $<$,$>:--debug> -o${_outc} --header-file=${_outh} ${_in} - DEPENDS ${_in} - ) + IF (DEFINED ENV{SOURCE_DATE_EPOCH}) + ADD_CUSTOM_COMMAND( + OUTPUT ${_outc} ${_outh} -+ COMMAND ${LEX_EXECUTABLE} --noline -o${_outc} --header-file=${_outh} ${_in} ++ COMMAND ${LEX_EXECUTABLE} $<$,$>:--debug> --noline -o${_outc} --header-file=${_outh} ${_in} + DEPENDS ${_in} + ) + ELSE () + ADD_CUSTOM_COMMAND( + OUTPUT ${_outc} ${_outh} -+ COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in} ++ COMMAND ${LEX_EXECUTABLE} $<$,$>:--debug> -o${_outc} --header-file=${_outh} ${_in} + DEPENDS ${_in} + ) + ENDIF () LIST(APPEND ${_source} ${_in}) LIST(APPEND ${_generated} ${_outc}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) --- -2.26.2.Cisco - diff --git a/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch b/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch index 134633f66..1a6fe8d39 100644 --- a/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch +++ b/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch @@ -1,4 +1,4 @@ -From 17f05a8d02c589e4867906f70381e63e46a67870 Mon Sep 17 00:00:00 2001 +From 94b951c0cccf67b66749cc87c473e63fa5207e83 Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy Date: Wed, 27 Jan 2021 06:47:13 -0800 Subject: [PATCH] lemon: Remove #line directives @@ -8,67 +8,28 @@ directives with extra option '-l'. Upstream-Status: Pending Signed-off-by: Oleksiy Obitotskyy + --- - cmake/modules/UseLemon.cmake | 49 +++++++++++++++++++++++++----------- - 1 file changed, 34 insertions(+), 15 deletions(-) + cmake/modules/UseLemon.cmake | 2 ++ + 1 file changed, 2 insertions(+) -Index: wireshark-3.4.11/cmake/modules/UseLemon.cmake -=================================================================== ---- wireshark-3.4.11.orig/cmake/modules/UseLemon.cmake -+++ wireshark-3.4.11/cmake/modules/UseLemon.cmake -@@ -7,21 +7,40 @@ MACRO(ADD_LEMON_FILES _source _generated - - SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename}) - -- ADD_CUSTOM_COMMAND( -- OUTPUT -- ${_out}.c -- # These files are generated as side-effect -- ${_out}.h -- ${_out}.out -- COMMAND $ -- -T${_lemonpardir}/lempar.c -- -d. -- ${_in} -- DEPENDS -- ${_in} -- lemon -- ${_lemonpardir}/lempar.c -- ) -+ IF (DEFINED ENV{SOURCE_DATE_EPOCH}) -+ ADD_CUSTOM_COMMAND( -+ OUTPUT -+ ${_out}.c -+ # These files are generated as side-effect -+ ${_out}.h -+ ${_out}.out -+ COMMAND lemon -+ -l -+ -T${_lemonpardir}/lempar.c -+ -d. -+ ${_in} -+ DEPENDS -+ ${_in} -+ lemon -+ ${_lemonpardir}/lempar.c -+ ) -+ ELSE () -+ ADD_CUSTOM_COMMAND( -+ OUTPUT -+ ${_out}.c -+ # These files are generated as side-effect -+ ${_out}.h -+ ${_out}.out -+ COMMAND lemon -+ -T${_lemonpardir}/lempar.c -+ -d. -+ ${_in} -+ DEPENDS -+ ${_in} -+ lemon -+ ${_lemonpardir}/lempar.c -+ ) -+ ENDIF () - - LIST(APPEND ${_source} ${_in}) - LIST(APPEND ${_generated} ${_out}.c) +diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake +index e419de1..fa4034e 100644 +--- a/cmake/modules/UseLemon.cmake ++++ b/cmake/modules/UseLemon.cmake +@@ -12,6 +12,7 @@ if(LEMON_EXECUTABLE) + ${_out}.h + ${_out}.out + COMMAND ${LEMON_EXECUTABLE} ++ -l + -T/usr/share/lemon/lempar.c + -d. + ${_in} +@@ -30,6 +31,7 @@ else() + ${_out}.h + ${_out}.out + COMMAND $ ++ -l + -T${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c + -d. + ${_in} diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.0.10.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.0.bb similarity index 94% rename from meta-networking/recipes-support/wireshark/wireshark_4.0.10.bb rename to meta-networking/recipes-support/wireshark/wireshark_4.2.0.bb index 008aa8cb1..4a4768092 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_4.0.10.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.0.bb @@ -4,20 +4,20 @@ SECTION = "net" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares" +DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares speexdsp" DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ - file://0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch \ file://0001-wireshark-src-improve-reproducibility.patch \ file://0002-flex-Remove-line-directives.patch \ file://0004-lemon-Remove-line-directives.patch \ + file://0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch \ " UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "b2e3ff03fa2be9058a9ffbedd12b0a670433bd16c8cc6c432ab48dabc2df1898" +SRC_URI[sha256sum] = "0e428492f4c3625d61a7ccff008dc0e429d16ab8caccad4403157ea92b48a75b" PE = "1" From patchwork Sun Dec 31 12:23:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37148 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 07140C47422 for ; Sun, 31 Dec 2023 12:23:54 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web10.219022.1704025426228537108 for ; Sun, 31 Dec 2023 04:23:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=OKZnJsaw; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-40d6b4e2945so28429395e9.0 for ; Sun, 31 Dec 2023 04:23:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025425; x=1704630225; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v18b8lqH+XkZUsm/Ce44RYikSm4sdtylfFn9CJDZqQ8=; b=OKZnJsawraZRwHk1YDNC50dv9EEwgXvNYJxMOL5DRqNfP8cQajIf9Z8fbLJegcWJCQ XlKrL+eYXZQQjnoiRN6F4LscZsTi4S9Yn/vLZBGTGfCTQ/bU/0H9gIRTUgKkUzfNJC39 3kCCNRx+d+BSHMNnRIuccUQf253+F4u0drs+4mjqg8fK7rlf1ceepO9dxYjnjOzOq0JS JXV/On0G9ju7jfQzzX0u/aeZ4yE9+oA8stjAPH5d0ARBHhT2SQKOm6A+/m9ujPBFVFhk DYvIPXO/o69QKEouM0tO4AVkFpJoavSXzXDCkJGwTuy8p8I+kT03olLvj1xl48cQIxFo oASQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025425; x=1704630225; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v18b8lqH+XkZUsm/Ce44RYikSm4sdtylfFn9CJDZqQ8=; b=ktObB1u6vxXCmJPBJ5+swu6QOc7ZKquVcFI9D7O60xTNacxNCFd9+SbKhJWM98ncxb iDFgBnODlRvbIg01QaOxfTEeobtTXvmSREeTi+qbIfX+jkkZTJyFL1WrPkgkCCmni1cI VkjDnjz/Iz/tLmdzYuuLcN5Of3xQ/f61RyXOH8d69eviEAPgrR1iBelKQnhAgWfxWBWy kDcTTagq9WA7v3FpPKdGHp0QsXlfJCsYw6ARS3dyffseDASm9HRj3te02fZ9kv0rR5GG WEkCAmfHHt7P2oC5jqEcTNbJqeX6mP72DevXhaeREtl3vgMh3mKCDVeRMfKjLXbAfyp4 s4jg== X-Gm-Message-State: AOJu0YxPMPGwHVsu3YXintpCRMCrCt4SG1xMTwCzEijzIdHFhk+JWUDz 8v7MKdvszHgKk9V9/k+MSfevXVI7XKs= X-Google-Smtp-Source: AGHT+IGmSvWYfw3Y8POBabrpoD17eMA8p6Kd6m1nRTkmwxEmQzDVJP313ZYiV49hcpaB3v1Bb9yV8w== X-Received: by 2002:a05:600c:5014:b0:40d:5ec8:31b4 with SMTP id n20-20020a05600c501400b0040d5ec831b4mr2307054wmr.217.1704025424553; Sun, 31 Dec 2023 04:23:44 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:43 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 15/23] openipmi: update 2.0.32 -> 2.0.34 Date: Sun, 31 Dec 2023 13:23:21 +0100 Message-Id: <20231231122329.405225-15-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107966 This resolves dependency on removed python distutils in particular. openipmi-remove-host-path-from-la_LDFLAGS.patch is removed as issue is fixed upstream. Signed-off-by: Alexander Kanavin --- ..._devel.m4-do-not-check-for-distutils.patch | 41 ---------------- ...fix-symlink-install-error-in-cmdlang.patch | 9 ++-- .../openipmi/files/include_sys_types.patch | 5 +- .../files/ipmi-init-fix-the-arguments.patch | 6 +-- .../files/openipmi-no-openipmigui-man.patch | 3 +- ...pmi-remove-host-path-from-la_LDFLAGS.patch | 49 ------------------- ...{openipmi_2.0.32.bb => openipmi_2.0.34.bb} | 12 ++--- 7 files changed, 16 insertions(+), 109 deletions(-) delete mode 100644 meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch delete mode 100644 meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch rename meta-networking/recipes-support/openipmi/{openipmi_2.0.32.bb => openipmi_2.0.34.bb} (87%) diff --git a/meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch b/meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch deleted file mode 100644 index 00956fb11..000000000 --- a/meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3a35611687864cf3599712d0d2ff54532b0118ac Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sun, 3 Oct 2021 21:42:32 +0200 -Subject: [PATCH] m4/ax_python_devel.m4: do not check for distutils - -With py 3.10 this prints a deprecation warning which is -taken as an error. Upstream should rework the code to not -use distuils. - -Upstream-Status: Inappropriate [needs a proper fix upstream] -Signed-off-by: Alexander Kanavin ---- - m4/ax_python_devel.m4 | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 -index e0804c5..cfc0b24 100644 ---- a/m4/ax_python_devel.m4 -+++ b/m4/ax_python_devel.m4 -@@ -138,21 +138,6 @@ variable to configure. See ``configure --help'' for reference. - fi - fi - -- # -- # Check if you have distutils, else fail -- # -- AC_MSG_CHECKING([for the distutils Python package]) -- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- AC_MSG_ERROR([cannot import Python module "distutils". --Please check your Python installation. The error was: --$ac_distutils_result]) -- PYTHON_VERSION="" -- fi -- - # - # Check for Python include path - # diff --git a/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch b/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch index 243488424..5bbccdcbf 100644 --- a/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch +++ b/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch @@ -1,4 +1,4 @@ -From 7854c60c92243adb14ea89e16fc226d2e47dd4f9 Mon Sep 17 00:00:00 2001 +From 0ccfefe624e25f937b27b2caf3671e80c2c29391 Mon Sep 17 00:00:00 2001 From: Aws Ismail Date: Thu, 7 Jun 2012 16:00:13 -0400 Subject: [PATCH] Fix symlink install error in cmdlang @@ -9,17 +9,18 @@ creating a symbolic link for opeipmish in openipmi/cmdlang Upstream-Status: Pending Signed-off-by: Aws Ismail + --- cmdlang/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index 0ca3827..d9a941f 100644 +index 7235446..4a81ae3 100644 --- a/cmdlang/Makefile.am +++ b/cmdlang/Makefile.am -@@ -35,6 +35,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.la \ +@@ -41,6 +41,7 @@ openipmish_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \ # compatability. - install-data-local: + install-exec-hook: rm -f $(DESTDIR)$(bindir)/ipmish + mkdir -p $(DESTDIR)$(bindir)/ $(LN_S) openipmish $(DESTDIR)$(bindir)/ipmish diff --git a/meta-networking/recipes-support/openipmi/files/include_sys_types.patch b/meta-networking/recipes-support/openipmi/files/include_sys_types.patch index 61b39995a..18129e6fc 100644 --- a/meta-networking/recipes-support/openipmi/files/include_sys_types.patch +++ b/meta-networking/recipes-support/openipmi/files/include_sys_types.patch @@ -1,4 +1,4 @@ -From 4f41e090e33a00117a27f0c77b6338fb8b495f37 Mon Sep 17 00:00:00 2001 +From d667aedc37aeabdb9f8574ee0b9cf85b844ca2d2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 2 Jun 2017 21:58:32 -0700 Subject: [PATCH] openipmi: Fix build with musl @@ -12,12 +12,13 @@ ui.c:340:5: error: unknown type name 'u_int32_t'; did you mean 'uint32_t'? Upstream-Status: Pending Signed-off-by: Khem Raj + --- ui/ui.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/ui.c b/ui/ui.c -index 529ff22..066d118 100644 +index 9c6a51f..34f7e34 100644 --- a/ui/ui.c +++ b/ui/ui.c @@ -42,6 +42,7 @@ diff --git a/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch b/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch index c4559c97b..d9ee5cc28 100644 --- a/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch +++ b/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch @@ -1,4 +1,4 @@ -From 6542ebe7a0d37dee8e9afb856feb8f6c3d334632 Mon Sep 17 00:00:00 2001 +From 7d9f6526dbcd46130d279c363d38781969807f74 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 29 Dec 2014 18:16:04 +0800 Subject: [PATCH] ipmi-init: fix the arguments @@ -10,12 +10,13 @@ not a string. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jackie Huang + --- ipmi.init | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ipmi.init b/ipmi.init -index ea10b11..aac9f83 100644 +index bd80f0d..53305bb 100644 --- a/ipmi.init +++ b/ipmi.init @@ -45,17 +45,17 @@ elif [ -r /etc/init.d/functions ]; then @@ -39,4 +40,3 @@ index ea10b11..aac9f83 100644 echo ;; *) - diff --git a/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch b/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch index 858adc50a..f14626a38 100644 --- a/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch +++ b/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch @@ -1,4 +1,4 @@ -From a6ffa3939a3ab2ad6a8d277cd8292b7dad6469c6 Mon Sep 17 00:00:00 2001 +From c76e727433ed895c605f9e7a3612bbc16ff558de Mon Sep 17 00:00:00 2001 From: Aws Ismail Date: Thu, 7 Jun 2012 12:28:34 -0400 Subject: [PATCH] Do not build openipmigui man page @@ -11,6 +11,7 @@ Upstream-Status: Pending Signed-off-by: Aws Ismail Signed-off-by: Yi Zhao + --- man/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch b/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch deleted file mode 100644 index 1aea32eae..000000000 --- a/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5a4abf223d79d4e1a58bbad1e4f2f406c7cab748 Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Mon, 29 Dec 2014 18:16:04 +0800 -Subject: [PATCH] remove host path from la_LDFLAGS - -Upstream-Status: Inappropriate [ cross compile specific ] - -Signed-off-by: Jackie Huang ---- - cmdlang/Makefile.am | 2 +- - unix/Makefile.am | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index 9cf180d..da46ceb 100644 ---- a/cmdlang/Makefile.am -+++ b/cmdlang/Makefile.am -@@ -18,7 +18,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \ - $(top_builddir)/utils/libOpenIPMIutils.la \ - $(top_builddir)/lib/libOpenIPMI.la - libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - bin_PROGRAMS = openipmish - -diff --git a/unix/Makefile.am b/unix/Makefile.am -index baf0815..80c3d5d 100644 ---- a/unix/Makefile.am -+++ b/unix/Makefile.am -@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c - libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ - $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) - libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c - libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ - $(GDBM_LIB) $(RT_LIB) - libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - noinst_HEADERS = heap.h - --- -2.17.1 - diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb similarity index 87% rename from meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb rename to meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb index 18f4deca1..470ce1e25 100644 --- a/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb +++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb @@ -26,27 +26,22 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ file://fix-symlink-install-error-in-cmdlang.patch \ file://openipmi-no-openipmigui-man.patch \ - file://openipmi-remove-host-path-from-la_LDFLAGS.patch \ file://ipmi-init-fix-the-arguments.patch \ file://include_sys_types.patch \ file://openipmi-helper \ file://ipmi.service \ - file://0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch \ " S = "${WORKDIR}/OpenIPMI-${PV}" -SRC_URI[md5sum] = "532404c9df7d0e8bde975b95b9e6775b" -SRC_URI[sha256sum] = "f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945" +SRC_URI[sha256sum] = "93227e43c72b5c3bd5949323e0669aa5527d1a971473a3a365af03fb8284a95f" -inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base python3targetconfig +inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig CFLAGS += "-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" EXTRA_OECONF = "--disable-static \ --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \ - --with-python='${STAGING_BINDIR_NATIVE}/python3-native/python3' \ - --with-pythoninstall='${PYTHON_SITEPACKAGES_DIR}' \ --with-glibver=2.0" PACKAGECONFIG ??= "gdbm" @@ -68,9 +63,8 @@ FILES:${PN}-dbg += " \ " do_configure () { - # Let's perform regular configuration first then handle perl issues. - autotools_do_configure + PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} autotools_do_configure perl_ver=`perl -V:version | cut -d\' -f 2` From patchwork Sun Dec 31 12:23:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37143 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 F0C8AC4725D for ; Sun, 31 Dec 2023 12:23:53 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web10.219024.1704025426691583082 for ; Sun, 31 Dec 2023 04:23:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=CAKEdhy0; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-a27c6c88694so57449366b.3 for ; Sun, 31 Dec 2023 04:23:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025425; x=1704630225; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C7Ip4VGcob3nJ17l2bKO4ReXOyFUMpVYuSgPZlsEZag=; b=CAKEdhy03Beq0WanaqgKf5t/ViXNrD2Hwx7y2eqhl5hilvzHdm/fvlsJd41zLNcNME JZrc6GhC7P4SM3a0qMZaj7K0NkOR7rp1YOO4VRUmE3Z7oKSNlEihtmcldjoNv+o4xuVa MDzgsffo7DzI6SeRkArOgHbsF81qfSyFX+iLzWkxfUriOm4J1Ir9VNEndqHuWFlPio4v vGyC3hScB+u1GB8SwTNJ94yobUdF/t9nqPFheRSgvcW5XZI/hjdlVhSCCb7EnoaUbm6o hB2BFSNf6jlqAxZ/LF0iZ/1q5C8izzKj2kDIDsSKtzOlu8NI7ueuzziaVgj3fvp/6S9+ QKJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025425; x=1704630225; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C7Ip4VGcob3nJ17l2bKO4ReXOyFUMpVYuSgPZlsEZag=; b=XpC3fW34XuWWaWA96Qg642aZyerT0EHJ9SzEtSMFVRz93V0Jsmo9oMcFpYZW3Cp63l uxlc9DoM+Z85j891PlQgvqQVkUOQ943eSrdG4YBCIzwyFdm8nD/nz5sU2Xh0dBqPNQB8 dVMLYMyMnlW7uedua1AD8Xcz37lRsc//Zfs4R7qpIe2S4YZvhEEs0rK6cady36sg+AtJ q9YA5BFTt0Y7ARudCsHI80ca7AiqKUfzjFssaeXzUZVmsPGz/zXCbQSw3mn9jU4IxWMS YqTVoxVv2iV52acOtUMzMR8/mUr2+Wuag0adx0lxklqcZxovSsiG6BjvNsmZAqOoPt5E u9iA== X-Gm-Message-State: AOJu0Yxp+pNVHt/qKgFfh2MUP1uHYw1gypy5hSrIyQnrpehkUVcLv+TK 0JTld++BVzfUAT6j8QrJoM8NyeZ77V8= X-Google-Smtp-Source: AGHT+IHg9NIKCHReuD5FHPjLUd69GTy58IWLl+jhXdAYsVZoge1qLTGGpwOlZaQjrwKnI+r9USPw5g== X-Received: by 2002:a17:906:2d7:b0:a19:641:66da with SMTP id 23-20020a17090602d700b00a19064166damr6709089ejk.7.1704025425137; Sun, 31 Dec 2023 04:23:45 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:44 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 16/23] libsigrokdecode: add python 3.12 support Date: Sun, 31 Dec 2023 13:23:22 +0100 Message-Id: <20231231122329.405225-16-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107967 Signed-off-by: Alexander Kanavin --- .../libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch index a90f588d2..45556afa8 100644 --- a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch +++ b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch @@ -18,7 +18,7 @@ index 4802f35..e0e468f 100644 # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build SR_PKG_CHECK([python3], [SRD_PKGLIBS], - [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) -+ [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.12-embed], [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) AS_IF([test "x$sr_have_python3" = xno], [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) From patchwork Sun Dec 31 12:23:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37145 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 E25D5C47255 for ; Sun, 31 Dec 2023 12:23:53 +0000 (UTC) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web10.219025.1704025427162371680 for ; Sun, 31 Dec 2023 04:23:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=cHozKMzL; spf=pass (domain: gmail.com, ip: 209.85.221.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-3368b1e056eso7365113f8f.3 for ; Sun, 31 Dec 2023 04:23:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025425; x=1704630225; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Qn5OfA5Tln2wU67Us4DujZ0FS66eI8krjvaA8/iDX8Y=; b=cHozKMzLf0OMQWr67tzqC5aht7INP4K+cvnQAqV5Fc4l3LLKxj3wxEaRqQebYPMeMb Vmskj7/rZCOkTaiQcwYrj/8QBWekBr9GtylXUHHgFuXP5dKwuX4FaCerXjtDvXFTxOwh hXZnYDKYUrVc9fkOpX8WRJbl/r+4iwtNU+xIFxAh5IcMQObgqg84E1bJzkxpg91JVKcA dF+jOQVEJzDicuaMLZl3od5TYXEI+jDe57PvvS+gMc+rv9ZVAKvCdbstzUoiAludgSTJ yZ0DLspS/BbVaAVsdhJz7OxDJOAVhHmNtjGMmOGoG+HOuICyPlBMVooEt65bZMLP/f46 qrxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025425; x=1704630225; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Qn5OfA5Tln2wU67Us4DujZ0FS66eI8krjvaA8/iDX8Y=; b=pLoFX67IZEKdoW9Vn46XpG2RP7qB5ImBANt3Gdi5PLpnk4w+rKZj5Bnkhs0X9WAszp MLmQSUnVojNiGT1l+KQwwkw2G6F7QpssyxZLUU1N77xs13O7bhDNXPGMtV/YUiLCbgSm pUCrtaH199CsKL/En6wE/92/5OfjAWYEls4Yu0+zQQ5lV2D+j9dxowG68BpgGft3S1XZ cxFrimTUAALfzr3WKxWdLDtQZuB2ar/JR2e5aEUBDrV2K2u0Gb4+HOrWIe++uP8TreJE PWFCsvrTPUEFgDTXyQm6quzwjHbjZHNHfzappJtKPt4Z20a97TSG2BYe+8SwtMX6S9XB 4u6A== X-Gm-Message-State: AOJu0YyD+U6INIoKSfTcN7xSKea+wBdiRbwz8kZtQuSqDsMIjnFNU3aV u0hP8Z4EVhrVfq59YxunYmbVgipXPRg= X-Google-Smtp-Source: AGHT+IHvvBfvRgw3GXEEL/1abhWj8KCsGtGBWGSzUHJOzLZVDpO9sHdsoe3MllhUF39ewHb+iHlA/Q== X-Received: by 2002:a05:600c:4f43:b0:40d:8590:a310 with SMTP id m3-20020a05600c4f4300b0040d8590a310mr606175wmq.88.1704025425655; Sun, 31 Dec 2023 04:23:45 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:45 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 17/23] cockpit: add setuptools dependency to bring in distutils copy Date: Sun, 31 Dec 2023 13:23:23 +0100 Message-Id: <20231231122329.405225-17-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107968 Signed-off-by: Alexander Kanavin --- meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb index ab05fd377..df7f47a11 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "a87d090c930e2058bb3e970ca7f2bafe678687966b5c0b8b42a802977e inherit gettext pkgconfig autotools systemd features_check inherit ${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3targetconfig', d)} -DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd" +DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd python3-setuptools-native" DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3-pip-native', d)}" COMPATIBLE_HOST:libc-musl = "null" From patchwork Sun Dec 31 12:23:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37144 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 D9249C47258 for ; Sun, 31 Dec 2023 12:23:53 +0000 (UTC) Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by mx.groups.io with SMTP id smtpd.web10.219026.1704025427751844125 for ; Sun, 31 Dec 2023 04:23:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ewxa/XTa; spf=pass (domain: gmail.com, ip: 209.85.218.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-a275b3a1167so330043266b.3 for ; Sun, 31 Dec 2023 04:23:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025426; x=1704630226; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dP/WNMYcpO5XeqcxW2TjUsztEXx9SNJPBmLcEbuUh1I=; b=ewxa/XTaCv6DiSsrXhtSfABIgev5pwSO+PYhZfQsGqp3i51Z5UGkoxwOeWUU3PS0re UNrwuph1Dj0yXoBIp5SkWDabYEs3RwSnjqp3DvVFIgaUsdj7hFj2weR0f/9tzGoCTD0X kvCd5mnM0WNIdmmUzO36FUE1TA0U7WXXw635zEi/gchUx3dF7Ugmg92P3Tv4+yDfmKSN 0yZ3YAbSlU3zVoTHG/LlAqMbPyw4AP8ZH1NWJ1qcuIUDpnFYM8lWN4v9SamZ9myyhdTe yqXA6F92HU2ck3lWZ5AUub3waaql64qnT/ShBngXrfqpMZAi6/lMx5R4jXddSIslju7U A5Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025426; x=1704630226; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dP/WNMYcpO5XeqcxW2TjUsztEXx9SNJPBmLcEbuUh1I=; b=Q5y4RauShH4n9cPLPz/cgixGntVDke/vsGCqsi/GcdrRuY4+OUuU4wozm+4YLEtHDd QaA6EhilIRd59NGoG8DA6ttMOuSf62FsB4kJyVrGOGXEBpQGleFpVP25AORi6fOePwoO jK+ajEMbRsGXMGNNVRHZ2I6zCHGGyB3S0ghaUINvFlhUlAPEQ6YMSlxFN6CjJ7YPpEfg a4fnGpvyRLUCoY+HK6oMrB2rFrrfY9rfSatBNrNn97m/T9TXrgimqtnybqRaDwB7VXba LAU6UpwCwYLttr0mF06DAgria8mOED6SE7uTwV7y+mFFh8wvr9ocz0xmPXFdh8fFRnbK hUwA== X-Gm-Message-State: AOJu0Yz/0EYO/lIo0AI41nMTc9A7x4yvyi9JGZLFYvHrRqB+ip/2vcUx Fa+EnSfK6NHErHzRm+82nLX5fO9byXs= X-Google-Smtp-Source: AGHT+IG7gv1TtvpsxlQK6qXeJA7/aXlK7wN0lGTfHFXJQ7LzsQEZpkN2JbpDiTb/P0K3IpF6nBRf1Q== X-Received: by 2002:a17:906:739d:b0:a19:a1ba:da2d with SMTP id f29-20020a170906739d00b00a19a1bada2dmr6713864ejl.84.1704025426218; Sun, 31 Dec 2023 04:23:46 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:45 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 18/23] mongodb: skip until python 3.12 fixes are available. Date: Sun, 31 Dec 2023 13:23:24 +0100 Message-Id: <20231231122329.405225-18-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107969 Signed-off-by: Alexander Kanavin --- .../meta-python/recipes-dbs/mongodb/mongodb_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index 037d58cf1..ee5c77a85 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -145,3 +145,5 @@ SYSTEMD_SERVICE:${PN} = "mongod.service" FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" RDEPENDS:${PN} += "tzdata-core" + +SKIP_RECIPE[mongodb] ?= "Needs porting to python 3.12" From patchwork Sun Dec 31 12:23:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37142 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 CD523C4707C for ; Sun, 31 Dec 2023 12:23:53 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web11.218947.1704025428514878529 for ; Sun, 31 Dec 2023 04:23:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=F7J2dfdf; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a26f73732c5so492477766b.3 for ; Sun, 31 Dec 2023 04:23:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025427; x=1704630227; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dHHlU/9KO5+DXV84m+4wlJHg6WrUBsreXccGoYViFt4=; b=F7J2dfdfTj305lPg2T2IqSGWHxfwKRBCX3tbBCk2gbIyqtAT4L7GdkC6rSI1hLiims wAVKvUb77h/o5oqCn8TrR5JHAsbHRaF+D1YlBwt6TTLS84Ebx+8eTH2NzeUhie+/ahEV U/ZD6uql7IddX9XzQGdkP+IKEAEuQ/epMKTd7V+rDUgHTwMARWoR2ioluVu8nk4s52ZM AUaa0XIr1sBCj7XwF/3sPReZthpXaMo0w0z74mCwWmW/C+Ha7ST4TqMBSr15UlgivIN9 SQyhb8+3bFMRwCNfCzfisG+RungduyPtS7wxD5gREj0lGT7SRCkmxNVaoD0Tr3zyuj0R JU2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025427; x=1704630227; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dHHlU/9KO5+DXV84m+4wlJHg6WrUBsreXccGoYViFt4=; b=BcFhX0piAlVkQ1IHTuq5x88x6crsGC2lgZSZGzE57oquymJXr7G0h5ecpmMEMwjylf AKYqn+LMH+vd7BT/XHwRx454eEVH5azkSn/xvbyPRBVLt+XkkUl9td5JxP4c4Vla4NBf dHY6u/5mAKycOG1/R/rRC6fF5aCxczYM/2x6j8FsUES1wtn4pwJIlRV4wvnoj2fuHNCv S6FpLDCi9ql+gnFh4CkEX4ygeyDymyYlrFSI8r2tumuHiXr1njXWBFGYykQ6MfhDSbyH aCTLWptGLHpZ8KJLTrVWL1grrspf/mFP8Z/wjiXGnUSUMASv7wb3kS8wrc98uqWCdtmI s0HA== X-Gm-Message-State: AOJu0Yz2bqiFGkKBrrAx2LbE9rA/VOHyIRfApRwDjg60IHdfcRl0QcZD UXaOOLVLp/wTFXU8vLE7koyIXV6FvLA= X-Google-Smtp-Source: AGHT+IHMIYBftyN60dVS9wc15vwrXce4RP3slNyNGkwRQhin85iCMExuVnt5FY0MJ7WQTXiN502eOw== X-Received: by 2002:a17:906:38d6:b0:a23:57f3:95a9 with SMTP id r22-20020a17090638d600b00a2357f395a9mr6732770ejd.2.1704025426725; Sun, 31 Dec 2023 04:23:46 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:46 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 19/23] mercurial: ensure setuptools is present as distutils is no longer (mercurial tries both) Date: Sun, 31 Dec 2023 13:23:25 +0100 Message-Id: <20231231122329.405225-19-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107970 Signed-off-by: Alexander Kanavin --- meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb b/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb index 112df8c1e..2451a36be 100644 --- a/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb +++ b/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb @@ -4,7 +4,7 @@ SECTION = "console/utils" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "python3 python3-native" +DEPENDS = "python3 python3-native python3-setuptools-native" RDEPENDS:${PN} = "python3 python3-modules" inherit python3native python3targetconfig From patchwork Sun Dec 31 12:23:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37140 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 BFA0AC4707B for ; Sun, 31 Dec 2023 12:23:53 +0000 (UTC) Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by mx.groups.io with SMTP id smtpd.web11.218948.1704025428997328793 for ; Sun, 31 Dec 2023 04:23:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YzdFPmwo; spf=pass (domain: gmail.com, ip: 209.85.208.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-55539cac143so4600277a12.0 for ; Sun, 31 Dec 2023 04:23:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025427; x=1704630227; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s9Bz94541kwDKHPgLoFuZNYpVI06u7elWIH4jSMrVWw=; b=YzdFPmwo8M5eZrgZyyZnupuEh7LsZDrYsEB0TD1VXIuxWL+hmwvjCyISLOcLD6HFqm Go4sRbaQNhPL/2VlJDEjc9U3vD9ReoNQYseXtRxBq/1ubT4lkJstX+Vt/bzzKTuRE/Ep RNiYT+FM12f5oaBeHnpKBnlZfC+o0S31QCaB8SvhGHQDFtIHpWdHkLRX3hKv2waqLZ8K DVfGBgFSJ0L8C0fhtkIAEWAsbqG6i5CKr0LBrjpJOKpgKWrFoI/18YY/oPtBezE1phGE eVJtsmnHIXz6we+BjCQLhvTBxMULj/xDKB1s7OB/W9qSb3gz7/OBZAgI9N0iI5UjEFmO WLqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025427; x=1704630227; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s9Bz94541kwDKHPgLoFuZNYpVI06u7elWIH4jSMrVWw=; b=aGkGxR6J7OGW1acXyZBf88Ama+I4BTi+yUi1bW+HW3bw7ZDDz9yyfIwUvdPgOnOmzS QnPcWMWsQmoSB2xP33YplgacYVka5lOpGFWrCCgth7Qusv8Cn5rFUP61ZlMFbVcclV3o KlIrNGfPjAZWv3iTHWii/3A7Di8SqafEEydTARtxFnvtMmrEhYWROR/aUgjicf7fgsEL DW0fUDPgBtXzJtdZtV+uo3eqjNflWnopVzFan0KiPqPp4JumHqnO5GG/Txw1ZtPFHQeD xG8JSDt19WR7Fuqp6fAV3kmw5jLwfdvX25lzhib8vUepnimLJs4YnUCCiA+ddjCTLSMC Ajtw== X-Gm-Message-State: AOJu0YxC/9TXd+kskUCS8yKm2ldcj8kRvMbX5oRPVqJ1TTIKIGQkLrC5 uyGjcfmKhayj3nhneMDoZ8zporcNAUQ= X-Google-Smtp-Source: AGHT+IE4rLE5AuvFTRjq+8xJQGmx9OhDeD6bTTxq+Y2ohiQLsK1x6xGmvJrwBpfyf7EtjZxA5ozyyg== X-Received: by 2002:a17:906:1913:b0:a19:a19b:78af with SMTP id a19-20020a170906191300b00a19a19b78afmr6997382eje.114.1704025427439; Sun, 31 Dec 2023 04:23:47 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:47 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 20/23] rwmem: fix python modules packaging Date: Sun, 31 Dec 2023 13:23:26 +0100 Message-Id: <20231231122329.405225-20-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107971 Signed-off-by: Alexander Kanavin --- .../dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb index 8ccdc27a8..bff82fe35 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb @@ -32,4 +32,4 @@ do_install:append() { install -D -m 0644 ${B}/librwmem/librwmem.a ${D}${libdir}/librwmem.a } -FILES:${PN} += "${libdir}/python3.11/site-packages/pyrwmem" +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/pyrwmem" From patchwork Sun Dec 31 12:23:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37139 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 B7AB7C47077 for ; Sun, 31 Dec 2023 12:23:53 +0000 (UTC) Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by mx.groups.io with SMTP id smtpd.web10.219028.1704025430253138078 for ; Sun, 31 Dec 2023 04:23:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=BLUajUVa; spf=pass (domain: gmail.com, ip: 209.85.167.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-50e7e1ddaddso5865394e87.3 for ; Sun, 31 Dec 2023 04:23:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025428; x=1704630228; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5YTaTHZNURN5S0ovV+ncSn13bT6zeBs6C2VNe/xKd78=; b=BLUajUVap/2a1LWBTQXAL+5MiETp3a+g8Eo0QysnF0ygZg2gBAkgmqIvluXjZl6jrL IU5b6zNjHA78uXnScmnBUTuaiNEa6E+Rdi1+77REJvDh/AieIjf/FtxDCouhjPC02YX4 poxKljEv5SmN4HVoeRbwO//qXyKHSsAl6KGyV1jrSAakbN6CKDEqz1AwbVLXZwOdfZ1r GqpfNoDGbZkmAnH4wY3SsjlJ61Q2JDG4FqWwUwyDCj/yP2sB3pUnxpMvKz80OxeAaB4n 6V+EfAAqe22ZITc4TyFK2gGzynZDOaOls8f02EjlMabEKtNxIaSW+GVa8yVFyh3lQ2zf JKuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025428; x=1704630228; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5YTaTHZNURN5S0ovV+ncSn13bT6zeBs6C2VNe/xKd78=; b=XMcYSWj5VZtn4TjyKs0H0+8DlKAk3nJHufAJWeRQEeay3bkl0dhe/ikfIuWsgrxEYN OZJRy4FEqPtPEmwsB5ZWvdBma3eWOKtQKxR/8q4qJbu7vbQSTza3oaPLgKmUtUvoAmIv G1c/Dcq/MPAKI36zuHEGKSkz1O/YCpvXqNDaW7T79UERBz/IEAvvV8o3EQPi4meVW2Py lqAPP71wdCHyYBiA+AVz307dO1KR0LitvuwxfvBE4OI5rtPJQjk0McVbn7RxgM+r5ZC3 QaXvvxsJ3rGwl9WUGxNqhDKH8ygqhlmMKNpiQcCD8ijcoNTxuTWV8+HFQECX822v9vem iOIg== X-Gm-Message-State: AOJu0YyNXyW/CAeNAofzpVfZQtpdEUpt/FOv0yFzEdNCIWXUgp7KJXgn eN4U1QMNeWKjMTemIm6BdN56xJkY+OQ= X-Google-Smtp-Source: AGHT+IFQn6SuZKg2AcH15Xy2kAhM5hYKFRT7y+C5298aN6x5FTAjDXCQU8QFqNzTKtN4UAmTBvHXOw== X-Received: by 2002:a19:670b:0:b0:50e:4598:b836 with SMTP id b11-20020a19670b000000b0050e4598b836mr7263682lfc.15.1704025428323; Sun, 31 Dec 2023 04:23:48 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:47 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 21/23] upm: get disutils copy via setuptools Date: Sun, 31 Dec 2023 13:23:27 +0100 Message-Id: <20231231122329.405225-21-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107972 Signed-off-by: Alexander Kanavin --- meta-oe/recipes-extended/upm/upm_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 0695f9969..a86f4a80d 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f" -DEPENDS = "libjpeg-turbo mraa" +DEPENDS = "libjpeg-turbo mraa python3-setuptools-native" SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" PV = "2.0.0+git${SRCPV}" From patchwork Sun Dec 31 12:23:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37141 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 B24F5C47079 for ; Sun, 31 Dec 2023 12:23:53 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web11.218949.1704025430521614194 for ; Sun, 31 Dec 2023 04:23:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jddynPyh; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-40d5b159497so45325155e9.1 for ; Sun, 31 Dec 2023 04:23:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025429; x=1704630229; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yiywUULPPOMgQruF1QzkkmJA8tSd/OtJQZPpNrYyLn8=; b=jddynPyh4X+cbEwfmkszb2klb/dnrPu+qJMDZKN9Tyc7+dzMq5ah1qzcZYrO0b7U07 t2Wu+X7jCvB1cQovS6F9QhzOvxtNvToLaEUOcR8/ag6GoUJCPP1Nrn8B+19NOGUYkaTZ awlWPKPtgwrxydtdUywfj2RXkKYokY8qkUGsdHelSiW9ER/srzoCbgzwJkBn86D1KvCQ hUUhRXK/InJdgC5WAF1QKdbrKXfkALl0dcvMw7v3dsnpRBWXZzAC+bYjxDOuegVivmrL Cd+hO2n+oej39/wh+6YT1uh82INXyN9O/mGeAfadgYFI4YctwX2q+4rANymZWdxy2cWR iItA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025429; x=1704630229; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yiywUULPPOMgQruF1QzkkmJA8tSd/OtJQZPpNrYyLn8=; b=lwVgwvJxcK2A+letf/cSJjqYpDfI9r2MqTf2gWrRaHO4WfW3RahJdVd56MQb7VuL7U mxHrdO4oUOFlOUG91bOnBqepG7BdJb2/I/+4GKb6Av9Jp2mMzNoC+GOwbf9x4sThslSV xukipJ4g/5M7eir15Xbkrbw8nY7H4LEnZK18Rq1Ds0yJXhpyIQfe1uhSmzFGsIb1jupA COhJvRkIHNWhxRa0ZOpQXYXPhxWyUqRQNghosQ/+GLPLv7ZGKGAgNCrRFlqNAmAD+uBq 5DdZZiwmEhZ81kQfozCaiETKc8yTlw/cK1z5BA1NEXDza5gs/R3k71KNc2aFIegqzBlg 92bg== X-Gm-Message-State: AOJu0Ywtrac9CDLVQiNySHfOkra2N5s5u8kFuzP4zBtzrkVU6Viu92zX 1nJ+eOOQQIHmoSrAB+VNkMaDaEToldM= X-Google-Smtp-Source: AGHT+IF5VD2rc03Ini/WATj0JUnj2JBMBqQDVnrF4SOH+UihoOFQeki8DtjU+/PrzfCbH1p0GE3zcQ== X-Received: by 2002:a05:600c:2315:b0:40c:5536:66da with SMTP id 21-20020a05600c231500b0040c553666damr4824244wmo.21.1704025429019; Sun, 31 Dec 2023 04:23:49 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:48 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 22/23] python3-kmod: remove the recipe Date: Sun, 31 Dec 2023 13:23:28 +0100 Message-Id: <20231231122329.405225-22-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107973 Not compatible with cython 3.x, and has been inactive for years: https://pypi.org/project/kmod/#description https://github.com/agrover/python-kmod Signed-off-by: Alexander Kanavin --- .../packagegroups/packagegroup-meta-python.bb | 1 - .../recipes-devtools/python/python3-kmod_0.9.1.bb | 15 --------------- 2 files changed, 16 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 32e962aff..41fce5327 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -217,7 +217,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-keras-preprocessing \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "python3-kivy", "", d)} \ python3-kiwisolver \ - python3-kmod \ python3-langtable \ python3-lazy-object-proxy \ python3-libconf \ diff --git a/meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb b/meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb deleted file mode 100644 index 52e1cf6af..000000000 --- a/meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Python bindings for kmod/libkmod." -HOMEPAGE = "https://github.com/agrover/python-kmod" -SECTION = "devel/python" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=6d62c2454850386a2ffe44f72db83d74" - -inherit pypi setuptools3 - -RECIPE_NO_UPDATE_REASON = "Version 0.9.2 is broken when using latest build machinery for C extensions" -SRC_URI[sha256sum] = "f3bf829059bf88eca22f4f549e17aa316cdaa14302bf2ba49ddeee60cea109ff" - -DEPENDS += " \ - kmod \ - python3-cython-native \ -" From patchwork Sun Dec 31 12:23:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 37137 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 A7116C47073 for ; Sun, 31 Dec 2023 12:23:53 +0000 (UTC) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mx.groups.io with SMTP id smtpd.web10.219030.1704025431118004142 for ; Sun, 31 Dec 2023 04:23:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=T9Zqo02x; spf=pass (domain: gmail.com, ip: 209.85.208.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-5559bb6b29dso2659493a12.2 for ; Sun, 31 Dec 2023 04:23:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704025429; x=1704630229; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GgsQ/bk6k9WQXHGFeLPh8tvbJeSBKlBhE7UJqEqkCTU=; b=T9Zqo02xxZD1wtIDIQinLqlFqTKiUK9MzHBNxABktsEhwi184rTa4NsazHIiqL2ywE ZD3J/hmv3MKP6JapqICFEPDymU7LGjSdZPwnNupD6Tf0HhlJ0k98wR4H8Zp2CgOBq6Lw mWm2mqQfJeB68KDNrWuHg5aw0mwqegeJdRDgrcAs82SarPHgRUtiBQuHlVUp1ABuOIFz 0l8MIWguiCEOpcBJlsx6ncL90EajVCJVifPbOgVWYfTmC/CDhE6//uN7ozmy8o49b6ij DrB3+CS7CFXduGAEpteOCIwTiQzfr5iQKe8PzG42FANPBFBk2tjt6rowgJm0hhbA+8Dk xqZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704025429; x=1704630229; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GgsQ/bk6k9WQXHGFeLPh8tvbJeSBKlBhE7UJqEqkCTU=; b=ESN5MsPECdx2sADIAUiMR3mbtiGxaHZLDDQUWNTAQSN2jnR+YJVilTVTcwPzHI9re/ wub8b++vpxQLuac8xJdEhUD1a1ehVPFLXwfPaV7mF9w+0vYbEOKKLbw1gRnPuiUmmkfx xsvbdZOxchL+fxl+NdjLBY/st0hI19CyLxSKwUv74W3dzycpqCmpOT9HLcsZEXDfassQ anT03SkBE/M4OifWnJliNhHXY9GVxxxfiXvv+LtHA5Ylt4G29q68pd+jlUj/RGrK1z+g EtWGQomWyJZVDkOdKC/FqBJPfcFGppFAqL9JaPmRzCI0iP1qQpJTVNywhCx+b7cx0Cuv FTSw== X-Gm-Message-State: AOJu0Yxa7asCZosDSblBjONwRrhkf+bCFYwu9DJ/7zF24uCZo9Tr4fvb kDoXj93GKgqwuLYqJZ7dmAE15vb+L8U= X-Google-Smtp-Source: AGHT+IHCTANFayESChhlsL56NEzhRWxpAmGywDcbs3/8Qd7ZMpo4XCQ6dsdFeaAJHlIx2l8djzZaVw== X-Received: by 2002:aa7:c050:0:b0:553:5c7e:8c5c with SMTP id k16-20020aa7c050000000b005535c7e8c5cmr8292512edo.21.1704025429596; Sun, 31 Dec 2023 04:23:49 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ay23-20020a170907901700b00a26aea4942dsm9155474ejc.123.2023.12.31.04.23.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 04:23:49 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 23/23] hplip: provide setuptools for the distutils copy Date: Sun, 31 Dec 2023 13:23:29 +0100 Message-Id: <20231231122329.405225-23-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231231122329.405225-1-alex@linutronix.de> References: <20231231122329.405225-1-alex@linutronix.de> 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 ; Sun, 31 Dec 2023 12:23:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107974 Signed-off-by: Alexander Kanavin --- meta-oe/recipes-extended/hplip/hplip_3.22.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb index ed9f28e07..be420b483 100644 --- a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb +++ b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb @@ -19,7 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-Drop-using-register-storage-classifier.patch" SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624" -DEPENDS += "cups python3 libusb1" +DEPENDS += "cups python3 libusb1 python3-setuptools-native" inherit autotools-brokensep python3-dir python3native python3targetconfig pkgconfig systemd