From patchwork Sat Dec 24 16:59:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 17163 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 0F390C4332F for ; Sat, 24 Dec 2022 17:00:07 +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.web11.101081.1671901199457046961 for ; Sat, 24 Dec 2022 08:59:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VtTo5w2g; 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 z10so7028428wrh.10 for ; Sat, 24 Dec 2022 08:59:59 -0800 (PST) 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=qkMb2ryTtaFs1sTL4czOn/niRqbBmSE55UGACvqN6VI=; b=VtTo5w2gv+aetc78lJdXscXXTfDv+mpTqkJvQsXQYnWlJ4q+JzdjaEDS7n1qCPh7fH nzKVY2PARzWGuEDjkUJTx1Wb9odXK/mME71zBW1i2QlSDavnzyvOuNyJhIqAO3Un/gMa B617Z0c7DCFjV2rvqhWJAVnvokEc62BhCd++PGoRghMplJKz6mF1qCKjMPm5ZOulHEB0 avz3lS8y+zJkJh5cUpprDDJKi0PBv9j1KB4JwFuL08ZHchm69Z1xG7gfVps454T6+pXi GSFgmjeiFtQGAM0iPw5crChnEEzFsX6U7G7JV4+q06a+k/96ByJFbnBUkIRfkAjPFHRk nU/w== 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=qkMb2ryTtaFs1sTL4czOn/niRqbBmSE55UGACvqN6VI=; b=UsZm0HyRnpb9R6jLwfwXet/bDBkf5Y5ByGcfHshINaWjTvYzusIUvkza6H3lOgc/0y 6uuEoJ4HhKS5+z1JkCbRZIgQHm8/evvE1Bp4T++q6SnmwKOQRKDUTn5Wc/HtgSmYzffF JX6wTVUc83fvAZnXzr7+y4iHK8LPrA2wnKYQoqyegxO6VlC6/k43cbQvKNjJy43vkKKd QzCXtN08hOTXDoCsQAZDHbA8G9fheRZn9TPrtE2w7znQC8z4qv4YR3EFXzHD7VqsKbBh Sdh0XytuMs/okTGXvHTXPj8EbibQHVm9pY6qqyCriysebj0GO0upVo38wrB90embLfWG Tq4w== X-Gm-Message-State: AFqh2krmFZakkiEh78K5YcFCEMC3w2rZdEN4p+d/fNtAPsHqF60aZfgL 8h+WpMl7+WXa7uTGvr4srl8DNES+bYU= X-Google-Smtp-Source: AMrXdXvasUPYsdrdIW0CmKPHBDf870jWJZgTPzQgRvMK4OT64NAeW4t2z3kgCC7LDKOKAZnVnYKUmQ== X-Received: by 2002:adf:f38f:0:b0:242:102c:c571 with SMTP id m15-20020adff38f000000b00242102cc571mr8102016wro.19.1671901197575; Sat, 24 Dec 2022 08:59:57 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id b2-20020adff242000000b0023662245d3csm6005622wrp.95.2022.12.24.08.59.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Dec 2022 08:59:57 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/7] llvm: update 15.0.4 -> 15.0.6 Date: Sat, 24 Dec 2022 17:59:37 +0100 Message-Id: <20221224165943.1324800-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 ; Sat, 24 Dec 2022 17:00:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174983 Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/llvm/llvm_git.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 6f9a68a900..dc1cac734f 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -26,7 +26,7 @@ QEMUVERSION ?= "7.1%" GOVERSION ?= "1.19%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump -LLVMVERSION ?= "15.0.4" +LLVMVERSION ?= "15.0.6" RUSTVERSION ?= "1.66%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 2d346b70cf..402460ee10 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -19,14 +19,14 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" -PV = "15.0.4" +PV = "15.0.6" MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "5c68a1cb123161b54b72ce90e7975d95a8eaf2a4" +SRCREV = "088f33605d8a61ff519c580a71b1dd57d16a03f8" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ From patchwork Sat Dec 24 16:59:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 17169 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 2EABDC3DA7D for ; Sat, 24 Dec 2022 17:00:07 +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.web11.101082.1671901199887380916 for ; Sat, 24 Dec 2022 09:00:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=m0ok2tjz; 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 j17so1680577wrr.7 for ; Sat, 24 Dec 2022 08:59:59 -0800 (PST) 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=K1Ozo/yV2hxV/K1pBzt6M4b47j2LkHlO0nXM0WMiSMc=; b=m0ok2tjz/OkKAoGZGnpm8OqPXywp+7cNkWPYPI7daXTXsJVH/doSGFotg5qIt3XG6B hvpKSvvVXMvs865OUHEHyaBixztIlHVTRsQCudlNd/ntd2FZ7XsDed8OOZskqJKvBbD3 MaZkyyTaEkeUsbUvAfgSsGZ44A7uI058tyMSsXb+9KYbD+rRzNf9B6D4udMm+S50lJ70 FSR9YoKUojdzZvjDNzdxp0/cVH6kMkCqxSwm/Gxza5VWVk9+gpbv2jjEQqwgTKSvDzlW hDlBykqsjnmgFR5IkYwVM+H2Ae7pvIINHeVNFlLzi+UkxQj2sMiTOaUbn4m+FO1Wm6ym I4DQ== 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=K1Ozo/yV2hxV/K1pBzt6M4b47j2LkHlO0nXM0WMiSMc=; b=vBlttYhIhq10yYbaHnXeF32oxt/NyLsxG4cDGTgrNtIWrOzudAT6WlqIjqFOmNPbWW EtfBIjiOnTPBnljzQhXHI0MnAOkFE/tcTL1bFPWdQ+JkHu1HIDpTT9LI51MnOe/s7btI Xe2KG8HfF3ZpKmOlT4njwBQTYgzmgiuGzoXF/BlH3uZBT4Ee9VDb9DMDX4xhKnK96V+h zxJsxoKT1Rzms9E3VUx9Vsre+yKiHSuZASUvrFTRycz3v3peIplkLCgKLopcDntR9YVh IcWjFfGD1L2GXNPppOAGrQ1LfAcaKp9Oolt7XLGYtEa8tyCbURli+6vsNvVQ3KCvAwiu PLMQ== X-Gm-Message-State: AFqh2kqYB0NaId0h82mbEFJyB5UtuC/XSGF5rT10hwJ5tKCx6UpWOZBN 5p2MnIgCpaZlCMRjDtOb+Gy1XpHUcVs= X-Google-Smtp-Source: AMrXdXv1R6OOMKbKqtnODGxic+SDEELV3KJ+Zpp1SgBI8hbyQOZntCekw6PaaiI60yWiJ2zAQEv6cQ== X-Received: by 2002:adf:ec49:0:b0:242:989:e07c with SMTP id w9-20020adfec49000000b002420989e07cmr8463298wrn.38.1671901198266; Sat, 24 Dec 2022 08:59:58 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id b2-20020adff242000000b0023662245d3csm6005622wrp.95.2022.12.24.08.59.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Dec 2022 08:59:57 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/7] tcmode-default.inc: set LLVMVERSION to a major version wildcard Date: Sat, 24 Dec 2022 17:59:38 +0100 Message-Id: <20221224165943.1324800-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221224165943.1324800-1-alex@linutronix.de> References: <20221224165943.1324800-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 ; Sat, 24 Dec 2022 17:00:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174984 There is no longer need to be specific: none of the recipes using this variable in core need to know the particular version of llvm exactly when using the default one set via PREFERRED_VERSION from LLVMVERSION. This as well enables automated version updates of llvm for minor releases. Signed-off-by: Alexander Kanavin --- meta/classes-recipe/meson.bbclass | 2 +- meta/conf/distro/include/tcmode-default.inc | 4 +--- meta/recipes-graphics/mesa/mesa.inc | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass index 3cc94c7584..48688bed75 100644 --- a/meta/classes-recipe/meson.bbclass +++ b/meta/classes-recipe/meson.bbclass @@ -72,7 +72,7 @@ strip = ${@meson_array('STRIP', d)} readelf = ${@meson_array('READELF', d)} objcopy = ${@meson_array('OBJCOPY', d)} pkgconfig = 'pkg-config' -llvm-config = 'llvm-config${LLVMVERSION}' +llvm-config = 'llvm-config' cups-config = 'cups-config' g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper' g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper' diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index dc1cac734f..c784221062 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -24,9 +24,7 @@ GLIBCVERSION ?= "2.36" LINUXLIBCVERSION ?= "5.19%" QEMUVERSION ?= "7.1%" GOVERSION ?= "1.19%" -# This can not use wildcards like 8.0.% since it is also used in mesa to denote -# llvm version being used, so always bump it with llvm recipe version bump -LLVMVERSION ?= "15.0.6" +LLVMVERSION ?= "15.%" RUSTVERSION ?= "1.66%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 115621228a..93b3b59a91 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -58,7 +58,7 @@ ANY_OF_DISTRO_FEATURES:class-target = "opengl vulkan" PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" -MESA_LLVM_RELEASE ?= "${LLVMVERSION}" +MESA_LLVM_RELEASE ?= "" # set the MESA_BUILD_TYPE to either 'release' (default) or 'debug' # by default the upstream mesa sources build a debug release From patchwork Sat Dec 24 16:59:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 17166 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 2EE60C53210 for ; Sat, 24 Dec 2022 17:00:07 +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.101083.1671901200644877018 for ; Sat, 24 Dec 2022 09:00:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=V+caHmXE; 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 bs20so4946530wrb.3 for ; Sat, 24 Dec 2022 09:00:00 -0800 (PST) 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=xDn9UPUUFjKryeijvQ62srMrJ7K0Dryr3DsWcs8x9/s=; b=V+caHmXE7rXvTCTRMkUq3k8dF9mxIM7NI7/GE9634xBxVPPm2n6CtWB1KZPCynGNHY 8fJ8qNkjoj61Ix9qQEtmqIrIPt1WmGuXiJ8GDjnMY6ACIS1uNutp5IOGCb134RwAoW3u tcko2gXcOC8g3wCz/xrFJpjJC37Dnl1EjY3+cp1VSFoAGMocrIZCi5SU7lLt+ewQ14tr BgZGnIbTsbpFVvSLtOe7vHiY7PuoK2Pi5jcpBjqEN15jNCBpn7QPIc0a68HkJ5ZZlsNY QmLW/Na2Nf4i8DfMmJucFVcnXp4pUd1QgOIyjHYQoBaY70aifbjoJTy/aqbao2HItz/X jqgg== 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=xDn9UPUUFjKryeijvQ62srMrJ7K0Dryr3DsWcs8x9/s=; b=Dkb82GEtR6Qi/2jihkqhTjiTPXf9E1PC8hFcQbO34zRU3LgyQbdIQjcdAjYdaHbunx BZ/midoNlQd2Efc9th27XseELbw5nz6tqERbAfm8pWdfuzllF/+v3h9qkNm6L8a43kcb Xi3Mj/TCXl0n3MEnlOsWDwVf8aRzW/EsH7w6r2Mr9ggU8RbO7/NhBLwBpNdxhkfM71rj EzNUecriGWyS791qUwy2iKnwhGsaVHYr/sEewFzsohy8szOsYrMM7DgI1KoIabdrr4C4 6AY+f+ZDSWLOy2Ny6GW5TrlFIWGOskvBXxzicNSL4oKS7glSNmWf2Wu5QpvN3TILj7r7 fMPQ== X-Gm-Message-State: AFqh2kr4QvBJO3OAEzoiVI00IKExyBC3Sn6eH3HtXcT/CbOCBqZjGzFR sGlq3IDka+d8/IkZNm+C6ORc187TCZI= X-Google-Smtp-Source: AMrXdXviMJ1j3C+0tjWDDyb8SyUcbAlbUkZ7a8OWjLXLZIa7l0qhntnL+FUliJIQcOLvhcp6Jbcgtg== X-Received: by 2002:a5d:4692:0:b0:242:2e1e:1f0b with SMTP id u18-20020a5d4692000000b002422e1e1f0bmr8282003wrq.23.1671901198932; Sat, 24 Dec 2022 08:59:58 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id b2-20020adff242000000b0023662245d3csm6005622wrp.95.2022.12.24.08.59.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Dec 2022 08:59:58 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/7] cmake: update 3.24.2 -> 3.25.1 Date: Sat, 24 Dec 2022 17:59:39 +0100 Message-Id: <20221224165943.1324800-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221224165943.1324800-1-alex@linutronix.de> References: <20221224165943.1324800-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 ; Sat, 24 Dec 2022 17:00:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174985 License-Update: additional contributors Signed-off-by: Alexander Kanavin --- .../cmake/{cmake-native_3.24.2.bb => cmake-native_3.25.1.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 4 ++-- ...CMakeDetermineSystem-use-oe-environment-vars-to-load.patch | 4 ++-- .../cmake/{cmake_3.24.2.bb => cmake_3.25.1.bb} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-devtools/cmake/{cmake-native_3.24.2.bb => cmake-native_3.25.1.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.24.2.bb => cmake_3.25.1.bb} (100%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.24.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.25.1.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.24.2.bb rename to meta/recipes-devtools/cmake/cmake-native_3.25.1.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 7561e851c6..7da9a2fb55 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.cmake.org/" BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=45025187a129339459b6f1a24f7fac6e \ +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=09069e0fffe4e5eaf6dde04c3b1932e5 \ file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ " @@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "0d9020f06f3ddf17fb537dc228e1a56c927ee506b486f55fe2dc19f69bf0c8db" +SRC_URI[sha256sum] = "1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch index 9a2287f517..451b6ebfad 100644 --- a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch +++ b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch @@ -1,4 +1,4 @@ -From 89f6c846f02ad6d30b9ebb7eaaaa4fb6f9cec054 Mon Sep 17 00:00:00 2001 +From 8e53dd7f6f534ad933e7e9c7fc20cc1a6cded3f4 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Thu, 27 Apr 2017 11:35:05 -0400 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default @@ -25,7 +25,7 @@ Signed-off-by: Otavio Salvador 1 file changed, 7 insertions(+) diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake -index 8c7af067..ade2b189 100644 +index 2c2c2ac3..fae4f97f 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -112,6 +112,13 @@ else() diff --git a/meta/recipes-devtools/cmake/cmake_3.24.2.bb b/meta/recipes-devtools/cmake/cmake_3.25.1.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.24.2.bb rename to meta/recipes-devtools/cmake/cmake_3.25.1.bb From patchwork Sat Dec 24 16:59:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 17165 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 2090DC4708D for ; Sat, 24 Dec 2022 17:00:07 +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.web11.101084.1671901201040997081 for ; Sat, 24 Dec 2022 09:00:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=BwCY9JTB; 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 i7so7036443wrv.8 for ; Sat, 24 Dec 2022 09:00:00 -0800 (PST) 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=80GLV2kyYfm6kShdhQwxfzPC4+BC6JPtLS06xV7qcBY=; b=BwCY9JTBz8iRcxqqe9iB/zaM0mzBs6hyefExlqkocWRGi0Ts1r+DHynZBOzT2fFOUF KoJu4xPQE9TfitH0I2dYytPrqh0ajldvs9jclySmD0cbCMx9+gNRWYW6VShisu4zEW1X m67YxQ0ApzIfIn3dwfptWPzHGxOAUcnhURYHn9LSxuMKzbmUxevQkm+cZIPJAG5gB+gT RcltWbsGJfX3vJJE1BXYYG6cGSRSihb5RXN/KhH57yhat7FaTa5XZgRI2nc9jwUhlIek 4+gjvTnbB2P2i3s75anOGtzYRYXgVkmUCZ5GN7wp0N82xjkGMeI1TitWfMuTM6Hvyrxr KcfQ== 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=80GLV2kyYfm6kShdhQwxfzPC4+BC6JPtLS06xV7qcBY=; b=ZsrQGpOYVhyLM26EELH3dqJvTxmyWpY+224DmMRNWJ7yeaLFB4MKhWNPzJ7vOWiUQq Kac3TUVOOnsvDxOT21HoIIIStjMudH0AhGML0Nnol1PTLHIPpjz1Mdfl3Bf+MCP1vvNM gQjmC4dN4Fa31Qt5gNuOEwdltnEheP1zKiuc7poXlO1vhrSSyG8AuhKbAfG1oyCKt5SI oU/RkjIJwAB/DMzCYcKFQCbqHBL50qD+aWWBTp5E3J6URB6WdERBgoMCjWG04b2gVVW+ IVlqsX+fzyH2sjHi8WnDatWxo8Sji54KVM14yguNo8WJ2YNYrCdewxM1430r8WpVrDqS 8LZQ== X-Gm-Message-State: AFqh2kpOmYQxX1q+qhpL8Oz2hjQ4cu1fufMbdos7EOnKn6BPoAnjDaPJ cLmmHZiSIyhXibSDv+YE8/X4vQ66DGk= X-Google-Smtp-Source: AMrXdXt7rcJeb4VS/fXVcycqIdTnWDyCM3eK7SEkJxdh7PYvhRoKkVbkGFDUXpUA1TdxzClrk9ivFQ== X-Received: by 2002:a5d:6d09:0:b0:277:2e27:61e7 with SMTP id e9-20020a5d6d09000000b002772e2761e7mr2822726wrq.17.1671901199518; Sat, 24 Dec 2022 08:59:59 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id b2-20020adff242000000b0023662245d3csm6005622wrp.95.2022.12.24.08.59.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Dec 2022 08:59:59 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/7] python3-native: further tweak to sysconfig.py to find python includes correctly Date: Sat, 24 Dec 2022 17:59:40 +0100 Message-Id: <20221224165943.1324800-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221224165943.1324800-1-alex@linutronix.de> References: <20221224165943.1324800-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 ; Sat, 24 Dec 2022 17:00:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174986 Without this, sysconfig would report the target location, which is not what we want in cross-builds. This is used in particular by latest autoconf-archive m4 macros, which have migrated from (removed in py 3.12) distutils to setuptools. Signed-off-by: Alexander Kanavin --- ...py-use-prefix-value-from-build-configu.patch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch index 2f519e4917..5ca855e7ed 100644 --- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch +++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch @@ -1,24 +1,23 @@ -From 05d676ddf675d9c8229b723e64717aa485d6809e Mon Sep 17 00:00:00 2001 +From 45548f40668d429adcb7532d35db1ac16fe74562 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 10 Sep 2021 12:28:31 +0200 -Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration - file +Subject: [PATCH] Lib/sysconfig.py: use values from build configuration file -This allows correctly substituting them for target installs using +This allows correctly substituting them for target builds using native python. Upstream-Status: Inappropriate [oe-core cross builds] Signed-off-by: Alexander Kanavin --- - Lib/sysconfig.py | 5 +++++ - 1 file changed, 5 insertions(+) + Lib/sysconfig.py | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 93c6f73..ff399e2 100644 +index 93c6f73..a87870f 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -668,6 +668,11 @@ def get_config_vars(*args): +@@ -668,6 +668,13 @@ def get_config_vars(*args): _CONFIG_VARS['VPATH'] = sys._vpath if os.name == 'posix': _init_posix(_CONFIG_VARS) @@ -27,6 +26,8 @@ index 93c6f73..ff399e2 100644 + _CONFIG_VARS['installed_platbase'] = _CONFIG_VARS['prefix'] + _CONFIG_VARS['platbase'] = _CONFIG_VARS['prefix'] + _CONFIG_VARS['platlibdir'] = _CONFIG_VARS['PLATLIBDIR'] ++ _INSTALL_SCHEMES['posix_prefix']['include'] = _CONFIG_VARS['INCLUDEPY'] ++ _INSTALL_SCHEMES['posix_prefix']['platinclude'] = _CONFIG_VARS['INCLUDEPY'] if _HAS_USER_BASE: # Setting 'userbase' is done below the call to the # init function to enable using 'get_config_var' in From patchwork Sat Dec 24 16:59:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 17167 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 1BA3CC46467 for ; Sat, 24 Dec 2022 17:00:07 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web10.100755.1671901201574866312 for ; Sat, 24 Dec 2022 09:00:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=aOwQjTHY; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id w15so7038667wrl.9 for ; Sat, 24 Dec 2022 09:00:01 -0800 (PST) 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=8gomC9DY43aEhfC6+vh+ahgnqtI9gz9G9n8QKZmOyXE=; b=aOwQjTHYscnm/8GfWY+11gyoq28ORaTTSxOiaT7gCnpSujTNh1WVYUINfjgliiuXGj 0pwtbtjH4D/8ndmdpVHRaTmnGTc4EdRfMaWCnYarmIzM/OZpg92LHzhpu3YTMUCBmbvW yriPJXoJ1FUfobUM7phKYtFjJeukLvVUv25J7tWjlnP5M5aw1H+p9nWen16Kf8Dv3w92 /mfYW3X7UtTTvmidfjSnsoZSPH9BFfc3kJsbS+5iHU/IXY7Md81yq4YbU1+fCRwOoBU1 8otc9oXySvWjQfRdHPXzHnQxlbXGsT6d5+VldrljbCLUAEoFh6rMcK0JeyC1at+75zS4 BdTg== 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=8gomC9DY43aEhfC6+vh+ahgnqtI9gz9G9n8QKZmOyXE=; b=nd0yml2Fl5E2ndtkICgN+yvv8TVBKRAozkidHWYaL+EnZir2/JCWt/kCi5irdH1VHO y2oG+ascXY7/nzSgszJ9DnkI2SpPtkyqwgxFEmnAZwpskGkO8KtLSfPteMATFC6NwAIe x1MD8ekvx8Y3Hmfhv4QTXb6Oz48Xo3K6RZjk25WRwmH+JVlavxE5XONoVFcTjgAkuu9w JLlJ8MMKXgBtKrX6AMvA/bl4ar98gByr0XGAlvwOUquGGHBN/LAHWSPKwhuV0ZoLHdeJ doukX2gv3Fgcj3Uu2mEYNFo4hOlTQhQZe3juYZvTWNHW6PtIdoOqa4cqIsmVSZVZ80nh TMqg== X-Gm-Message-State: AFqh2koi8xCRS/LmjvTyHDLuqE9UvJNhddyZ3DmpXbHP8yk0rmFaufJ2 E8qCFg88uOweiSpCEgjVwHbP+MP6j1M= X-Google-Smtp-Source: AMrXdXuhaTVdusp/jDG0tveJkRR/MbdAGQfXPD20CXVLpS+Ulwq+G6P6dXu675e/jS+Znd6cAZzNYg== X-Received: by 2002:adf:e781:0:b0:27a:2d3a:b525 with SMTP id n1-20020adfe781000000b0027a2d3ab525mr439346wrm.15.1671901200114; Sat, 24 Dec 2022 09:00:00 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id b2-20020adff242000000b0023662245d3csm6005622wrp.95.2022.12.24.08.59.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Dec 2022 08:59:59 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 5/7] devtool: process local files only for the main branch Date: Sat, 24 Dec 2022 17:59:41 +0100 Message-Id: <20221224165943.1324800-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221224165943.1324800-1-alex@linutronix.de> References: <20221224165943.1324800-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 ; Sat, 24 Dec 2022 17:00:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174987 devtool modify/upgrade are not currently equipped to handle conditional local files in SRC_URI, and provide only the main no-override set in a workspace under source/component/oe-local-files/ (this is done via meta/classes/devtool-source.bbclass). On the other hand, updating the changes from workspace into a recipe is run iteratively against all overrides; this works for patches (as they all are directed into their own override branches in the workspace git source tree), but breaks down when trying to match local files in a workspace against local files in overridden SRC_URI lists, resulting in bad recipe breakage. Implementing multiple sets of local files is significant work; let's for now simply not touch local files in recipes except when on the no-override variant. Signed-off-by: Alexander Kanavin --- scripts/lib/devtool/standard.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index f46ce34ad1..f3349f98e9 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -1409,6 +1409,18 @@ def _export_local_files(srctree, rd, destdir, srctreebase): updated = OrderedDict() added = OrderedDict() removed = OrderedDict() + + # Get current branch and return early with empty lists + # if on one of the override branches + # (local files are provided only for the main branch and processing + # them against lists from recipe overrides will result in mismatches + # and broken modifications to recipes). + stdout, _ = bb.process.run('git rev-parse --abbrev-ref HEAD', + cwd=srctree) + branchname = stdout.rstrip() + if branchname.startswith(override_branch_prefix): + return (updated, added, removed) + local_files_dir = os.path.join(srctreebase, 'oe-local-files') git_files = _git_ls_tree(srctree) if 'oe-local-files' in git_files: From patchwork Sat Dec 24 16:59:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 17164 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 10D21C10F1B for ; Sat, 24 Dec 2022 17:00:07 +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.web10.100756.1671901202173394276 for ; Sat, 24 Dec 2022 09:00:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eHRo4XF8; 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 y8so7022983wrl.13 for ; Sat, 24 Dec 2022 09:00:01 -0800 (PST) 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=2yD8JQ3sBJBENlk16VnPgwnmRkS150UAREqRalQcq2w=; b=eHRo4XF87pb+BrrRE63ArFXURJjpIPx2wzI0q3HNYoQ2LtSqI+p/StTaEcMa1Qo1Mm kVsQ3BettVzjxGxdE5OVnnuNVEWRTYIaMzZBE7e2xb+/HYA9bBNG8/cE6296FeApGz6Q jDDIBXQU65rzjRTtGQsuoTAIey7/JIxnnfc8TxJGO1tjX0r2zgBbJFqBWgf+YZpf6A3E EwGpUCcidit3+Q/5v0RxWYcQRmQJcC2uwvasOOeLZW+hKdWX7QV3mpQkyIHRAElOCLnB YeAExC2FwPLT6sJV2wzahfGj7MHMosaG9DohD6xPs9/dcT89+KFgzfzAWpXOQ/ezN1Th niVA== 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=2yD8JQ3sBJBENlk16VnPgwnmRkS150UAREqRalQcq2w=; b=2XH2p5JAYwl8yP0OzE6rxlMbg6OIcrW5DixqrCzGgiPpUPm90v1hSvKF/zMzGS4cht SbHFgffijc5dUfEx5qhTk265FkQeGPseE4EIeuqLEMS0eqm/UJydwiD2pWZWTBdO+8Dw TRQHVRznCm1VF4i239EPnsZ9V1Pyh03z8697KPJ50x9DtXTuhtzCERM4WwXUpUC3Muo3 +lFnVlW6IR7RLh4VCVOm/6LKzj8j91wJPWUnvby7T0grK46aR+F0wSIxGOs9lI5N0wm8 d40ggOJHB41kBjEB87KKIn8R6b+IpsLlHewCuTSu6duxpgmAwKRB+q4HlfCyB4v/IUn2 nQjA== X-Gm-Message-State: AFqh2kqCyTKcCMPh9en2unwTlHxZf/4GP6bna2gt994kg8RpoDbTAL/Z rKSzrci9sBNcqPKNKt0POy+rSpo6McM= X-Google-Smtp-Source: AMrXdXuxzXfb+BWJSPOi5mjYFvdWcb/9GWa2JqrJR7Voe4fJrT4G8IL4AiqFyKspPUGAz1Xv3p4W5A== X-Received: by 2002:a05:6000:16c4:b0:247:4802:9435 with SMTP id h4-20020a05600016c400b0024748029435mr9321750wrf.5.1671901200706; Sat, 24 Dec 2022 09:00:00 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id b2-20020adff242000000b0023662245d3csm6005622wrp.95.2022.12.24.09.00.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Dec 2022 09:00:00 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 6/7] libslirp: add recipe to continue slirp support in qemu Date: Sat, 24 Dec 2022 17:59:42 +0100 Message-Id: <20221224165943.1324800-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221224165943.1324800-1-alex@linutronix.de> References: <20221224165943.1324800-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 ; Sat, 24 Dec 2022 17:00:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174989 qemu 7.2 no longer carries libslirp in-tree, and so it has to be provided externally. Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/maintainers.inc | 1 + .../recipes-connectivity/slirp/libslirp_git.bb | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 meta/recipes-connectivity/slirp/libslirp_git.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 66797db02c..be96123ce6 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -382,6 +382,7 @@ RECIPE_MAINTAINER:pn-libsamplerate0 = "Unassigned " RECIPE_MAINTAINER:pn-libsdl2 = "Yi Zhao " RECIPE_MAINTAINER:pn-libseccomp = "Unassigned " RECIPE_MAINTAINER:pn-libsecret = "Alexander Kanavin " +RECIPE_MAINTAINER:pn-libslirp = "Unassigned " RECIPE_MAINTAINER:pn-libsm = "Unassigned " RECIPE_MAINTAINER:pn-libsndfile1 = "Unassigned " RECIPE_MAINTAINER:pn-libsolv = "Anuj Mittal " diff --git a/meta/recipes-connectivity/slirp/libslirp_git.bb b/meta/recipes-connectivity/slirp/libslirp_git.bb new file mode 100644 index 0000000000..334b786b9b --- /dev/null +++ b/meta/recipes-connectivity/slirp/libslirp_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "A general purpose TCP-IP emulator" +DESCRIPTION = "A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services." +HOMEPAGE = "https://gitlab.freedesktop.org/slirp/libslirp" +LICENSE = "BSD-3-Clause & MIT" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727" + +SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master" +SRCREV = "3ad1710a96678fe79066b1469cead4058713a1d9" +PV = "4.7.0" +S = "${WORKDIR}/git" + +DEPENDS = " \ + glib-2.0 \ +" + +inherit meson pkgconfig + +BBCLASSEXTEND = "native nativesdk" From patchwork Sat Dec 24 16:59:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 17168 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 1F68CC4167B for ; Sat, 24 Dec 2022 17:00:07 +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.web11.101082.1671901199887380916 for ; Sat, 24 Dec 2022 09:00:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=MKohuQNV; 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 j17so1680647wrr.7 for ; Sat, 24 Dec 2022 09:00:01 -0800 (PST) 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=BSxvLkbduPUugSIAfYJ2mLl1BvBtiCMv1gsKIKD1vn4=; b=MKohuQNVrd3uF6JGBDP7oNz9PIeeAeEO2O1G807ASuoHafh8tSKsNSNPtf+m3OxQ9l gQfhyD+gF8uiC6rAMYEmi+u4+SHZsuBySDvCpndnMWAtY6/1/bQRbyM8Jy7NwStglFE5 s5MkpXZuIYq3VPMCtbTyKHyvcJ1+UB90x7kUAPg/T2B3LjhRutgCClqwq4I5fpUkEqz1 lVqKyHTFz6lAxkpBeooEJqf6pKIoY/iODFmPq0VVBsFwXEOs156FTEAjBG/c+SMr/pVl jT/6arQ5MHkWqg29fosobULfDHggxWFgr61Hm37VWG44DwELyI2QFqxVfHMrDESa/tRO sWjA== 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=BSxvLkbduPUugSIAfYJ2mLl1BvBtiCMv1gsKIKD1vn4=; b=LPdbjlI9NR/SiqgPXjKg0tmwPV+oOd2+bQsDOeD3AU6PBhpOqvFOr5H43Z5CCV4lXl RoS0vwb77l52tWmQVDJl/IphGWwL3ZzPPS2rfwKn+C1QeSFNIOCVOYHos7e/qYesA1+d Onb0mPhr6zfvX1WFWfcIpQGRotV4mYs2mtheIdf9L2MdoJcIYCpyqo5e2XWr+JJQLa2L mCfi1cETCioCONJD29Jxr1zOm40wVOmm8nrYNQaILPa/gRAD5teZK5tRb8rdjTEHNTXs jJyGeGvVli7RPpHvCVhriKjgNGLy1ip6JzF9eMuN9VQQIfJNMHsHkdr8WDyeEXQA9CcS eC2g== X-Gm-Message-State: AFqh2ko+C4Fk9awwAU6fNILgUUaSwiUMWdOLCiELmvEJs1UvjspmkUkM u4EIkA+1VzSRXlrXD5evo0hrPC6uWAA= X-Google-Smtp-Source: AMrXdXu7hZDucg7wpaIS1HcfBD06Xqhr4CMw1xyfYFIOHb5c7l2vaHr/AuP2rCDKk7ertA68/CHOfQ== X-Received: by 2002:adf:de87:0:b0:242:6006:50f0 with SMTP id w7-20020adfde87000000b00242600650f0mr9487792wrl.62.1671901201309; Sat, 24 Dec 2022 09:00:01 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id b2-20020adff242000000b0023662245d3csm6005622wrp.95.2022.12.24.09.00.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Dec 2022 09:00:01 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 7/7] qemu: update 7.1.0 -> 7.2.0 Date: Sat, 24 Dec 2022 17:59:43 +0100 Message-Id: <20221224165943.1324800-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221224165943.1324800-1-alex@linutronix.de> References: <20221224165943.1324800-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 ; Sat, 24 Dec 2022 17:00:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174988 qemu no longer carries libslirp in-tree, so enabling slirp requires providing external libslirp. Another noteworthy change is: x86: TCG support for AVX, AVX2, F16C, FMA3 and VAES instructions ... which means both meta-intel and qemu x86 targets can now fully utilize Haswell-and-later instruction set with benefits for performance in emulation and on silicon. Changelog: https://wiki.qemu.org/ChangeLog/7.2 Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/tcmode-default.inc | 2 +- ...u-native_7.1.0.bb => qemu-native_7.2.0.bb} | 0 ...e_7.1.0.bb => qemu-system-native_7.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 14 ++-- ...ulip-Restrict-DMA-engine-to-memories.patch | 64 ------------------- .../qemu/qemu/CVE-2022-3165.patch | 59 ----------------- .../qemu/qemu/arm-cpreg-fix.patch | 27 -------- .../qemu/{qemu_7.1.0.bb => qemu_7.2.0.bb} | 0 8 files changed, 7 insertions(+), 159 deletions(-) rename meta/recipes-devtools/qemu/{qemu-native_7.1.0.bb => qemu-native_7.2.0.bb} (100%) rename meta/recipes-devtools/qemu/{qemu-system-native_7.1.0.bb => qemu-system-native_7.2.0.bb} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-net-tulip-Restrict-DMA-engine-to-memories.patch delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-3165.patch delete mode 100644 meta/recipes-devtools/qemu/qemu/arm-cpreg-fix.patch rename meta/recipes-devtools/qemu/{qemu_7.1.0.bb => qemu_7.2.0.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index c784221062..19485aae17 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -22,7 +22,7 @@ BINUVERSION ?= "2.39%" GDBVERSION ?= "12.%" GLIBCVERSION ?= "2.36" LINUXLIBCVERSION ?= "5.19%" -QEMUVERSION ?= "7.1%" +QEMUVERSION ?= "7.2%" GOVERSION ?= "1.19%" LLVMVERSION ?= "15.%" RUSTVERSION ?= "1.66%" diff --git a/meta/recipes-devtools/qemu/qemu-native_7.1.0.bb b/meta/recipes-devtools/qemu/qemu-native_7.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_7.1.0.bb rename to meta/recipes-devtools/qemu/qemu-native_7.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_7.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_7.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_7.1.0.bb rename to meta/recipes-devtools/qemu/qemu-system-native_7.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 27e3a8e259..b63c643dd8 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -27,15 +27,12 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-tests-meson.build-use-relative-path-to-refer-to-file.patch \ file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \ file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \ - file://0001-net-tulip-Restrict-DMA-engine-to-memories.patch \ file://0001-contrib-vhost-user-blk-Replace-lseek64-with-lseek.patch \ file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \ - file://arm-cpreg-fix.patch \ - file://CVE-2022-3165.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "a0634e536bded57cf38ec8a751adb124b89c776fe0846f21ab6c6728f1cbbbe6" +SRC_URI[sha256sum] = "5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157" SRC_URI:append:class-target = " file://cross.patch" SRC_URI:append:class-nativesdk = " file://cross.patch" @@ -72,15 +69,16 @@ do_install_ptest() { sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash," ${D}${PTEST_PATH}/tests/data/acpi/disassemle-aml.sh # Strip the paths from the QEMU variable, we can use PATH - sed -i -e "s#^QEMU=.*/qemu-#QEMU=qemu-#g" ${D}${PTEST_PATH}/tests/tcg/*.mak + makfiles=$(find ${D}${PTEST_PATH} -name "*.mak") + sed -i -e "s#^QEMU=.*/qemu-#QEMU=qemu-#g" $makfiles # Strip compiler flags as they break reproducibility sed -i -e "s,^CC=.*,CC=gcc," \ -e "s,^CCAS=.*,CCAS=gcc," \ - -e "s,^LD=.*,LD=ld," ${D}${PTEST_PATH}/tests/tcg/*.mak + -e "s,^LD=.*,LD=ld," $makfiles # Update SRC_PATH variable to the right place on target - sed -i -e "s#^SRC_PATH=.*#SRC_PATH=${PTEST_PATH}#g" ${D}${PTEST_PATH}/tests/tcg/*.mak + sed -i -e "s#^SRC_PATH=.*#SRC_PATH=${PTEST_PATH}#g" $makfiles } @@ -200,7 +198,7 @@ PACKAGECONFIG[bpf] = "--enable-bpf,--disable-bpf,libbpf" PACKAGECONFIG[capstone] = "--enable-capstone,--disable-capstone" PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma" PACKAGECONFIG[vde] = "--enable-vde,--disable-vde" -PACKAGECONFIG[slirp] = "--enable-slirp=internal,--disable-slirp" +PACKAGECONFIG[slirp] = "--enable-slirp,--disable-slirp,libslirp" PACKAGECONFIG[brlapi] = "--enable-brlapi,--disable-brlapi" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack," diff --git a/meta/recipes-devtools/qemu/qemu/0001-net-tulip-Restrict-DMA-engine-to-memories.patch b/meta/recipes-devtools/qemu/qemu/0001-net-tulip-Restrict-DMA-engine-to-memories.patch deleted file mode 100644 index 6c85a77ba7..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0001-net-tulip-Restrict-DMA-engine-to-memories.patch +++ /dev/null @@ -1,64 +0,0 @@ -CVE: CVE-2022-2962 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 5c5c50b0a73d78ffe18336c9996fef5eae9bbbb0 Mon Sep 17 00:00:00 2001 -From: Zheyu Ma -Date: Sun, 21 Aug 2022 20:43:43 +0800 -Subject: [PATCH] net: tulip: Restrict DMA engine to memories - -The DMA engine is started by I/O access and then itself accesses the -I/O registers, triggering a reentrancy bug. - -The following log can reveal it: -==5637==ERROR: AddressSanitizer: stack-overflow - #0 0x5595435f6078 in tulip_xmit_list_update qemu/hw/net/tulip.c:673 - #1 0x5595435f204a in tulip_write qemu/hw/net/tulip.c:805:13 - #2 0x559544637f86 in memory_region_write_accessor qemu/softmmu/memory.c:492:5 - #3 0x5595446379fa in access_with_adjusted_size qemu/softmmu/memory.c:554:18 - #4 0x5595446372fa in memory_region_dispatch_write qemu/softmmu/memory.c - #5 0x55954468b74c in flatview_write_continue qemu/softmmu/physmem.c:2825:23 - #6 0x559544683662 in flatview_write qemu/softmmu/physmem.c:2867:12 - #7 0x5595446833f3 in address_space_write qemu/softmmu/physmem.c:2963:18 - #8 0x5595435fb082 in dma_memory_rw_relaxed qemu/include/sysemu/dma.h:87:12 - #9 0x5595435fb082 in dma_memory_rw qemu/include/sysemu/dma.h:130:12 - #10 0x5595435fb082 in dma_memory_write qemu/include/sysemu/dma.h:171:12 - #11 0x5595435fb082 in stl_le_dma qemu/include/sysemu/dma.h:272:1 - #12 0x5595435fb082 in stl_le_pci_dma qemu/include/hw/pci/pci.h:910:1 - #13 0x5595435fb082 in tulip_desc_write qemu/hw/net/tulip.c:101:9 - #14 0x5595435f7e3d in tulip_xmit_list_update qemu/hw/net/tulip.c:706:9 - #15 0x5595435f204a in tulip_write qemu/hw/net/tulip.c:805:13 - -Fix this bug by restricting the DMA engine to memories regions. - -Signed-off-by: Zheyu Ma -Signed-off-by: Jason Wang ---- - hw/net/tulip.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hw/net/tulip.c b/hw/net/tulip.c -index 097e905bec..b9e42c322a 100644 ---- a/hw/net/tulip.c -+++ b/hw/net/tulip.c -@@ -70,7 +70,7 @@ static const VMStateDescription vmstate_pci_tulip = { - static void tulip_desc_read(TULIPState *s, hwaddr p, - struct tulip_descriptor *desc) - { -- const MemTxAttrs attrs = MEMTXATTRS_UNSPECIFIED; -+ const MemTxAttrs attrs = { .memory = true }; - - if (s->csr[0] & CSR0_DBO) { - ldl_be_pci_dma(&s->dev, p, &desc->status, attrs); -@@ -88,7 +88,7 @@ static void tulip_desc_read(TULIPState *s, hwaddr p, - static void tulip_desc_write(TULIPState *s, hwaddr p, - struct tulip_descriptor *desc) - { -- const MemTxAttrs attrs = MEMTXATTRS_UNSPECIFIED; -+ const MemTxAttrs attrs = { .memory = true }; - - if (s->csr[0] & CSR0_DBO) { - stl_be_pci_dma(&s->dev, p, desc->status, attrs); --- -2.34.1 - diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2022-3165.patch b/meta/recipes-devtools/qemu/qemu/CVE-2022-3165.patch deleted file mode 100644 index 3b4a6694c2..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2022-3165.patch +++ /dev/null @@ -1,59 +0,0 @@ -CVE: CVE-2022-3165 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From d307040b18bfcb1393b910f1bae753d5c12a4dc7 Mon Sep 17 00:00:00 2001 -From: Mauro Matteo Cascella -Date: Sun, 25 Sep 2022 22:45:11 +0200 -Subject: [PATCH] ui/vnc-clipboard: fix integer underflow in - vnc_client_cut_text_ext - -Extended ClientCutText messages start with a 4-byte header. If len < 4, -an integer underflow occurs in vnc_client_cut_text_ext. The result is -used to decompress data in a while loop in inflate_buffer, leading to -CPU consumption and denial of service. Prevent this by checking dlen in -protocol_client_msg. - -Fixes: CVE-2022-3165 -Fixes: 0bf41cab93e5 ("ui/vnc: clipboard support") -Reported-by: TangPeng -Signed-off-by: Mauro Matteo Cascella -Message-Id: <20220925204511.1103214-1-mcascell@redhat.com> -Signed-off-by: Gerd Hoffmann ---- - ui/vnc.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/ui/vnc.c b/ui/vnc.c -index 6a05d06147..acb3629cd8 100644 ---- a/ui/vnc.c -+++ b/ui/vnc.c -@@ -2442,8 +2442,8 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) - if (len == 1) { - return 8; - } -+ uint32_t dlen = abs(read_s32(data, 4)); - if (len == 8) { -- uint32_t dlen = abs(read_s32(data, 4)); - if (dlen > (1 << 20)) { - error_report("vnc: client_cut_text msg payload has %u bytes" - " which exceeds our limit of 1MB.", dlen); -@@ -2456,8 +2456,13 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) - } - - if (read_s32(data, 4) < 0) { -- vnc_client_cut_text_ext(vs, abs(read_s32(data, 4)), -- read_u32(data, 8), data + 12); -+ if (dlen < 4) { -+ error_report("vnc: malformed payload (header less than 4 bytes)" -+ " in extended clipboard pseudo-encoding."); -+ vnc_client_error(vs); -+ break; -+ } -+ vnc_client_cut_text_ext(vs, dlen, read_u32(data, 8), data + 12); - break; - } - vnc_client_cut_text(vs, read_u32(data, 4), data + 8); --- -GitLab - diff --git a/meta/recipes-devtools/qemu/qemu/arm-cpreg-fix.patch b/meta/recipes-devtools/qemu/qemu/arm-cpreg-fix.patch deleted file mode 100644 index 071691f8ca..0000000000 --- a/meta/recipes-devtools/qemu/qemu/arm-cpreg-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -target/arm: mark SP_EL1 with ARM_CP_EL3_NO_EL2_KEEP - -SP_EL1 must be kept when EL3 is present but EL2 is not. Therefore mark -it with ARM_CP_EL3_NO_EL2_KEEP. - -Fixes: 696ba3771894 ("target/arm: Handle cpreg registration for missing EL") -Signed-off-by: Jerome Forissier - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2022-09/msg04515.html] - ---- - target/arm/helper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: qemu-7.1.0/target/arm/helper.c -=================================================================== ---- qemu-7.1.0.orig/target/arm/helper.c -+++ qemu-7.1.0/target/arm/helper.c -@@ -4971,7 +4971,7 @@ static const ARMCPRegInfo v8_cp_reginfo[ - .fieldoffset = offsetof(CPUARMState, sp_el[0]) }, - { .name = "SP_EL1", .state = ARM_CP_STATE_AA64, - .opc0 = 3, .opc1 = 4, .crn = 4, .crm = 1, .opc2 = 0, -- .access = PL2_RW, .type = ARM_CP_ALIAS, -+ .access = PL2_RW, .type = ARM_CP_ALIAS | ARM_CP_EL3_NO_EL2_KEEP, - .fieldoffset = offsetof(CPUARMState, sp_el[1]) }, - { .name = "SPSel", .state = ARM_CP_STATE_AA64, - .opc0 = 3, .opc1 = 0, .crn = 4, .crm = 2, .opc2 = 0, diff --git a/meta/recipes-devtools/qemu/qemu_7.1.0.bb b/meta/recipes-devtools/qemu/qemu_7.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_7.1.0.bb rename to meta/recipes-devtools/qemu/qemu_7.2.0.bb