From patchwork Mon Oct 31 11:47:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 14586 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 F3DF3FA3742 for ; Mon, 31 Oct 2022 11:47:40 +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.8158.1667216859470766473 for ; Mon, 31 Oct 2022 04:47:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WQUxqApx; 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 j15so15596220wrq.3 for ; Mon, 31 Oct 2022 04:47:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8t431kAywv13IkBs6xw+a2qvmVt0M4V1XdgpNer+Skw=; b=WQUxqApxJRzf7EGUNHmPx53Vp5xd2mjlDCQVyveTFmTWQYTWfsMqszal6xEkNUkKUr tJ7NvP6LyrOAuSRX8gLQsuNutAKaRgxZJkUBos66WHZmB7kub1gXGLThZybMsa4g8K8z NbBAzOAsVzKlyzddZxz8T5eenPAj+8GmQkYCmqlT6IXWpXUf5jkfm9AYPxq413AOHz7G dY2wWx+AddDOOlaxSku/ioDWPkxOhtKiTCMlDy9wNipbb2lsbZgX6vLGyizI4r4hUhbQ Ij1WVO75uNGJ0hFr0cXB8vd6W/kmdObnRNXPHeg71kxAWY5HwdpiqtbWsY0w7vXYwr8u TDCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=8t431kAywv13IkBs6xw+a2qvmVt0M4V1XdgpNer+Skw=; b=Y7iE7kWLyufCn0rt2t0uHM1vG/kyH6bjaMsQppWmzL16ox19BAOWAFLH5/0uSFkEKz X4h582/xL+YQ5OezPJGSmne0yc8aBYCFOB5qiDz7ctr89ZP1DmJO5DjRQLdSMmm+3KC+ GkKSZwbo7OtZLKDgtjIq7wc9ZtFhDv9CbhnBCqi1n34/0YrRjZSc258uVPLMUE9rO+on POuSwSSM+mkswkMVk6yVUf46tWMNU5lpFnuFVzg2x74UNE3/TcwUlSr7btV9BLHBjq7j vNHyDL6CZqxuv81dLSGdPWPE+07QMHepBohwCCR16KLqiqw6Yus2XF1rkY165HAsLhQ6 9r1w== X-Gm-Message-State: ACrzQf2zXLpW2chAAlHLDJFp5myLRaEmu6Lpq0Oegqf+LLf3eROnFFU4 O7zs5ajCt5Es6umrCk16vCVbGn+1iVY= X-Google-Smtp-Source: AMsMyM46PTsb5PtpWLO6tehDr6rAh2dNlaz8UfCDaYFIX/h0xfj8GNCtdjGWwmfj3ltPRPClnKn28A== X-Received: by 2002:a5d:4572:0:b0:236:ccbe:3513 with SMTP id a18-20020a5d4572000000b00236ccbe3513mr2716490wrc.497.1667216857812; Mon, 31 Oct 2022 04:47:37 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m11-20020adfa3cb000000b002366e3f1497sm7017965wrb.6.2022.10.31.04.47.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 04:47:37 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/13] cargo-update-recipe-crates.bbclass: add a class to generate SRC_URI crate lists from Cargo.lock Date: Mon, 31 Oct 2022 12:47:07 +0100 Message-Id: <20221031114719.2725967-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.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 ; Mon, 31 Oct 2022 11:47:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172303 For better or worse, more and more rust components are appearing that do not include their dependencies in tarballs (or git trees), and rely on cargo to fetch them. On the other hand, bitbake does not use cargo (and quite possible won't ever be able to), and relies on having each item explicitly listed in SRC_URI with a crate:// prefix. This however creates a problem of both making such lists in the first place and updating them when a recipe is updated to a newer version. So this class can be used to perform such updates by implementing a task that does it; the next commit shows the outcome for python3-bcrypt (which has been tested to work and produce a successful build). Note: the python script relies on tomllib library, which appears in Python 3.11 and does not exist in earlier versions - I've tested this by first updating python to 3.11-rc2 in oe-core. Signed-off-by: Alexander Kanavin --- .../cargo-update-recipe-crates.bbclass | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 meta/classes-recipe/cargo-update-recipe-crates.bbclass diff --git a/meta/classes-recipe/cargo-update-recipe-crates.bbclass b/meta/classes-recipe/cargo-update-recipe-crates.bbclass new file mode 100644 index 0000000000..f90938c734 --- /dev/null +++ b/meta/classes-recipe/cargo-update-recipe-crates.bbclass @@ -0,0 +1,41 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +## +## Purpose: +## This class is used to update the list of crates in SRC_URI +## by reading Cargo.lock in the source tree. +## +## See meta/recipes-devtools/python/python3-bcrypt_*.bb for an example +## +## To perform the update: bitbake -c update_crates recipe-name + +addtask do_update_crates after do_patch +do_update_crates[depends] = "python3-native:do_populate_sysroot" + +do_update_crates() { + nativepython3 - < X-Patchwork-Id: 14587 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 F26C6C38A02 for ; Mon, 31 Oct 2022 11:47:40 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.web08.8155.1667216860252752858 for ; Mon, 31 Oct 2022 04:47:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=H2QxBpe4; spf=pass (domain: gmail.com, ip: 209.85.128.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f54.google.com with SMTP id l16-20020a05600c4f1000b003c6c0d2a445so7832616wmq.4 for ; Mon, 31 Oct 2022 04:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=A2rYxf9raO9dq5QZDSEFBsesxgi8dM8FRdqgf20lwjg=; b=H2QxBpe4js4F+6BIRZbYvSAVEJEA9szWBjC6qyaqhY6jTbPRTxJaGN1uV5FPbkZanY A5K+7HAwlbN1FiKtR+aa/OJVYByc/c8Vr5DPqwNcwEHcndU31dzJRSW7Oic/hGmFa0MU gKOrk3+gNrLD3fAdf+/AlEiNyJmLQrqDaXqxS+eTLdGmm4msp43ecmIyE1AIU6SgbtGt 70Er+g1tWS5Fc+ZTPuJ8d3OIG1ztSinDqUkrHc8Z52P6QkPH7eHoP67EFt+DxqL1wctw KAM68q+Pxik0LtsLfcw6nhR06y3zoPsHzdKlM2ZDDDy/XZM+uGzf5DgQaSkywjY5HewN DdyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=A2rYxf9raO9dq5QZDSEFBsesxgi8dM8FRdqgf20lwjg=; b=jFDZQNXukjLysNmUPvFiffpa8IvcltiHhHgS9xWbI4PE/rURBTSPOh0NgsfFCpw0PD 690WyL7/f8HlIRrifPQQFTMdM3ItP9cTpyc1BrD19ncQA1bg1d7FAHndFOwKQrWeZw3l 3KVn0mYeogPSKqzfXKwSOTih7xx8zlSR2EdDPXYGXGntEXR4oT8tAP4n6hh7AMeuRmDS CnwbUH6ND2yrEfyhGbFO8NNwn3bawAbRfjxraPLHHd5vmPSObzdUdnumEmNeH8iseGIg brFWWMXp38RTJdQtDcb2poWFMvgIV65com6YDDgk9kcJQLmYhP7E8I6Jf1qxledeituw PjIQ== X-Gm-Message-State: ACrzQf12mwjq4H0UnE8o9yHjFwtiIYQ97NJxMByjG8JyAisumOg545db t130UXXPyYLfptvH3QuHu2aEVGR2hnE= X-Google-Smtp-Source: AMsMyM5MwH2J05Ee1fs0Wv7l6CaOxJyWDM06Qq8gtrEJ1L8S1B5ew8zEO0Q0UlP5zWPDaDGVTgzB/w== X-Received: by 2002:a7b:c005:0:b0:3c3:6b2a:33bf with SMTP id c5-20020a7bc005000000b003c36b2a33bfmr7643795wmb.167.1667216858553; Mon, 31 Oct 2022 04:47:38 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m11-20020adfa3cb000000b002366e3f1497sm7017965wrb.6.2022.10.31.04.47.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 04:47:38 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/13] python3-bcrypt: convert to use cargo-update-recipe-crates class. Date: Mon, 31 Oct 2022 12:47:08 +0100 Message-Id: <20221031114719.2725967-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031114719.2725967-1-alex@linutronix.de> References: <20221031114719.2725967-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 ; Mon, 31 Oct 2022 11:47:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172304 The component has been reimplemented in rust, and comes with a large list of dependencies in Cargo.toml/Cargo.lock. Rather than list them by hand, use a file generated with cargo-update-recipe-crates class. Signed-off-by: Alexander Kanavin --- .../python/python3-bcrypt-crates.inc | 53 ++++++++++++++++++ .../python/python3-bcrypt_4.0.0.bb | 55 ++----------------- 2 files changed, 57 insertions(+), 51 deletions(-) create mode 100644 meta/recipes-devtools/python/python3-bcrypt-crates.inc diff --git a/meta/recipes-devtools/python/python3-bcrypt-crates.inc b/meta/recipes-devtools/python/python3-bcrypt-crates.inc new file mode 100644 index 0000000000..78c5d5aa22 --- /dev/null +++ b/meta/recipes-devtools/python/python3-bcrypt-crates.inc @@ -0,0 +1,53 @@ +# Autogenerated with 'bitbake -c update_crates python3-bcrypt' + +SRC_URI += " \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/base64/0.13.0 \ + crate://crates.io/bcrypt/0.13.0 \ + crate://crates.io/bcrypt-pbkdf/0.8.1 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/block-buffer/0.10.2 \ + crate://crates.io/blowfish/0.9.1 \ + crate://crates.io/byteorder/1.4.3 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/cipher/0.4.3 \ + crate://crates.io/cpufeatures/0.2.4 \ + crate://crates.io/crypto-common/0.1.6 \ + crate://crates.io/digest/0.10.3 \ + crate://crates.io/generic-array/0.14.6 \ + crate://crates.io/getrandom/0.2.7 \ + crate://crates.io/indoc/0.3.6 \ + crate://crates.io/indoc-impl/0.3.6 \ + crate://crates.io/inout/0.1.3 \ + crate://crates.io/instant/0.1.12 \ + crate://crates.io/libc/0.2.132 \ + crate://crates.io/lock_api/0.4.7 \ + crate://crates.io/once_cell/1.13.1 \ + crate://crates.io/parking_lot/0.11.2 \ + crate://crates.io/parking_lot_core/0.8.5 \ + crate://crates.io/paste/0.1.18 \ + crate://crates.io/paste-impl/0.1.18 \ + crate://crates.io/pbkdf2/0.10.1 \ + crate://crates.io/proc-macro-hack/0.5.19 \ + crate://crates.io/proc-macro2/1.0.43 \ + crate://crates.io/pyo3/0.15.2 \ + crate://crates.io/pyo3-build-config/0.15.2 \ + crate://crates.io/pyo3-macros/0.15.2 \ + crate://crates.io/pyo3-macros-backend/0.15.2 \ + crate://crates.io/quote/1.0.21 \ + crate://crates.io/redox_syscall/0.2.16 \ + crate://crates.io/scopeguard/1.1.0 \ + crate://crates.io/sha2/0.10.2 \ + crate://crates.io/smallvec/1.9.0 \ + crate://crates.io/subtle/2.4.1 \ + crate://crates.io/syn/1.0.99 \ + crate://crates.io/typenum/1.15.0 \ + crate://crates.io/unicode-ident/1.0.3 \ + crate://crates.io/unindent/0.1.10 \ + crate://crates.io/version_check/0.9.4 \ + crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ + crate://crates.io/winapi/0.3.9 \ + crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/zeroize/1.5.7 \ +" diff --git a/meta/recipes-devtools/python/python3-bcrypt_4.0.0.bb b/meta/recipes-devtools/python/python3-bcrypt_4.0.0.bb index ac795ca8ab..857b38df2c 100644 --- a/meta/recipes-devtools/python/python3-bcrypt_4.0.0.bb +++ b/meta/recipes-devtools/python/python3-bcrypt_4.0.0.bb @@ -7,61 +7,14 @@ DEPENDS += "${PYTHON_PN}-cffi-native" SRC_URI[sha256sum] = "c59c170fc9225faad04dde1ba61d85b413946e8ce2e5f5f5ff30dfd67283f319" -inherit pypi python_setuptools3_rust ptest +inherit pypi python_setuptools3_rust ptest cargo-update-recipe-crates SRC_URI += " \ - crate://crates.io/autocfg/1.1.0 \ - crate://crates.io/base64/0.13.0 \ - crate://crates.io/bcrypt-pbkdf/0.8.1 \ - crate://crates.io/bcrypt/0.13.0 \ - crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/block-buffer/0.10.2 \ - crate://crates.io/blowfish/0.9.1 \ - crate://crates.io/byteorder/1.4.3 \ - crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/cipher/0.4.3 \ - crate://crates.io/cpufeatures/0.2.4 \ - crate://crates.io/crypto-common/0.1.6 \ - crate://crates.io/digest/0.10.3 \ - crate://crates.io/generic-array/0.14.6 \ - crate://crates.io/getrandom/0.2.7 \ - crate://crates.io/indoc-impl/0.3.6 \ - crate://crates.io/indoc/0.3.6 \ - crate://crates.io/inout/0.1.3 \ - crate://crates.io/instant/0.1.12 \ - crate://crates.io/libc/0.2.132 \ - crate://crates.io/lock_api/0.4.7 \ - crate://crates.io/once_cell/1.13.1 \ - crate://crates.io/parking_lot/0.11.2 \ - crate://crates.io/parking_lot_core/0.8.5 \ - crate://crates.io/paste-impl/0.1.18 \ - crate://crates.io/paste/0.1.18 \ - crate://crates.io/pbkdf2/0.10.1 \ - crate://crates.io/proc-macro-hack/0.5.19 \ - crate://crates.io/proc-macro2/1.0.43 \ - crate://crates.io/pyo3-build-config/0.15.2 \ - crate://crates.io/pyo3-macros-backend/0.15.2 \ - crate://crates.io/pyo3-macros/0.15.2 \ - crate://crates.io/pyo3/0.15.2 \ - crate://crates.io/quote/1.0.21 \ - crate://crates.io/redox_syscall/0.2.16 \ - crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/sha2/0.10.2 \ - crate://crates.io/smallvec/1.9.0 \ - crate://crates.io/subtle/2.4.1 \ - crate://crates.io/syn/1.0.99 \ - crate://crates.io/typenum/1.15.0 \ - crate://crates.io/unicode-ident/1.0.3 \ - crate://crates.io/unindent/0.1.10 \ - crate://crates.io/version_check/0.9.4 \ - crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ - crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ - crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ - crate://crates.io/winapi/0.3.9 \ - crate://crates.io/zeroize/1.5.7 \ - file://run-ptest \ + file://run-ptest \ " +require ${BPN}-crates.inc + RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " From patchwork Mon Oct 31 11:47:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 14592 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 E4FF2FA3740 for ; Mon, 31 Oct 2022 11:47:50 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.web11.8159.1667216860802059723 for ; Mon, 31 Oct 2022 04:47:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ZxQxpbDc; spf=pass (domain: gmail.com, ip: 209.85.128.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f54.google.com with SMTP id r186-20020a1c44c3000000b003cf4d389c41so7837217wma.3 for ; Mon, 31 Oct 2022 04:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=sEWZvXM5E6dFN/BXAPQZSHMpwgCE5Juuy7Th5wRM5yk=; b=ZxQxpbDc+i+aVMDlu3wIR+LPXjpM1AA71BlFORdQ5YwJljaCK1tj6FD/jbEDG03u1N vQIRKROMudREV1QMmOzQxsfjf6XMUyM7QhsF0ejN4vxSXQVJ32aoTypJvi4LXK63WkfY HwFMFS5pVFmpNfwyFpTKmMJnD4BXuGcatG31e1+OFgplI+rUK0CFBVSNhDjZLULsStfi Cvmujs1+o1VeldQTkuUMpGP/Q84vPoTOl4C5ne5h6jtb6weslo1zTQkPj7TnhBtaodUx AGF4wAcm5SlhK82tqURyoq2gNuZKmuGLNkXI0k362fYHU+o/hQu67bZe1WNUgcvuxoTX 0eZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=sEWZvXM5E6dFN/BXAPQZSHMpwgCE5Juuy7Th5wRM5yk=; b=5oxkJBFtIReNmTZ4zcFuyMHqnAJKMRD1y1f/6ywJs5BrO98RZ3NQs9dlyJE1u5YzMK m8DNpAndt31CVEJ02yAkXyu3xVGJcx+0FePTxMmcLpgOdYYLS78k7TtQ14vsRpU79tUS SK4fCE96ZI8U+G02cUHf8/D+xPZacl6kWqDQUoAuWQidhfKp/fypWIr4Y9JcehHKAd5z tzsMUBzyD82tV2vsi0JR54o8NkROPf4TcitgerAJBi1S6//cfkOM8uQrf1wyHUTbT38P eU9JZa8pEueSnJwn/+GLma9aIBL9+nPvnaMOeH8z/gRIJ9/+7PQZqV6/U9ljNHyO0j7h AYLQ== X-Gm-Message-State: ACrzQf0FYkTQRRAhkFh7lECUfSgV0swD3xLXjoK/Rj5hxgGlcUPtwrk8 WLQZXtyyOTMXHQpByI97oobAehIhASU= X-Google-Smtp-Source: AMsMyM6cK55ZN8/SxnxozUnjkAYNS8tYM8gdiIsB4yUoEYrIhK6eYVe0a+Q3BeArLSzRMVXgnC+N8g== X-Received: by 2002:a1c:cc1a:0:b0:3cf:7055:c010 with SMTP id h26-20020a1ccc1a000000b003cf7055c010mr3399024wmb.136.1667216859325; Mon, 31 Oct 2022 04:47:39 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m11-20020adfa3cb000000b002366e3f1497sm7017965wrb.6.2022.10.31.04.47.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 04:47:38 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/13] python3-cryptography: convert to cargo-update-recipe-crates class Date: Mon, 31 Oct 2022 12:47:09 +0100 Message-Id: <20221031114719.2725967-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031114719.2725967-1-alex@linutronix.de> References: <20221031114719.2725967-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 ; Mon, 31 Oct 2022 11:47:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172305 This allows semi-automated updates to the list of crates, which is far too awkward to maintain by hand, particularly on version updates. Signed-off-by: Alexander Kanavin --- .../python/python3-cryptography-crates.inc | 58 +++++++++++++++++++ .../python/python3-cryptography_38.0.1.bb | 58 +------------------ 2 files changed, 61 insertions(+), 55 deletions(-) create mode 100644 meta/recipes-devtools/python/python3-cryptography-crates.inc diff --git a/meta/recipes-devtools/python/python3-cryptography-crates.inc b/meta/recipes-devtools/python/python3-cryptography-crates.inc new file mode 100644 index 0000000000..9339a15091 --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography-crates.inc @@ -0,0 +1,58 @@ +# Autogenerated with 'bitbake -c update_crates python3-cryptography' + +SRC_URI += " \ + crate://crates.io/Inflector/0.11.4 \ + crate://crates.io/aliasable/0.1.3 \ + crate://crates.io/android_system_properties/0.1.5 \ + crate://crates.io/asn1/0.12.2 \ + crate://crates.io/asn1_derive/0.12.2 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/base64/0.13.0 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/bumpalo/3.10.0 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/chrono/0.4.22 \ + crate://crates.io/core-foundation-sys/0.8.3 \ + crate://crates.io/iana-time-zone/0.1.47 \ + crate://crates.io/indoc/0.3.6 \ + crate://crates.io/indoc-impl/0.3.6 \ + crate://crates.io/instant/0.1.12 \ + crate://crates.io/js-sys/0.3.59 \ + crate://crates.io/libc/0.2.132 \ + crate://crates.io/lock_api/0.4.8 \ + crate://crates.io/log/0.4.17 \ + crate://crates.io/num-integer/0.1.45 \ + crate://crates.io/num-traits/0.2.15 \ + crate://crates.io/once_cell/1.14.0 \ + crate://crates.io/ouroboros/0.15.4 \ + crate://crates.io/ouroboros_macro/0.15.4 \ + crate://crates.io/parking_lot/0.11.2 \ + crate://crates.io/parking_lot_core/0.8.5 \ + crate://crates.io/paste/0.1.18 \ + crate://crates.io/paste-impl/0.1.18 \ + crate://crates.io/pem/1.1.0 \ + crate://crates.io/proc-macro-error/1.0.4 \ + crate://crates.io/proc-macro-error-attr/1.0.4 \ + crate://crates.io/proc-macro-hack/0.5.19 \ + crate://crates.io/proc-macro2/1.0.43 \ + crate://crates.io/pyo3/0.15.2 \ + crate://crates.io/pyo3-build-config/0.15.2 \ + crate://crates.io/pyo3-macros/0.15.2 \ + crate://crates.io/pyo3-macros-backend/0.15.2 \ + crate://crates.io/quote/1.0.21 \ + crate://crates.io/redox_syscall/0.2.16 \ + crate://crates.io/scopeguard/1.1.0 \ + crate://crates.io/smallvec/1.9.0 \ + crate://crates.io/syn/1.0.99 \ + crate://crates.io/unicode-ident/1.0.3 \ + crate://crates.io/unindent/0.1.10 \ + crate://crates.io/version_check/0.9.4 \ + crate://crates.io/wasm-bindgen/0.2.82 \ + crate://crates.io/wasm-bindgen-backend/0.2.82 \ + crate://crates.io/wasm-bindgen-macro/0.2.82 \ + crate://crates.io/wasm-bindgen-macro-support/0.2.82 \ + crate://crates.io/wasm-bindgen-shared/0.2.82 \ + crate://crates.io/winapi/0.3.9 \ + crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ +" diff --git a/meta/recipes-devtools/python/python3-cryptography_38.0.1.bb b/meta/recipes-devtools/python/python3-cryptography_38.0.1.bb index 905293a43e..68679b745a 100644 --- a/meta/recipes-devtools/python/python3-cryptography_38.0.1.bb +++ b/meta/recipes-devtools/python/python3-cryptography_38.0.1.bb @@ -16,63 +16,11 @@ SRC_URI += "\ file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ file://check-memfree.py \ file://run-ptest \ - crate://crates.io/Inflector/0.11.4 \ - crate://crates.io/aliasable/0.1.3 \ - crate://crates.io/android_system_properties/0.1.5 \ - crate://crates.io/asn1/0.12.2 \ - crate://crates.io/asn1_derive/0.12.2 \ - crate://crates.io/autocfg/1.1.0 \ - crate://crates.io/base64/0.13.0 \ - crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/bumpalo/3.10.0 \ - crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/chrono/0.4.22 \ - crate://crates.io/core-foundation-sys/0.8.3 \ - crate://crates.io/iana-time-zone/0.1.47 \ - crate://crates.io/indoc-impl/0.3.6 \ - crate://crates.io/indoc/0.3.6 \ - crate://crates.io/instant/0.1.12 \ - crate://crates.io/js-sys/0.3.59 \ - crate://crates.io/libc/0.2.132 \ - crate://crates.io/lock_api/0.4.8 \ - crate://crates.io/log/0.4.17 \ - crate://crates.io/num-integer/0.1.45 \ - crate://crates.io/num-traits/0.2.15 \ - crate://crates.io/once_cell/1.14.0 \ - crate://crates.io/ouroboros/0.15.4 \ - crate://crates.io/ouroboros_macro/0.15.4 \ - crate://crates.io/parking_lot/0.11.2 \ - crate://crates.io/parking_lot_core/0.8.5 \ - crate://crates.io/paste-impl/0.1.18 \ - crate://crates.io/paste/0.1.18 \ - crate://crates.io/pem/1.1.0 \ - crate://crates.io/proc-macro-error-attr/1.0.4 \ - crate://crates.io/proc-macro-error/1.0.4 \ - crate://crates.io/proc-macro-hack/0.5.19 \ - crate://crates.io/proc-macro2/1.0.43 \ - crate://crates.io/pyo3-build-config/0.15.2 \ - crate://crates.io/pyo3-macros-backend/0.15.2 \ - crate://crates.io/pyo3-macros/0.15.2 \ - crate://crates.io/pyo3/0.15.2 \ - crate://crates.io/quote/1.0.21 \ - crate://crates.io/redox_syscall/0.2.16 \ - crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/smallvec/1.9.0 \ - crate://crates.io/syn/1.0.99 \ - crate://crates.io/unicode-ident/1.0.3 \ - crate://crates.io/unindent/0.1.10 \ - crate://crates.io/version_check/0.9.4 \ - crate://crates.io/wasm-bindgen/0.2.82 \ - crate://crates.io/wasm-bindgen-backend/0.2.82 \ - crate://crates.io/wasm-bindgen-macro-support/0.2.82 \ - crate://crates.io/wasm-bindgen-macro/0.2.82 \ - crate://crates.io/wasm-bindgen-shared/0.2.82 \ - crate://crates.io/winapi/0.3.9 \ - crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ - crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ " -inherit pypi python_setuptools3_rust +require ${BPN}-crates.inc + +inherit pypi python_setuptools3_rust cargo-update-recipe-crates DEPENDS += " \ ${PYTHON_PN}-cffi-native \ From patchwork Mon Oct 31 11:47:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 14595 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 F048AFA3745 for ; Mon, 31 Oct 2022 11:47:50 +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.web08.8156.1667216861590470092 for ; Mon, 31 Oct 2022 04:47:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ohZjfans; 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 w14so15563075wru.8 for ; Mon, 31 Oct 2022 04:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=2yjxxbyGqy15ZxT9T36WGz0f5Fnmi78eM45j6coh6kg=; b=ohZjfans8kxEC6eYr56ynQmLejM3Dz6Icm/ZFjL3eIrUNRLjDeAWfcye3v/jslc8gY td5QsTLdwp7L+VDzpOXe2lQCBzbYplcWZkIkyLLgYzpGnYDKaCGegO/kOQ/4iYmN5wPU ZQkMCVk6My8mfoxVYkRGiK3sZGfC2lIvt3WlkAiRMMGfjzGdAznNUKQ5dMx9fVjypMH/ fiGJvT2PsRhK7x9s+DcSuPAy78MlBe7ALl9C7EUJeLErigAmKja8No3FB916kvofWdty mqzpTJpoGcPen/G8pw66jl4EpHZiI8Fp51/DkiXuNdmflgER+F6wI+BU5j3pq5uNQC3s ZkXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=2yjxxbyGqy15ZxT9T36WGz0f5Fnmi78eM45j6coh6kg=; b=UV6mSOkCcCFRNN46LeFilr3fFiZ/4DCpalJr4fqgO80sMsOK36jKMLa52ZUWufQ7+5 Q4ythmkjbLwOuzYy6U93AuULyuFXo91TZcY5W+bhJCw+BLqD53Qw1MtMKN7/RHfpq/nH aUDbUtsGuXisXQRi+4ble19g1a8Hwz3VlMsH+M9ZZFZ0LpcMZHWdR6WsLDBSjusU1UJX gOseAzfnrQXeGUxTLEk7QgNkqabQm7pjsv/tYjr9o3lBlvemyX7HHq3YLu+E9LoXQ6ep StGXlO5NcK/LA2VY9BN93HVcXevW2J2bDOoIUEx48akM+4urdLxYaHnNS7sN+CXXZrDh W4KA== X-Gm-Message-State: ACrzQf0CAmOUSfJeiKL0zkJoUR362gpUlk7IbVj4k+SnZ/aIy3JncmTw yiMH9cyVBZ4TUmvZJmBLZvtIN/YcvKE= X-Google-Smtp-Source: AMsMyM7oDV7zJJ5mwUAyZffuj8OBl7ZTtMXY65OUbsn8UTuF5hA8SyPNLq5KdLzU3wZZHeAapN6r7A== X-Received: by 2002:adf:ebcf:0:b0:22c:9eb4:d6f6 with SMTP id v15-20020adfebcf000000b0022c9eb4d6f6mr7852642wrn.251.1667216860101; Mon, 31 Oct 2022 04:47:40 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m11-20020adfa3cb000000b002366e3f1497sm7017965wrb.6.2022.10.31.04.47.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 04:47:39 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/13] groff: submit patches upstream Date: Mon, 31 Oct 2022 12:47:10 +0100 Message-Id: <20221031114719.2725967-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031114719.2725967-1-alex@linutronix.de> References: <20221031114719.2725967-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 ; Mon, 31 Oct 2022 11:47:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172306 Signed-off-by: Alexander Kanavin --- .../groff/files/0001-Make-manpages-mulitlib-identical.patch | 2 +- .../groff/files/0001-replace-perl-w-with-use-warnings.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch index 9105da6457..c3cfc7cea8 100644 --- a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch +++ b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch @@ -3,7 +3,7 @@ From: Jeremy Puhlman Date: Sat, 7 Mar 2020 00:59:13 +0000 Subject: [PATCH] Make manpages mulitlib identical -Upstream-Status: Pending +Upstream-Status: Submitted [by email to g.branden.robinson@gmail.com] Signed-off-by: Jeremy Puhlman --- Makefile.am | 2 +- diff --git a/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch index eda6a40f51..b028fa20aa 100644 --- a/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch +++ b/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch @@ -15,7 +15,7 @@ doesn't work: So replace "perl -w" with "use warnings" to make it work. -Upstream-Status: Pending +Upstream-Status: Submitted [by email to g.branden.robinson@gmail.com] Signed-off-by: Robert Yang From patchwork Mon Oct 31 11:47:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 14596 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 16EDDFA374D for ; Mon, 31 Oct 2022 11:47:51 +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.8160.1667216862429033594 for ; Mon, 31 Oct 2022 04:47:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=V1enIKsc; 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 l14so15612572wrw.2 for ; Mon, 31 Oct 2022 04:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=9nH5UlAOwGTofsSrXiyl68M/iDgLw7K7Ll7b5UoqcDE=; b=V1enIKscVnueXjD5Qh4GD7o2vwCiqYXE6fmDnabuaIUdOp57ubGQGjbGXYLZULJx7D +QCAfEIn9DuDtJcoBXOpoZ1MUmYUiT2JXGBEvySXFZ6XIEM34HXAfj7+LyiFKyZhx4jY 5zad0aQOqt0zZykCrAwkxy7eZPFdsYUCKngNG1pHYy6LeO8FmT+IpPAcGUq0bZVSQtWy MXTROgOv6LMZuweB3HRbB9NofnkLZVWiU1iftza3etNk8iaDojwDr6I6vJ05oPCMKkRg 910DOTEd40filr4LX8GHQ9N9+8Yd1hlVR1n1bviZhSMDx55PRcQ4ML3kVM1u0917S6cp Q1zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=9nH5UlAOwGTofsSrXiyl68M/iDgLw7K7Ll7b5UoqcDE=; b=y92gFn+B8ftRJPxVSwf09bINd/rI973tSUJ7YUF5oAnjhU0tlABlPKBSng6w6KWTsC 93oBe2ySMi04optTjtt1F5EXh62QPgLsx4LwEi0eYK5t56knHlIcYvzlvHoURAuEz/4D t9Vt3a1aPLJuAU+PiDvkKw4Vogff4SSCvTaLsi5Qwt0O+yth0nFUnLGI2g154ZONuekE N1CcLWMtT4zYpcthSJET3QflgqVqXflXWBtZ1vcszloCz5ZNglyi6NKNUrzqTs0IC+JI dKqf9mBAOpdEfgEFd3CC86bQNFKz+s4ZASMSwZg/+pAOurYsJqiKTg0KBxzFUJ0qDHMI L4mA== X-Gm-Message-State: ACrzQf1977NrkJ50Ewv9ogJq77k/tsWp3VhbvQ8OcvkG27ziz95vldDd 0ZZ07oXCfuyJYIUFcz827yG/sFUgdVA= X-Google-Smtp-Source: AMsMyM6pQR2to9iLH7Kr/lyokoyjJn4yD9BCaimL234h/WvENgqJ1K58z48cfaNf1HXc5c8IpS2SJw== X-Received: by 2002:adf:f58e:0:b0:236:a8b2:373 with SMTP id f14-20020adff58e000000b00236a8b20373mr7903251wro.575.1667216860907; Mon, 31 Oct 2022 04:47:40 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m11-20020adfa3cb000000b002366e3f1497sm7017965wrb.6.2022.10.31.04.47.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 04:47:40 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/13] tcl: correct patch status Date: Mon, 31 Oct 2022 12:47:11 +0100 Message-Id: <20221031114719.2725967-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031114719.2725967-1-alex@linutronix.de> References: <20221031114719.2725967-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 ; Mon, 31 Oct 2022 11:47:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172307 Signed-off-by: Alexander Kanavin --- .../recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch index 44b2ce0a30..5a10c93a31 100644 --- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch +++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch @@ -1,4 +1,4 @@ -Upstream-Status: Pending +Upstream-Status: Inappropriate [upstream does not support installed tests] Index: unix/Makefile.in =================================================================== From patchwork Mon Oct 31 11:47:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 14590 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 DF9D9FA3742 for ; Mon, 31 Oct 2022 11:47:50 +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.web12.8314.1667216863355081333 for ; Mon, 31 Oct 2022 04:47:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eJlI3eTs; 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 t4so6963712wmj.5 for ; Mon, 31 Oct 2022 04:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=KMSWH+drMsjYQY9jJSI8oQ7BW29FdqpWVjWqLoG5D00=; b=eJlI3eTsKA5VtMOX3Oof554np4CfhYlcyai2AoPC+lzMxgVsoP/MvPCRqe1ir8HgcN fEwVBqSvdu6/87IeoGJwu58pIDauXZ2wqPMwGimVrvLrGEZgLFk0srb/oCTdLOEHxOI3 XuyusdQPi8Al+7XtgE6BKziDsGnzpVmnXEdZXDPcagn5qIkY5zJllwOxuRnT2N9qe5oe RTcvhjmYqg6XDSyh5bmxXmflnbjvq9ajFcWESLlLTwyTpGPiUykM8NEPbhmorfjjX3tN W+W+joNdEtMjGPKulefXgpbjLQEKsveUn0JiYEJXGhkto2xafsJxcP+94cxuAQhUDpeL H1xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=KMSWH+drMsjYQY9jJSI8oQ7BW29FdqpWVjWqLoG5D00=; b=nR1tw55D1PDzmCW0qCC1MfF0/Ss6eyXIF4dQEmEgRW6m3spugaMc3SF2wHjx59v0tF m43rcaaCOLTjZSvowF+rVIeHpAUdiJcGb6IK8H9C4JgbQ7E00fQ3qEykuesNtEJQAX8e tR4XNJpmpPa1nIvpK5bDF2OZKYCAPX5mMrOE3RaGx7no1AQS8JHRjS6vZXQ0IdQ4rx3r m487TCxc4itSS8hHfKGboU96LzUFGbO5CYpdCTF980gDrVe9C8m8Rj5/6pd6wx/sMqEI aX1DFrKzDoJ6SIsNC+uWMN/UYGpw51QkNf97fj06LNxLaxVMF239taWEpzebEMNVLWRK IFCw== X-Gm-Message-State: ACrzQf24/tykdsWgVS1dabog7s+/OoNWBJctXrjIFYZsNA2jIH3yNVc0 UXWeLkEWiCfKv+nX4UMNtDmkB4OluY8= X-Google-Smtp-Source: AMsMyM4jthwS54Siw5Bv7sDJPxuM2u6PvX6JFSZSRG1Iz1HcBnm+l34vi4syXp3+/rrNm9yWtAPF1w== X-Received: by 2002:a1c:46c5:0:b0:3cf:75ac:101a with SMTP id t188-20020a1c46c5000000b003cf75ac101amr1412111wma.196.1667216861708; Mon, 31 Oct 2022 04:47:41 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m11-20020adfa3cb000000b002366e3f1497sm7017965wrb.6.2022.10.31.04.47.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 04:47:41 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/13] tcl: correct upstream version check Date: Mon, 31 Oct 2022 12:47:12 +0100 Message-Id: <20221031114719.2725967-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031114719.2725967-1-alex@linutronix.de> References: <20221031114719.2725967-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 ; Mon, 31 Oct 2022 11:47:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172308 Sourceforge does not report the latest version reliably. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb index 9f6b003ffb..f8b2a69b9f 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb @@ -33,6 +33,7 @@ SRC_URI:class-native = "${BASE_SRC_URI}" # https://core.tcl-lang.org/tcl/info/7079e4f91601e9c7 CVE_CHECK_IGNORE += "CVE-2021-35331" +UPSTREAM_CHECK_URI = "https://www.tcl.tk/software/tcltk/download.html" UPSTREAM_CHECK_REGEX = "tcl(?P\d+(\.\d+)+)-src" S = "${WORKDIR}/${BPN}${PV}" From patchwork Mon Oct 31 11:47:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 14597 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 16EAEFA374C for ; Mon, 31 Oct 2022 11:47:51 +0000 (UTC) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.groups.io with SMTP id smtpd.web10.8228.1667216864073397226 for ; Mon, 31 Oct 2022 04:47:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WNAGTTw+; spf=pass (domain: gmail.com, ip: 209.85.221.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f42.google.com with SMTP id y16so15548650wrt.12 for ; Mon, 31 Oct 2022 04:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=hxfbVlbLYi+uzfUga4SKocqtw99lnj2f+xHloiv1tss=; b=WNAGTTw+G61Nn9wrEpSQZlF0oZfsGdEODrnzyUcqT01TKOYaCOgrNVEpnMV3Gw0HKa 0nJ+/WJnhEpMC9n6o5GgjX66XjhOlc+owV0cglV7hL/1BXXXOxrh3GEC+381CIDR+dnn nQG0/0WVI+d+sSGuwq9+jmZjhjMgNG1jJ2zUAk2hII2ti27bGlnRN9gv3g9rtk1k25up epQ5iqGGtqP3mBRyrc30lEVrFqNEQSfFtajvgQS5I8h+FKq2ZXBiOOuScY68eJFvOozK kxf99IuruTrztxlDj9YZxujVlPQmn52yiRkixl0hqB54Ir3A35OgRlZD6aVmmv74rl0n FpzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=hxfbVlbLYi+uzfUga4SKocqtw99lnj2f+xHloiv1tss=; b=4oQp9HsOIUVolzfkwfg4lMLPrqCZw6pkoE2NNTU0E4zkny0JzwRbHYm2awmdeIQfv8 EwD1APjc1OrqKzEMJA02r6/jCh9cQOgRH2vOnusqSEQrcFFlig7VACdjzJxC2HTQ2Qp6 8Vpluiu9/RrW6e5VYn3rCyMkPuBqB4v21IwjKdVjaw2VCpDHEDndSIkBUlNM8yAnOD6e MBYoNLzKybLYqgX3BDcAXhb/oFc9rzlNI9PvwkQC2EXly469Ej/5tjAOrdDKthKrlXOb sSy1rK0XINMdN+4V9uYrtrVzHcCSv/fLq9K8Q3ESTsvTzrUnd+m6CLOUmu/bJ0KbMXSD lEzw== X-Gm-Message-State: ACrzQf0FVuknZ04d/IF1NHcu1mWe5zoSoXxL2uubPbb8yRdmU8MFqq88 yo4n2azj1R0apI1gnH606NkvUdTeop4= X-Google-Smtp-Source: AMsMyM7eWZng29X+HWBtRazxpOnrc7aD+n8+i1fH7wTcg4FoOXOj1ybzcyZMwJcWdebiDvuNhTN2aw== X-Received: by 2002:a5d:50cf:0:b0:236:86df:257f with SMTP id f15-20020a5d50cf000000b0023686df257fmr7826052wrt.374.1667216862553; Mon, 31 Oct 2022 04:47:42 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m11-20020adfa3cb000000b002366e3f1497sm7017965wrb.6.2022.10.31.04.47.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 04:47:42 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/13] lttng-tools: submit determinism.patch upstream Date: Mon, 31 Oct 2022 12:47:13 +0100 Message-Id: <20221031114719.2725967-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031114719.2725967-1-alex@linutronix.de> References: <20221031114719.2725967-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 ; Mon, 31 Oct 2022 11:47:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172309 Signed-off-by: Alexander Kanavin --- meta/recipes-kernel/lttng/lttng-tools/determinism.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/lttng/lttng-tools/determinism.patch b/meta/recipes-kernel/lttng/lttng-tools/determinism.patch index b2ab880bd6..0a897a8e13 100644 --- a/meta/recipes-kernel/lttng/lttng-tools/determinism.patch +++ b/meta/recipes-kernel/lttng/lttng-tools/determinism.patch @@ -13,7 +13,7 @@ to me whether the tests need that or not. Fixes reproducibility issues for lttng-tools. -Upstream-Status: Pending [needs discussion with upstream about the correct solution] +Upstream-Status: Submitted [https://bugs.lttng.org/issues/1361 - needs discussion with upstream about the correct solution] RP 2021/3/1 Index: lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am From patchwork Mon Oct 31 11:47:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 14598 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 0EE40FA374B for ; Mon, 31 Oct 2022 11:47:51 +0000 (UTC) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.groups.io with SMTP id smtpd.web12.8315.1667216864938150048 for ; Mon, 31 Oct 2022 04:47:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=f+/we6Kr; spf=pass (domain: gmail.com, ip: 209.85.221.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f51.google.com with SMTP id o4so15589848wrq.6 for ; Mon, 31 Oct 2022 04:47:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=ggL70Fc95T6XRKk/zzRPiRKHz4Aaze2/73IvR3CWKJU=; b=f+/we6KrczjKyNvnSDCL0Xd/1QIBKHid6IW12icvN5cjPju1tvBJpznURH7Q+bw85V r9gYpGw4gHHxBnqMZneD3bXZTPsEsrb+mLGGHrts3TNbAqJwwgNmjiU3+CfriK7+/6/3 tIe1qGNCHnFB8fTce1n4Raw/5fH/V0BrtimLUklAsc+lLY/FLQRM5cebamSqDqQXTmZS 4YhfjpRjWcqarwf/qsJmvLrT64tkl7/2zQ17D42Ehcs7jr3cXhWvPb70AsitgC+2xfMj p2s7XVdBPK7YNcd1vJjmFh2v+cgyaP+f9KMG2KRSbtn8oZWYT/RrrJhqkWlzrQBBoZtK teFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=ggL70Fc95T6XRKk/zzRPiRKHz4Aaze2/73IvR3CWKJU=; b=J3/XLPCYuLH0Iv/euDnHDxWTee9NnhB9PfS6WwVjP+w6u2FTVR6pI+GfCNfEftleNe Tlf2r9NeU1wj6aIGreOBCNJ/wkB6V45Dkmt4u0uIHuFGD3qMkY7kVMN4zgcatA5As/El wGO2R6UfDmH76AFEA6vRrP6W3NqBPziY3H1f25q5onjQ5kg3WHoFpOt3nzPBBjovYe65 ePgzSeZYLKOeZcLwJ/PBjCKqFJCH/CUsekJfXvQgOuCkC0ELbNXdaCM9ZM4fN8pnkyUO XgOH4m/BUW/xB6MzeLGzk7WX5OfIa4mEDbc0OTTKYt7R6LYWaohmdb7EJSRMHozgdwVb Mm9A== X-Gm-Message-State: ACrzQf3O1lCCk42gdxVcbEBlSZ8mwENbkBfjhkzQ2/vAKutUvp679YHL sNbHmL0yIcMBQwcKkiujPDqolbCClzY= X-Google-Smtp-Source: AMsMyM5fltIbahS6YO6YH2J350bnZwO8halZdcICT0heWWMBczMYBpYBEiAygqmakaMqpMPVqfhL1Q== X-Received: by 2002:adf:e992:0:b0:236:70ad:3bd9 with SMTP id h18-20020adfe992000000b0023670ad3bd9mr7748361wrm.136.1667216863274; Mon, 31 Oct 2022 04:47:43 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m11-20020adfa3cb000000b002366e3f1497sm7017965wrb.6.2022.10.31.04.47.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 04:47:42 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/13] cmake: drop qt4 patches Date: Mon, 31 Oct 2022 12:47:14 +0100 Message-Id: <20221031114719.2725967-8-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031114719.2725967-1-alex@linutronix.de> References: <20221031114719.2725967-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 ; Mon, 31 Oct 2022 11:47:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172310 Qt4 has been dead for a very long time now. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/cmake/cmake.inc | 2 - ...t-OpenEmbedded-Qt4-tool-binary-names.patch | 56 ------------- ...-if-system-Qt-installation-is-broken.patch | 79 ------------------- 3 files changed, 137 deletions(-) delete mode 100644 meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch delete mode 100644 meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 1ede8eee61..7561e851c6 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -17,8 +17,6 @@ LIC_FILES_CHKSUM = "file://Copyright.txt;md5=45025187a129339459b6f1a24f7fac6e \ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ - file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ - file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " SRC_URI[sha256sum] = "0d9020f06f3ddf17fb537dc228e1a56c927ee506b486f55fe2dc19f69bf0c8db" diff --git a/meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch b/meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch deleted file mode 100644 index 575a5cb7fb..0000000000 --- a/meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2d02ac91d5a5d72eaddba4894eaa6db3ed8fee62 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Thu, 12 May 2011 15:36:03 +0000 -Subject: [PATCH] cmake: support OpenEmbedded Qt4 tool binary names - -The FindQt4 module looks for Qt4 binaries to be able to gather the -paths used for compilation and also to be using during other processes -(translation update, translation binary generating and like) however -OpenEmbedded has renamed those to allow old QMake to be used in -parallel with the current one. This patch adds support for the -OpenEmbedded specific binary names. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Otavio Salvador - -The patch was slightly adapted in order to match cmake 3.2.2: -Instead of find_program, _find_qt4_program is now used. - -Signed-off-by: Moritz Blume -Signed-off-by: Otavio Salvador - ---- - Modules/FindQt4.cmake | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake -index 3993968..b2a8585 100644 ---- a/Modules/FindQt4.cmake -+++ b/Modules/FindQt4.cmake -@@ -518,7 +518,7 @@ endfunction() - - set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) - --set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac) -+set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac) - _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) - - if (QT_QMAKE_EXECUTABLE AND -@@ -1136,12 +1136,12 @@ if (QT_QMAKE_EXECUTABLE AND - _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc) - _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic) - _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) -- _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc) -- _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml) -- _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp) -+ _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc4 rcc) -+ _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml4 qdbuscpp2xml) -+ _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp4 qdbusxml2cpp) - _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate4 lupdate) - _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4 lrelease4 lrelease) -- _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator) -+ _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4) - _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer4 designer) - _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist) - diff --git a/meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch b/meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch deleted file mode 100644 index 1b196db81a..0000000000 --- a/meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 60864efbe52cc12018efaafbc4e4c3c8b4af2b65 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Thu, 5 Jul 2018 10:26:48 -0300 -Subject: [PATCH] Fail silently if system Qt installation is broken - -Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the -following error if the system Qt installation is broken: - -CMake Error at Modules/FindQt4.cmake:1028 (set_property): - set_property could not find TARGET Qt4::QtCore. Perhaps it has not yet - been created. -Call Stack (most recent call first): - Tests/RunCMake/CMakeLists.txt:79 (find_package) - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton - -The patch was slightly adapted in order to match cmake 3.2.2: -Another set_property was introduced which had to be included -within the if(QT_QTCORE_FOUND) statement. - -Signed-off-by: Moritz Blume -Signed-off-by: Otavio Salvador - ---- - Modules/FindQt4.cmake | 39 ++++++++++++++++++++------------------- - 1 file changed, 20 insertions(+), 19 deletions(-) - -diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake -index b2a8585..77c89aa 100644 ---- a/Modules/FindQt4.cmake -+++ b/Modules/FindQt4.cmake -@@ -988,25 +988,26 @@ if (QT_QMAKE_EXECUTABLE AND - endif() - endmacro() - -- -- # Set QT_xyz_LIBRARY variable and add -- # library include path to QT_INCLUDES -- _QT4_ADJUST_LIB_VARS(QtCore) -- set_property(TARGET Qt4::QtCore APPEND PROPERTY -- INTERFACE_INCLUDE_DIRECTORIES -- "${QT_MKSPECS_DIR}/default" -- ${QT_INCLUDE_DIR} -- ) -- set_property(TARGET Qt4::QtCore APPEND PROPERTY -- INTERFACE_COMPILE_DEFINITIONS -- $<$>:QT_NO_DEBUG> -- ) -- set_property(TARGET Qt4::QtCore PROPERTY -- INTERFACE_QT_MAJOR_VERSION 4 -- ) -- set_property(TARGET Qt4::QtCore APPEND PROPERTY -- COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION -- ) -+ if(QT_QTCORE_FOUND) -+ # Set QT_xyz_LIBRARY variable and add -+ # library include path to QT_INCLUDES -+ _QT4_ADJUST_LIB_VARS(QtCore) -+ set_property(TARGET Qt4::QtCore APPEND PROPERTY -+ INTERFACE_INCLUDE_DIRECTORIES -+ "${QT_MKSPECS_DIR}/default" -+ ${QT_INCLUDE_DIR} -+ ) -+ set_property(TARGET Qt4::QtCore APPEND PROPERTY -+ INTERFACE_COMPILE_DEFINITIONS -+ $<$>:QT_NO_DEBUG> -+ ) -+ set_property(TARGET Qt4::QtCore PROPERTY -+ INTERFACE_QT_MAJOR_VERSION 4 -+ ) -+ set_property(TARGET Qt4::QtCore APPEND PROPERTY -+ COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION -+ ) -+ endif() - - foreach(QT_MODULE ${QT_MODULES}) - _QT4_ADJUST_LIB_VARS(${QT_MODULE}) From patchwork Mon Oct 31 11:47:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 14593 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 0A99AFA374A for ; Mon, 31 Oct 2022 11:47:51 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web10.8229.1667216865687706137 for ; Mon, 31 Oct 2022 04:47:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Sc3R7xaX; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id a14so15589664wru.5 for ; Mon, 31 Oct 2022 04:47:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=6/lgv/rMKTQ39t4rxoShtOGTUc66GZsZovaTLNT6cME=; b=Sc3R7xaXM4LFbcbff97upchXMgnpMwmFVMqPsMDmqMLerFy3+Mty/vIr8tddxEg2Pu uj+RO9D8dJBIZaBWxX45uTTsPM2a1kT5GU1+OSf4gtfJv8wbKflr4LyklxtlDvGP2aQl mNiW13mJFDsJikVN6M30+ecf1QOn7Aq7ZRFIrVS7qrqA9FgE4DStz7ToV41idYY9MbDK 9EKIJpCVNpoLktc+LW/3WoH+SuXrrjtwVyz42oxsSoWCf43z/WUDVUHJe7lL+VjQHOIU wsYKd2z2KXSU+FYWUNdsGPnuPP32bsNl9ebGLlMqy9KZvMjzYFxr8NfEHpydGsD8Oqul dtvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=6/lgv/rMKTQ39t4rxoShtOGTUc66GZsZovaTLNT6cME=; b=QgOPkRyS0dy9QGFuBwFs9XTh1gDRY0SbOs+B0B9gS8mZc0FVXg1skSvHKuAJO5L59K xDEWjUc0V1EgNjH6+Ze3zUo82AL6TPixAZGpp0Nivn0sIJB/rlr7r2kwJCwkaIC8edii 0L0JaeuseXirObCWLN8TY4WUu6pxQoo9edTLE+A33hro0T5lX0/QDP9oAQfWp+uTIfPK Se8MMDZeiRzFL6nrE6fP+5w10OC4LJWNAbje2Q/f7t/md28+VT/yoT/LCUc7XE3/Ym8I KbD7cOl91WgSBah8Zk8w7YzdpHePo6ilM+sc4KBSGcnu1nxUtY0y3PnONBApvRT4uUAY PHZQ== X-Gm-Message-State: ACrzQf2jUU6e4+43BZXLFvHIM7zlIPxbHQFuYLshoUc8lp9PX8Yaqhvi xev0LDFRCsWPza3QvS7UwctHBi1yNAI= X-Google-Smtp-Source: AMsMyM48o//gx2HjBwK4oQGznkavsa2yNXWAD7jeQTFJIeQMbxvfu2apYiGrnWfqGMFRBZwKrwBgDQ== X-Received: by 2002:adf:fad2:0:b0:236:5577:eaef with SMTP id a18-20020adffad2000000b002365577eaefmr7889795wrs.293.1667216864207; Mon, 31 Oct 2022 04:47:44 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m11-20020adfa3cb000000b002366e3f1497sm7017965wrb.6.2022.10.31.04.47.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 04:47:43 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/13] kea: submit patch upstream Date: Mon, 31 Oct 2022 12:47:15 +0100 Message-Id: <20221031114719.2725967-9-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031114719.2725967-1-alex@linutronix.de> References: <20221031114719.2725967-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 ; Mon, 31 Oct 2022 11:47:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172311 Signed-off-by: Alexander Kanavin --- meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch index 78f475a495..451b409c88 100644 --- a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +++ b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch @@ -12,7 +12,7 @@ Subject: [PATCH] There are conflict of config files between kea and lib32-kea: Because they are all commented out, replace the expanded libdir path with '$libdir' in the config files to avoid conflict. -Upstream-Status: Pending +Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602] Signed-off-by: Kai Kang --- From patchwork Mon Oct 31 11:47:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 14594 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 0A948FA3748 for ; Mon, 31 Oct 2022 11:47:51 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web09.8091.1667216866681127925 for ; Mon, 31 Oct 2022 04:47:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=a49kdJGN; spf=pass (domain: gmail.com, ip: 209.85.221.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f43.google.com with SMTP id v1so15568598wrt.11 for ; Mon, 31 Oct 2022 04:47:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=4sJmiFAFNfRKqGi9RMxoZ6Of49oVeQoeu89zCmJgU9A=; b=a49kdJGN4P4QvYToI6FJq0ycTWteF2ZFpFiQ/RlfjDQHqPkzFvEyKF8nk4JmvtfE7J JAtdAax9LWCiqH/x6fpTOoTBrlVpxzyX/kDhYo7tg75iOTbxRF8vkiCiRkooVVKA64su u91VA2WHBe4dweFGM2KbyuGdGKFIHfHBtcDfMADxk5j2Mp1bVXrXQeXLKHUGX4/vJTve dGayil3AXagilI31dsRHjgoHQEsRQLlA4SG9Ka0Winrb19kCTc1nYM6leu2jxCIaXg9P 96ibPtqp31kYhm+LLfcs2FqJG4Z4uwKoHmOvNRORZ0gEW+ZVousMs95gmcIb+Yr096a6 2YzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=4sJmiFAFNfRKqGi9RMxoZ6Of49oVeQoeu89zCmJgU9A=; b=1QNUqG9FI3z9coMrTqPddwtNimCST80T7ZAEbtOiVkRmUaoftjJNxMaXxJA7edh2V2 sW+4oS7NDTXhpiWXaJ04OTTYjbhyFutsY4dQQBfo4SmgEbY/67/LhHkd3kDcMgnIopRV dvzGrt0SylBIUaUhQ0Oik6PZttTTUPt2flISJXQO+8oUU3KDTjcaeR8x2bsrl4yEKDgr /lp5sOxJHh7j4PqhLW1L4ln51aosuGUc5ReZNAI7ORIlxIbKJPjzPRMklSX4Cb/fkx1b OIjBtt0nTf8CZyMo5+nqfeo/SgLmTTheAeFZ5ZlcaypyTZ/aS5sV2XJvwoVTwDS1y9ip LZHg== X-Gm-Message-State: ACrzQf033x40Mpsb2sm/PMsn85hwEjytCiKc2f8LNYBH0O+V4irr+ytJ xnasP/D6/TeZfpYnBPdzhpnaWshYEzo= X-Google-Smtp-Source: AMsMyM4f18r9guxgruJNrf/0rWfdWDCdNV7IRD0t5nAq4MVU2GmqJlPPgorU6ylfPfRyqcRGRdUwKQ== X-Received: by 2002:adf:e7c7:0:b0:236:6994:a0b4 with SMTP id e7-20020adfe7c7000000b002366994a0b4mr8147672wrn.610.1667216865090; Mon, 31 Oct 2022 04:47:45 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m11-20020adfa3cb000000b002366e3f1497sm7017965wrb.6.2022.10.31.04.47.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 04:47:44 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/13] argp-standalone: replace with a maintained fork Date: Mon, 31 Oct 2022 12:47:16 +0100 Message-Id: <20221031114719.2725967-10-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031114719.2725967-1-alex@linutronix.de> References: <20221031114719.2725967-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 ; Mon, 31 Oct 2022 11:47:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172312 Remove two patches as issues fixed upstream, submit the third one. License-Update: argp.h is an import from glibc and has been refreshed to the latest version. It's still lgpl 2.1. Signed-off-by: Alexander Kanavin --- ...dalone_1.3.bb => argp-standalone_1.4.1.bb} | 12 ++- .../files/0001-throw-in-funcdef.patch | 84 ------------------- .../argp-standalone/files/0002-isprint.patch | 51 ----------- .../files/out_of_tree_build.patch | 2 +- 4 files changed, 6 insertions(+), 143 deletions(-) rename meta/recipes-support/argp-standalone/{argp-standalone_1.3.bb => argp-standalone_1.4.1.bb} (59%) delete mode 100644 meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch delete mode 100644 meta/recipes-support/argp-standalone/files/0002-isprint.patch diff --git a/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb b/meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb similarity index 59% rename from meta/recipes-support/argp-standalone/argp-standalone_1.3.bb rename to meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb index 8d8122612a..00b6036502 100644 --- a/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb +++ b/meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb @@ -3,18 +3,16 @@ SUMMARY = "Glibc hierarchical argument parsing standalone library" DESCRIPTION = "Standalone version of arguments parsing functions from GLIBC" -HOMEPAGE = "http://www.lysator.liu.se/~nisse/misc/" +HOMEPAGE = "https://github.com/ericonr/argp-standalone" LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://argp.h;beginline=1;endline=20;md5=008b7e53dea6f9e1d9fdef0d9cf3184a" +LIC_FILES_CHKSUM = "file://argp.h;beginline=1;endline=20;md5=464f2cfb1c35a5123f9e309d7afd79f8" SECTION = "libs" -SRC_URI = "http://www.lysator.liu.se/~nisse/misc/argp-standalone-${PV}.tar.gz \ - file://0001-throw-in-funcdef.patch \ - file://0002-isprint.patch \ +SRC_URI = "git://github.com/ericonr/argp-standalone;branch=master;protocol=https \ file://out_of_tree_build.patch \ " -SRC_URI[md5sum] = "720704bac078d067111b32444e24ba69" -SRC_URI[sha256sum] = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be" +SRCREV = "e5fe9ad9e83e6765cf8fa787f903d4c6792338b5" +S = "${WORKDIR}/git" inherit autotools diff --git a/meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch b/meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch deleted file mode 100644 index a6e2759c5d..0000000000 --- a/meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch +++ /dev/null @@ -1,84 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - - -No __THROW in function implementation. - --jsaw - -Taken from buildroot - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- argp-standalone-1.4-test2/argp.h.orig 2006-01-06 02:29:59.000000000 +0100 -+++ argp-standalone-1.4-test2/argp.h 2006-01-06 02:41:10.000000000 +0100 -@@ -560,17 +560,17 @@ - # endif - - # ifndef ARGP_EI --# define ARGP_EI extern __inline__ -+# define ARGP_EI extern inline - # endif - - ARGP_EI void --__argp_usage (__const struct argp_state *__state) __THROW -+__argp_usage (__const struct argp_state *__state) - { - __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); - } - - ARGP_EI int --__option_is_short (__const struct argp_option *__opt) __THROW -+__option_is_short (__const struct argp_option *__opt) - { - if (__opt->flags & OPTION_DOC) - return 0; -@@ -582,7 +582,7 @@ - } - - ARGP_EI int --__option_is_end (__const struct argp_option *__opt) __THROW -+__option_is_end (__const struct argp_option *__opt) - { - return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; - } ---- argp-standalone-1.4-test2/argp-parse.c.orig 2006-01-06 02:47:48.000000000 +0100 -+++ argp-standalone-1.4-test2/argp-parse.c 2006-01-06 02:48:16.000000000 +0100 -@@ -1290,13 +1290,13 @@ - /* Defined here, in case a user is not inlining the definitions in - * argp.h */ - void --__argp_usage (__const struct argp_state *__state) __THROW -+__argp_usage (__const struct argp_state *__state) - { - __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); - } - - int --__option_is_short (__const struct argp_option *__opt) __THROW -+__option_is_short (__const struct argp_option *__opt) - { - if (__opt->flags & OPTION_DOC) - return 0; -@@ -1310,7 +1310,7 @@ - } - - int --__option_is_end (__const struct argp_option *__opt) __THROW -+__option_is_end (__const struct argp_option *__opt) - { - return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; - } diff --git a/meta/recipes-support/argp-standalone/files/0002-isprint.patch b/meta/recipes-support/argp-standalone/files/0002-isprint.patch deleted file mode 100644 index 1c07eea3c1..0000000000 --- a/meta/recipes-support/argp-standalone/files/0002-isprint.patch +++ /dev/null @@ -1,51 +0,0 @@ -Subject: restrict value range passed to isprint function - -According to C standards isprint argument shall be representable as an -unsigned char or be equal to EOF, otherwise the behaviour is undefined. - -Passing arbitrary ints leads to segfault in nm program from elfutils. - -Restrict isprint argument range to values representable by unsigned char. - -Signed-off-by: Max Filippov - -Taken from buildroot - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- -Index: b/argp.h -=================================================================== ---- a/argp.h -+++ b/argp.h -@@ -23,6 +23,7 @@ - - #include - #include -+#include - - #define __need_error_t - #include -@@ -577,7 +578,7 @@ - else - { - int __key = __opt->key; -- return __key > 0 && isprint (__key); -+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key); - } - } - -Index: b/argp-parse.c -=================================================================== ---- a/argp-parse.c -+++ b/argp-parse.c -@@ -1292,7 +1292,7 @@ - int __key = __opt->key; - /* FIXME: whether or not a particular key implies a short option - * ought not to be locale dependent. */ -- return __key > 0 && isprint (__key); -+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key); - } - } - diff --git a/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch b/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch index b7777cbd91..c863104430 100644 --- a/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch +++ b/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch @@ -2,7 +2,7 @@ Fix the testsuite to built out of tree in OE S != B Signed-off-by: Khem Raj -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/ericonr/argp-standalone/pull/9] Index: argp-standalone-1.3/testsuite/Makefile.am =================================================================== --- argp-standalone-1.3.orig/testsuite/Makefile.am From patchwork Mon Oct 31 11:47:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 14589 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 F089CFA3746 for ; Mon, 31 Oct 2022 11:47:50 +0000 (UTC) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.groups.io with SMTP id smtpd.web10.8230.1667216867236486199 for ; Mon, 31 Oct 2022 04:47:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Dkfi4zgK; spf=pass (domain: gmail.com, ip: 209.85.221.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f48.google.com with SMTP id cl5so3935656wrb.9 for ; Mon, 31 Oct 2022 04:47:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=7CY0g8YTY5aNNDvAy0Qyd81Qwu8ENi9vDGPndaecgOY=; b=Dkfi4zgKdBzjiaaju29LOThrbvSpa3h6OpO7EHeUE4gy2nmW3QJJCkCg0C0Cbw4vaJ dBNBuebV/6cE3HnuWFlYeosxMH1xiMzDnrpExM4fQsyiUvP3ECUHm2EG/t0VaWLBuDXj 61HEa8IfnNPbX8ANyKvgiAQqpNhSgv+A6/LvZYMfYsFYXm6i8hDJ8QF07ZdLW/VzYl0r h63qIiR8dobN/EgigfLRf0J8h2xYicfsNVULM/NJxnsisNku7w8TotrqcHulPXJEqqbJ VOXEvRNQM+Na4wro7Eq2L/4j5J+QOi9yWRDos/MJ3570yfuWZy6ybwDbOucUibOI8hJI ZElQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=7CY0g8YTY5aNNDvAy0Qyd81Qwu8ENi9vDGPndaecgOY=; b=egNdGOfJyyWgqS2iKA1Xlh7y/2JG/hlvYL/vGpVKT9OdBk8oUgufIl1rrLdE4MQ939 LvRXgVq84u0E7Xde0uO3x1jBlL5L0uQUnp35ap2OeT6XvmM5FfNc64wFjMUQb+Oenm/F QcVaeCVtWAciCta1q3MpfdAbaRwSzbMD0oE02fJaiO6+0PS85FaTMTwESSs5Q8ALgnop i0iJOmQTLirKR8Gi9rflQD3LoXtuseHLrWdEgqwLhubjDmiI/tcUkmjwXuvoIIBf+8SJ djActTiCP7NiiNYuW/5cyEVuVQW9CSkID0e407KprZRGfj+g1cq7K+wiyuRrIJDJ8GGu tYPA== X-Gm-Message-State: ACrzQf12AkfP1bs19mCxXcP0O34B+2i2f/3GTiqHIUAIl3HoAZKHjRkL CKOdiF3vu+rEbIMU8sYVvRM1uDQiYmo= X-Google-Smtp-Source: AMsMyM7CXbNM0QuHflHvvsEEu/+TUL49yyxdSF0VxQAu+9F2J2pxvkXqaGIYo6d437tlW7t1H+hmEA== X-Received: by 2002:adf:d1e5:0:b0:231:4ecf:7b7f with SMTP id g5-20020adfd1e5000000b002314ecf7b7fmr7863609wrd.678.1667216865745; Mon, 31 Oct 2022 04:47:45 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m11-20020adfa3cb000000b002366e3f1497sm7017965wrb.6.2022.10.31.04.47.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 04:47:45 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/13] ovmf: correct patches status Date: Mon, 31 Oct 2022 12:47:17 +0100 Message-Id: <20221031114719.2725967-11-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031114719.2725967-1-alex@linutronix.de> References: <20221031114719.2725967-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 ; Mon, 31 Oct 2022 11:47:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172313 Signed-off-by: Alexander Kanavin --- .../ovmf/0001-ovmf-update-path-to-native-BaseTools.patch | 2 +- ...seTools-makefile-adjust-to-build-in-under-bitbake.patch | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch index 89d9ffab5e..0c3df4fc44 100644 --- a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch +++ b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch @@ -10,7 +10,7 @@ tools. The BBAKE_EDK_TOOLS_PATH string is used as a pattern to be replaced with the appropriate location before building. Signed-off-by: Ricardo Neri -Upstream-Status: Pending +Upstream-Status: Inappropriate [oe-core cross compile specific] --- OvmfPkg/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch index f6141c8af5..2293d7e938 100644 --- a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch +++ b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch @@ -6,8 +6,13 @@ Subject: [PATCH 2/6] BaseTools: makefile: adjust to build in under bitbake Prepend the build flags with those of bitbake. This is to build using the bitbake native sysroot include and library directories. +Note from Alex: this is not appropriate for upstream submission as +the recipe already does lots of similar in-place fixups elsewhere, so +this patch shold be converted to follow that pattern. We're not going +to fight against how upstream wants to configure the build. + Signed-off-by: Ricardo Neri -Upstream-Status: Pending +Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups] --- BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) From patchwork Mon Oct 31 11:47:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 14591 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 0240FFA3747 for ; Mon, 31 Oct 2022 11:47:51 +0000 (UTC) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.groups.io with SMTP id smtpd.web11.8161.1667216868006867171 for ; Mon, 31 Oct 2022 04:47:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=C+5s/0Oi; spf=pass (domain: gmail.com, ip: 209.85.221.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f54.google.com with SMTP id h9so15641852wrt.0 for ; Mon, 31 Oct 2022 04:47:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=G3PRdCpxlPVOux084kD5BTVD7VzycqoHyk3J1lFrfDM=; b=C+5s/0OiGO34ZY+yBGFiBzUWIZsikf0Tl9R8hS9TPh9VA/GsfniLvarcFw/nNPbwHm jZ5C7NPUZY9PBIUOSqIEDqs7/XjP5ybt9A2VefhAENNAPFLAnkZDvF8HlQPgETlHL8no MC9JYOlGCy67p1c4PYHB6n0IQbeYXwnPLbEIuXepJUfcjBeGnsHZQIQrRD05vInu0eOP QA3OiSIMlUYsoh/61c60gsflG4WW85fA7e8jHa7Ym04QwR8f8IWkBlK2N4yYQknpxOA9 o1jpaWb9cuHk5IlGqZPD160AvSOYLdwI9yvB4HWYgeFyTPkdp0Q7bs9nIfUOPzNFlsB9 QYPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=G3PRdCpxlPVOux084kD5BTVD7VzycqoHyk3J1lFrfDM=; b=nXumuTju5zZE1OUE6K41R/WTS3UG/8phXWocdW9LwG0Rrga3ghrhzVyspFYYN6k4AA ausBXByb8kMPNwueXldZ76yQqoewYTMd8m97STbYQJzwYVOIoVLltVTr1xgKeHRQdRqm tbVdhavzcyBf/a4l+eFLtUZ8cegPq6LQVjITPJXI+OkYId6A4Pq742QecfA1rH4QqMzz i2rdb6uhkXktgjBiZvYz4etGTuMJlmGnhKqPWGoS7HmMPRkOpbHo2jVRJC+mtpXlWiXr J+rDKhUeyLwZ5yckP+W3X1Lk05vidhatPlpCmPqiU2wG7q3RL935Ke2PxRg9ONvUbahe LfPg== X-Gm-Message-State: ACrzQf2roVc5XRoB74vgk6+yjRcFSbWIDHmlyzOteDiGhhY8ouo3a00t +rwbXZuaEmydO+jtZaIfHmQQTL+LfHs= X-Google-Smtp-Source: AMsMyM4xaL4V4PGyc4DxxbRIghgDmKv10D4xwin5PF92bubib0ZNKsOdnLBDlX5xY78GIWh/8zasGA== X-Received: by 2002:a5d:6da9:0:b0:22e:53bd:31c1 with SMTP id u9-20020a5d6da9000000b0022e53bd31c1mr8404784wrs.358.1667216866503; Mon, 31 Oct 2022 04:47:46 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m11-20020adfa3cb000000b002366e3f1497sm7017965wrb.6.2022.10.31.04.47.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 04:47:46 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/13] go: submit patch upstream Date: Mon, 31 Oct 2022 12:47:18 +0100 Message-Id: <20221031114719.2725967-12-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031114719.2725967-1-alex@linutronix.de> References: <20221031114719.2725967-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 ; Mon, 31 Oct 2022 11:47:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172314 Note: it will not be reviewed until RP signs the google CLA (link in the PR). Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/go/go/filter-build-paths.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/go/go/filter-build-paths.patch b/meta/recipes-devtools/go/go/filter-build-paths.patch index a1aa37c2a4..a036f177e0 100644 --- a/meta/recipes-devtools/go/go/filter-build-paths.patch +++ b/meta/recipes-devtools/go/go/filter-build-paths.patch @@ -8,7 +8,9 @@ embedded in the go binary so that builds are reproducible regardless of build location. This codepath is hit for statically linked go binaries such as those on mips/ppc. -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/golang/go/pull/56410] +Note: RP needs to sign Google CLA for the PR to proceed. + Signed-off-by: Richard Purdie --- From patchwork Mon Oct 31 11:47:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 14588 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 DFE89FA3744 for ; Mon, 31 Oct 2022 11:47:50 +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.8233.1667216869095914934 for ; Mon, 31 Oct 2022 04:47:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=FHrDGwd0; 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 bk15so15544171wrb.13 for ; Mon, 31 Oct 2022 04:47:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=+QRe1wUFv4zzEEnLER8S/6Y+KLE/lcyH0p0jsmpTfk0=; b=FHrDGwd08oR+RgkQlCHnNGwVH/QpCms7KW0QnsZ8PofPgXKz0A8nHHBb+QqpHVpwA1 eCL8GavvLK3miE8UWZn4py0uYN2ZDVRNOgKVp+6BCH2UU0Yh8mlQbuTcbaG4javX9683 lWw22ouFiqYReLR2QbL8X5+/Pfv7GWBq6iQciLahaM2WZ9vxiJDGaFkvCQN5SkoxUsL3 8VvoDZQf5lbPxt633TmyZXQGmEpmjcMjroY+JSrzmVEYWmjrexQLySBevnJWYVIVw3FH Hi5ktD3bxXdglEabaxd4+Uq69OJOPnsR4k6QPQUH6B7GaB7A699zaSfQ4amtZ/fnmnwe OgbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=+QRe1wUFv4zzEEnLER8S/6Y+KLE/lcyH0p0jsmpTfk0=; b=1w2TaGh0IXfa59d0zjrplG5WAj5CKF/lvrIiktVlXi4NJOdP5cDFEnRGCNJmClme+w jYDgZa5pVWBuL5jJ8DxzM6N3bVTenb75wkAIrs5w/0O1GsgZEibsCAqs3ASjLcvcEn0z u+b0dKf4C8K3xcEJzSqRuH4mKe+j6U6owo+dn5+bconJL7mbtiQMydnI8JyIp/l56+1h poOww3KgdbotZWz6Q48CkrfTI38jCgtn9eTaqWs8gnzM5WVzuK8O214znZEkBuU7Hg/O DULfIfNg54Jc1ebTKLY84T2Xpqpv4Qlobga1e6/6vAKiu5/iH4LJTVZfD81aUh43I4nH gwYg== X-Gm-Message-State: ACrzQf0IbO1GM6+OTkyOlVBiNAQ1Hso/9ZNH7sWeYVVdeHWn2hHETvrn S+sm/MKSQ3GwjTuVIJzkh32yKnnxiQE= X-Google-Smtp-Source: AMsMyM6yAhue7ekTKyqGAyaVLWo8M3oLEtuTbBpmV8nCeNTgpwLlcV/zb8IUIwIBKirTz5yWANL59g== X-Received: by 2002:a5d:698e:0:b0:236:4b95:17ff with SMTP id g14-20020a5d698e000000b002364b9517ffmr8093488wru.196.1667216867568; Mon, 31 Oct 2022 04:47:47 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m11-20020adfa3cb000000b002366e3f1497sm7017965wrb.6.2022.10.31.04.47.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 04:47:46 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/13] libffi: submit patch upstream Date: Mon, 31 Oct 2022 12:47:19 +0100 Message-Id: <20221031114719.2725967-13-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031114719.2725967-1-alex@linutronix.de> References: <20221031114719.2725967-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 ; Mon, 31 Oct 2022 11:47:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172315 Signed-off-by: Alexander Kanavin --- .../libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch b/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch index 5e529d1ce7..4233799501 100644 --- a/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch +++ b/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch @@ -11,7 +11,7 @@ https://github.com/libffi/libffi/issues/607. Now that clang supports the LDC and SDC instructions, this mitigation has been reverted. -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/747] Signed-off-by: Brett Warren --- src/arm/sysv.S | 33 ---------------------------------