From patchwork Tue Apr 5 10:41:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 6314 X-Patchwork-Delegate: akuster808@gmail.com 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 DB8F8C43217 for ; Tue, 5 Apr 2022 17:24:46 +0000 (UTC) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mx.groups.io with SMTP id smtpd.web11.4393.1649155289011012926 for ; Tue, 05 Apr 2022 03:41:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jXTchh+z; spf=pass (domain: gmail.com, ip: 209.85.208.43, mailfrom: martin.jansa@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id d10so9583562edj.0 for ; Tue, 05 Apr 2022 03:41:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wbPtRBihDPXxWiolIvOARBbg/ZGGi2kl3ouCu5Z6Gx8=; b=jXTchh+z0N3BDh40BoXIL9OM6aVqokZfOMWZX6m/70jpf6ouMK8fXa/g1Z5ZM6tL9j DW7BdTS5oBUixCiGK4mGDjQqlk+8HjTV+4gqombWNa6b2SkhF9r3h96tM0kXTmemxWoI mlIqQdeik/2No5pr6aTcSltj576hGph2FtCQVIpK9VRDedWeiDgXr02/6nDwsmU/aK+h BTadvkfjruo/XU3/7+3lAZ4u6Ak1uia3mD9T9iCBefi/9u2/GSvq8TPsRpaiGYzKmYAb D3CO0lBD0s7Okbr+Nj5IvGSM4U97MfznyJ9uHTSpd6b4J0VcWYjnskbj2S8RugQDpHi2 bkDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wbPtRBihDPXxWiolIvOARBbg/ZGGi2kl3ouCu5Z6Gx8=; b=gO5tOF2bAinIbrkuUAnNIyRx3bb8ZwIpw9dcQS8kPnS42bUpSXCIm4uU9PKFPVVXt9 2oex5Ix14pVgpAGMRKuX2mfAfgbeqBJBx96e4GG9Qvaiqj+IijYDMCaRq55NveM8wL5r flVc5bohFz5PubHsuTlYScWS7uyl3yUbGp2KXygNqr8z/OVnIrlIKWjmwuhacnLjTwnV 8cYkh33kbObKM8HrHoU5epVvZaZYvtLuVh1xv9WIB9r2VfF3BE6T/H3FQ9hEvYiMTYCf psmNyV9yuqJU2AXLFWmGe5NhZem8zpgcLOmitFz1DpOD5p7v3+h+qpyvZDu1eRy46rho /MKA== X-Gm-Message-State: AOAM5332umXGeUA43LzYbtIrd6SE3gvimC2qoxaxMXUNbbYY9Rj3dqUJ 3XfFnRodOVGbKW++3cdjfbmF9tunW6yHPQ== X-Google-Smtp-Source: ABdhPJzgfnbj2WjSbedKIcRzFop4IlBmnQyfP8khPNzeKfdy1D1a74gDUiqPRUx/ks+IUfv6DxK3tg== X-Received: by 2002:a05:6402:1255:b0:419:3808:3d98 with SMTP id l21-20020a056402125500b0041938083d98mr2850794edw.134.1649155287414; Tue, 05 Apr 2022 03:41:27 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id wn20-20020a170907069400b006e7f3d0c90esm2030647ejb.137.2022.04.05.03.41.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 03:41:27 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][hardknott][PATCH 1/3] packagegroup-meta-multimedia: include x265 only with commercial in LICENSE_FLAGS_WHITELIST Date: Tue, 5 Apr 2022 12:41:21 +0200 Message-Id: <20220405104123.1371786-1-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Apr 2022 17:24:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96425 * fixes: ERROR: Nothing RPROVIDES 'x265' (but meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb RDEPENDS on or otherwise requires it) x265 was skipped: because it has a restricted license 'commercial'. Which is not whitelisted in LICENSE_FLAGS_WHITELIST * also include i686 so that it's included e.g. with default DEFAULTTUNE of qemux86 as recipe allows that with: COMPATIBLE_HOST = '(x86_64|i.86).*-linux' i586 isn't used by qemux86 since: commit f3b1e577ec94c849d0354f5679257f02ef4e4fe9 Author: Alexander Kanavin Date: Thu May 16 17:04:04 2019 +0200 qemux86: use a Core 2 Duo CPU instead of the original circa-1993 Pentium Signed-off-by: Martin Jansa --- .../packagegroups/packagegroup-meta-multimedia.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index 73b852a4a9..ee8b862681 100644 --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -72,7 +72,7 @@ RDEPENDS_packagegroup-meta-multimedia = "\ tinyalsa \ tremor \ webrtc-audio-processing \ - ${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64", "x265", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \ " RDEPENDS_packagegroup-meta-multimedia_remove_libc-musl = "projucer" RDEPENDS_packagegroup-meta-multimedia_remove_powerpc64le = "openh264" From patchwork Tue Apr 5 10:41:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 6315 X-Patchwork-Delegate: akuster808@gmail.com 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 DDA1AC433F5 for ; Tue, 5 Apr 2022 17:24:46 +0000 (UTC) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.groups.io with SMTP id smtpd.web12.4575.1649155290113240096 for ; Tue, 05 Apr 2022 03:41:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=buRGQ+fu; spf=pass (domain: gmail.com, ip: 209.85.218.48, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id bq8so25751339ejb.10 for ; Tue, 05 Apr 2022 03:41:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5J+T6+FlZ/3HsDHcNgj39LRvxsstwUfGjJibznQIcOc=; b=buRGQ+fugQ199QSuQ906Jw71isOxB9s5DgzHjLnl387k8sBi/qjoMfktrqy9Djy+kG YEthwqqpt4mFEswbSgmJ9WrAQRuGeMPYeNPxJJMv8blf8bqUwh18cFhVU1xiDth6/lSq uZ71G1ASDuBWiHky53HXvSuSvurxNgBSizGG57wedMCOerQTBjzNuo5w2MNlU54oQ+FC Ytgl/0S2s5UTneGEnPFUYbIJj+gg7T2BshJR8ji5TpEMny0ezTa4cjABeLwyW7hYFTDO BiVcWX0PbOPOMqSuUm8tpNucQqFDtvM6QMRlF+fvSb9Iz+sol8ImLsgm1kyFxHqILnms teXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5J+T6+FlZ/3HsDHcNgj39LRvxsstwUfGjJibznQIcOc=; b=CCBPSNoOtMMhoG7S1M5uZ+s19MRpuUpBsOtg0j2Dz/5zT//ZiNyAA+GxfaipwxxiyD HJbjbVKeZ6QH+69LLQlt96fLEwrEhAMmet9zGeEZYL7XUCunK/XepXybFrXu3T7wzoGi M9v3gUlTsxw0hppq+q8muwUQqprDNynbh1Xor2XFGCjQ+YYxaC9ZBhNPmvsRruntBaWv Mdu7Mm7odxzkqQ6ke8/jzTEpFahvHtxvt4f5R9N5ZQemOx13fEdbQZgHL9yCE4a+As2r qbgNAwHbpNj1YCeNjG53draWJhlEdeaV0v+0+uAfiNR6eXln8KkpTaX+OoQCAL1p5qu1 EQ4A== X-Gm-Message-State: AOAM5333F/5hq2JxwDHTKItZ2WaRw6T8N7Vk/zNIyOBMKFVi6uxutjBn uC0cZLm2GeOHZNvlHv7Xt5llxLqFhnKK3g== X-Google-Smtp-Source: ABdhPJzc6mxA/8iNCj3F87NPM0I3AYuhu6WmN7qRDfSanhbHPF6o0vNawQAQBNU3b6BgoGvfoTlIIg== X-Received: by 2002:a17:907:dab:b0:6df:e51a:b990 with SMTP id go43-20020a1709070dab00b006dfe51ab990mr2715102ejc.573.1649155288393; Tue, 05 Apr 2022 03:41:28 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id z1-20020a170906434100b006e7efa329fbsm2456661ejm.109.2022.04.05.03.41.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 03:41:28 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Khem Raj , Martin Jansa Subject: [meta-oe][hardknott][PATCH 2/3] abseil-cpp: Fix build with glibc 2.34 Date: Tue, 5 Apr 2022 12:41:22 +0200 Message-Id: <20220405104123.1371786-2-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405104123.1371786-1-Martin.Jansa@gmail.com> References: <20220405104123.1371786-1-Martin.Jansa@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Apr 2022 17:24:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96426 From: Khem Raj * based on commit from honister, but without the upgrade: commit 8691de2580dd872e3d001d67c8455108b3bd627c Author: Khem Raj Date: Sat May 8 14:38:52 2021 -0700 abseil-cpp: Upgrade to lts_2021_03_24 Fix build with glibc 2.34 while here Forward patches to this version Let system package the libraries to fix abseil-cpp-native build on e.g. Ubuntu-22.04 with glibc-2.34 to fix: | FAILED: absl/debugging/CMakeFiles/failure_signal_handler.dir/failure_signal_handler.cc.o | /OE/lge/build/webosose/hardknott/BUILD/hosttools/g++ -Dfailure_signal_handler_EXPORTS -I/OE/lge/build/webosose/hardknott/BUILD/work/x86_64-linux/abseil-cpp-native/20200923+gitAUTOINC+6f9d96a1f4-r0/git -isystem/OE/lge/build/webosose/hardknott/BUILD/work/x86_64-linux/abseil-cpp-native/20200923+gitAUTOINC+6f9d96a1f4-r0/recipe-sysroot-native/usr/include -O2 -pipe -fPIC -Wall -Wextra -Wcast-qual -Wconversion-null -Wmissing-declarations -Woverlength-strings -Wpointer-arith -Wundef -Wunused-local-typedefs -Wunused-result -Wvarargs -Wvla -Wwrite-strings -Wno-missing-field-initializers -Wno-sign-compare -DNOMINMAX -std=gnu++14 -MD -MT absl/debugging/CMakeFiles/failure_signal_handler.dir/failure_signal_handler.cc.o -MF absl/debugging/CMakeFiles/failure_signal_handler.dir/failure_signal_handler.cc.o.d -o absl/debugging/CMakeFiles/failure_signal_handler.dir/failure_signal_handler.cc.o -c /OE/lge/build/webosose/hardknott/BUILD/work/x86_64-linux/abseil-cpp-native/20200923+gitAUTOINC+6f9d96a1f4-r0/git/absl/debugging/failure_signal_handler.cc | /OE/lge/build/webosose/hardknott/BUILD/work/x86_64-linux/abseil-cpp-native/20200923+gitAUTOINC+6f9d96a1f4-r0/git/absl/debugging/failure_signal_handler.cc: In function ‘bool absl::lts_2020_09_23::SetupAlternateStackOnce()’: | /OE/lge/build/webosose/hardknott/BUILD/work/x86_64-linux/abseil-cpp-native/20200923+gitAUTOINC+6f9d96a1f4-r0/git/absl/debugging/failure_signal_handler.cc:138:32: error: no matching function for call to ‘max(long int, int)’ | 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; | | ~~~~~~~~^~~~~~~~~~~~~~~~~ Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...01-Export-of-internal-Abseil-changes.patch | 82 +++++++++++++++++++ .../abseil-cpp/abseil-cpp_git.bb | 1 + 2 files changed, 83 insertions(+) create mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch new file mode 100644 index 0000000000..c0fb0571f7 --- /dev/null +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch @@ -0,0 +1,82 @@ +From d3424201a73f29ab533121b1821a76e1b4313beb Mon Sep 17 00:00:00 2001 +From: Abseil Team +Date: Mon, 3 May 2021 07:37:39 -0700 +Subject: [PATCH] Export of internal Abseil changes + +-- +cf88f9cf40eab54c06bca7f20795352ec23bb583 by Derek Mauro : + +Fixes build with latest glibc +Fixes #952 + +PiperOrigin-RevId: 371693908 + +-- +99bcd0f4a747ce7a401e23c745adf34d0ec5131b by Samuel Benzaquen : + +Add support for std::string_view in StrFormat even when +absl::string_view != std::string_view. + +PiperOrigin-RevId: 371693633 + +-- +e35463572149a6c2d4a0d439b9300ce03fd6b96d by Abseil Team : + +Cmake builds should only install pkg-config when explicitly requested. + +PiperOrigin-RevId: 371403419 +GitOrigin-RevId: cf88f9cf40eab54c06bca7f20795352ec23bb583 +Change-Id: I4360a18c638a4d901ff44ab1e0a9d8f321c302ea +--- + absl/debugging/failure_signal_handler.cc | 3 ++- + absl/strings/internal/str_format/arg.h | 8 ++++++++ + absl/strings/internal/str_format/convert_test.cc | 3 +++ + 3 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc +index 5d13bdbb..2ed137b5 100644 +--- a/absl/debugging/failure_signal_handler.cc ++++ b/absl/debugging/failure_signal_handler.cc +@@ -135,7 +135,8 @@ static bool SetupAlternateStackOnce() { + #else + const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; + #endif +- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; ++ size_t stack_size = ++ (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; + #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ + defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) + // Account for sanitizer instrumentation requiring additional stack space. +diff --git a/absl/strings/internal/str_format/arg.h b/absl/strings/internal/str_format/arg.h +index 3dbc1526..f9d89d12 100644 +--- a/absl/strings/internal/str_format/arg.h ++++ b/absl/strings/internal/str_format/arg.h +@@ -108,6 +108,14 @@ StringConvertResult FormatConvertImpl(const std::string& v, + StringConvertResult FormatConvertImpl(string_view v, + FormatConversionSpecImpl conv, + FormatSinkImpl* sink); ++#if defined(ABSL_HAVE_STD_STRING_VIEW) && !defined(ABSL_USES_STD_STRING_VIEW) ++inline StringConvertResult FormatConvertImpl(std::string_view v, ++ FormatConversionSpecImpl conv, ++ FormatSinkImpl* sink) { ++ return FormatConvertImpl(absl::string_view(v.data(), v.size()), conv, sink); ++} ++#endif // ABSL_HAVE_STD_STRING_VIEW && !ABSL_USES_STD_STRING_VIEW ++ + ArgConvertResult + FormatConvertImpl(const char* v, const FormatConversionSpecImpl conv, +diff --git a/absl/strings/internal/str_format/convert_test.cc b/absl/strings/internal/str_format/convert_test.cc +index 634ee78b..cc789530 100644 +--- a/absl/strings/internal/str_format/convert_test.cc ++++ b/absl/strings/internal/str_format/convert_test.cc +@@ -215,6 +215,9 @@ TEST_F(FormatConvertTest, BasicString) { + TestStringConvert(static_cast("hello")); + TestStringConvert(std::string("hello")); + TestStringConvert(string_view("hello")); ++#if defined(ABSL_HAVE_STD_STRING_VIEW) ++ TestStringConvert(std::string_view("hello")); ++#endif // ABSL_HAVE_STD_STRING_VIEW + } + + TEST_F(FormatConvertTest, NullString) { diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index 569bb13993..a49fe672e8 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ file://0001-absl-always-use-asm-sgidefs.h.patch \ file://0002-Remove-maes-option-from-cross-compilation.patch \ file://abseil-ppc-fixes.patch \ + file://0001-Export-of-internal-Abseil-changes.patch \ " S = "${WORKDIR}/git" From patchwork Tue Apr 5 10:41:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 6316 X-Patchwork-Delegate: akuster808@gmail.com 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 EC963C4167D for ; Tue, 5 Apr 2022 17:24:46 +0000 (UTC) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by mx.groups.io with SMTP id smtpd.web10.4497.1649155290916434981 for ; Tue, 05 Apr 2022 03:41:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XFKHxoIg; spf=pass (domain: gmail.com, ip: 209.85.208.49, mailfrom: martin.jansa@gmail.com) Received: by mail-ed1-f49.google.com with SMTP id f18so9319944edc.5 for ; Tue, 05 Apr 2022 03:41:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l/1NyAsjw4r5T6IkjBiVIrhQegQWwDgEtczfazjar2E=; b=XFKHxoIgcniHbPatHE1RUlO+eVSGDTfoIu0qUrMeBkaQKKuKzAQxnvZKcruhZelu5P pZyLbLf/1hqsABD4cVDK/i3a2F+gmJ+F4IwNcwxx2qa1NOUZ8pYPnE6acAARXVKsYVht nvzXHJXT9vM2ovu25hX+a093eRS+FMaGGQ6MQJw+h7qIP5LijmXI511irFNZzgMRcNwo q15ku/qvJdvsaxgp9p3iFkEjnewC9Z7tJMxjG8TEpaXhSNIrszp/X8lgwUSKac8+9PjI 6CAoUYrvUbOR10vCE9y3qp4J0YKi6E7C92wS1XVZk87uIhkDFnJiCAa+F5yj8qtofB5h IWfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l/1NyAsjw4r5T6IkjBiVIrhQegQWwDgEtczfazjar2E=; b=T4vAEFoFGEwAefp5RlYZnbHHMjIe2fLfmrnZoN9ID76ggpMYAmVQRKFuFX9JtzxcW6 0mGoAiQMoAkyk6jPXI1ivS+90iTHYZZasTT3jL6Q4BUg+6r6oIT3JMEg/w54qmNBfjN8 voU4G/QHU/h6iyKoP3kTJheGJOvlUW+eufHGV7PZ2tRWLb+P7DPTXbHzsaYcdP0FKvUf WFq/u4F3pyvpWuqyNDHE3wazqYe5brAICuiHWoF9G09w+xEpGl5hTHkCoDHBzXSzmh7m JZfvRFMu6hZVXx4LJ3oZGz5ew4IfWWueRPXNbr/aROZ0UNlxKEjuQ19mfZno9uxDWMFE NCPw== X-Gm-Message-State: AOAM531P5IQ9TE1UgfmYiBAYnAq51rI3qHVfGqmKqCWbREk4OKiB9opU Q+ghTpff3AKmdy8qQvBgnXXhEcZRAodXGw== X-Google-Smtp-Source: ABdhPJzqMvG+1G4LLh8fdy0DHygt7mDEmZgGnf6uGcsq7nlpohMOzYRxVgv7DDXV3iGHogbKY6Uh4A== X-Received: by 2002:a05:6402:4407:b0:419:3859:697e with SMTP id y7-20020a056402440700b004193859697emr2842803eda.400.1649155289341; Tue, 05 Apr 2022 03:41:29 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id p24-20020a056402045800b0041614c8f79asm6364853edw.88.2022.04.05.03.41.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 03:41:29 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][hardknott][PATCH 3/3] htop: switch branch from master to main Date: Tue, 5 Apr 2022 12:41:23 +0200 Message-Id: <20220405104123.1371786-3-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405104123.1371786-1-Martin.Jansa@gmail.com> References: <20220405104123.1371786-1-Martin.Jansa@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Apr 2022 17:24:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96427 * the branch was renamed in upstream * it's already resolved in meta-oe/kirkstone since this commit: commit cef2d1429bedbc256c5fac7a1a336842865dc2d3 Author: Robert Joslyn Date: Sat Jan 15 06:19:04 2022 -0800 Subject: htop: Update to 3.1.2 Upstream renamed the branch to "main", update SRC_URI. Signed-off-by: Martin Jansa --- meta-oe/recipes-support/htop/htop_3.0.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/htop/htop_3.0.5.bb b/meta-oe/recipes-support/htop/htop_3.0.5.bb index e574fbdbb1..5328aff7c0 100644 --- a/meta-oe/recipes-support/htop/htop_3.0.5.bb +++ b/meta-oe/recipes-support/htop/htop_3.0.5.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891" DEPENDS = "ncurses" -SRC_URI = "git://github.com/htop-dev/htop.git;branch=master;protocol=https \ +SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https \ file://0001-Use-pkg-config.patch \ " SRCREV = "ce6d60e7def146c13d0b8bca4642e7401a0a8995"