From patchwork Thu Aug 4 14:06:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 10945 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 50A56C19F2A for ; Thu, 4 Aug 2022 14:07:55 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web08.5184.1659622070690521529 for ; Thu, 04 Aug 2022 07:07:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=fHOy/WyC; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id p14-20020a17090a74ce00b001f4d04492faso5734384pjl.4 for ; Thu, 04 Aug 2022 07:07:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7rWFwBOeF+6CF/NW4OAWiOA1o5YAcgFSI/xX2oh881Y=; b=fHOy/WyCXlEtCRja+sLF/YVCMhVW6S/KgdtdVs/kMnyB7EYAfHjljdSKg8hF1yyz7F 5CDU60sBENlUyoSj60O0BLx1SxehYZ5jyhWitzFfLojM0W+t9GWlJZP+G6G/+e7yX1bT 7Z4ePSFt2A3qqsBWbBKUoeitWkhI2lVJLK88jMaVLtQ2xasOgdvVIKPHGoz8kAxAEhiO 6JwcWLz/3smORws99eaob4vkxvdfos3qBd6EfSSXUD/++z0eW5Ef86R9WG9JsJ6WlMqh kSQ51ed3kQ72HYj7fI0QEz57KjzjShSb2VHWCyQsHHtQgKNlHZxz8i7cedlaPZQuJ66X fieA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7rWFwBOeF+6CF/NW4OAWiOA1o5YAcgFSI/xX2oh881Y=; b=uxo55zOTfNFT22EY+9/100Evk2piSOQQe9nxu8NI/67pZANPuQsGyci+gSunHQtMs3 VAkZofowmNy4idj1Lnsp9U+dCYh9H6fY4wHVFdpKMP1ER7Lg551p2VbnjQHI5t2fkzVQ dIYe/S8hiC5WvPrJZFriBgGiQGNOqeINGZY+LneZoM+v7iv9yrYKiZCMpDmRcu+4V6w2 +d/AW+N/TPMiULi5JMI2ts0OX7c56zPADHknK8CX5ShYGuAspJOoRpUv1qxMdztIcmIB /EfTpiAiACza/DVFKNMf7QjanTtKyUKlDrYXQ0Wc8leMOgtGcN2uCYCXTyWsy0lvWHNB qbiQ== X-Gm-Message-State: ACgBeo2koGwmEg9HLhhBy3qC5tzozkHAWk4qDTXwD5ds197UUyOemr6H hoxRO9+fOuGnSJ0a6k6kD5JKen2d50Jc/87i X-Google-Smtp-Source: AA6agR7fiWwDGrs3QZKaKLEgg1kw1mUZMnci9TgDaflxcuJv3fR7ACaoeHL/kjUPDIqxVKX+g4YBsg== X-Received: by 2002:a17:902:9005:b0:16d:1ffd:cf56 with SMTP id a5-20020a170902900500b0016d1ffdcf56mr2086676plp.119.1659622069476; Thu, 04 Aug 2022 07:07:49 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 196-20020a6215cd000000b0052d5e93fcb7sm970261pfv.191.2022.08.04.07.07.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 07:07:35 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 1/7] binutils: stable 2.38 branch updates Date: Thu, 4 Aug 2022 04:06:04 -1000 Message-Id: <4eb53b33bc46a8131653354bd077229ee7ee42ed.1659621460.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 04 Aug 2022 14:07:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/168850 From: Sundeep KOKKONDA Below commits on Binutils-2.38 development branch are updated. 5c0b4ee4060 i386: Don't allow GOTOFF relocation against IFUNC symbol for PIC 19892fedb7b x86: Properly check invalid relocation against protected symbol b8a2baa80b1 libctf: tests: prune warnings from compiler output 7f9a495a167 libctf: fix linking together multiple objects derived from the same source 97dd8079feb PowerPC64: fix assertion in ppc_build_one_stub with -Os code Signed-off-by: Sundeep KOKKONDA Signed-off-by: Steve Sakoman --- meta/recipes-devtools/binutils/binutils-2.38.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils-2.38.inc b/meta/recipes-devtools/binutils/binutils-2.38.inc index 742ca86379..eed252976a 100644 --- a/meta/recipes-devtools/binutils/binutils-2.38.inc +++ b/meta/recipes-devtools/binutils/binutils-2.38.inc @@ -18,7 +18,7 @@ SRCBRANCH ?= "binutils-2_38-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" -SRCREV ?= "eed56ee299b9ef8754bb4e53f2e9cf2a7c28c04d" +SRCREV ?= "5c0b4ee406035917d0e50aa138194fab57ae6bf8" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ From patchwork Thu Aug 4 14:06:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 10946 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 4FB05C19F2A for ; Thu, 4 Aug 2022 14:08:35 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web11.5147.1659622114571565437 for ; Thu, 04 Aug 2022 07:08:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=L4T8oChl; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d16so11325451pll.11 for ; Thu, 04 Aug 2022 07:08:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=E3nz8SLb6Tkr0Ii3zablwUamWwe9U7uy5ediw6ylS8Q=; b=L4T8oChlGLc1fUUO57CeKa+D/9PHfkRp6nlJo9vPXBRAFIOhtKna1ytAIEKxgUFy6G Okqrp/2s3Md38qTznQ91AwMRi+IRxcKH/MMK6SlS+KQkctBl7UOYe9mnZ1AoEnxXe+gM iCfs42YkRu53NBD9Oyph85sr+EzsqDDPUUEExKwbcO/rPAIMY1DvaRdFyDIbESGwMbm6 vAFkYppqnNJsOrgCv9Si4Cqn0up9nxQcki8TymthnpdBxo0YSxC1Ic7iTmHXPpLSufU4 4tan6OmrQpH2otonCARQTzOZrq/RvpPw/xfLSRLrMpaJoiiw6OMIwRatdxF2woOAGKOp zEQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E3nz8SLb6Tkr0Ii3zablwUamWwe9U7uy5ediw6ylS8Q=; b=nwvkHxEJzMt8ixaRY9UWRj6yplRUwjVOSNxVirL0HSuqmpBqIUdpc48mVeyPuJp4xr jIkTaTazqGKiIecnDe7FY7COYJdrg/HlvCE9u/dX53B64TkA/dzSzUICSesDTTKE9ooK 8EZJHOgP2hlsfq7F5aaygxD2Zp7LUVRPp1rxFwXWzKl3yhPT2mSnWj8nus9SNraTH/nq 1es3F2OGggZRjGuJyG429Gc2G33LNXY3BvIM6g6Cf2S1qTbrxfZRRruMJE/vDH1r8Kuw yW5KUniH1uyeU+vSfBX1PevAvKMVSBAllICtEJHTHZrz3mMwmAQLTsBgAMf2yVp/8X+o IY0w== X-Gm-Message-State: ACgBeo0UPw0pYhzGy6gNQ9zg8rhHMaSHOMU4REjX8fTv1EMFHYTBAvRL hwCZPBzQDGrp8B4ZC9uQHv19djfwUMWdpxod X-Google-Smtp-Source: AA6agR6DWb0R1XcaDa00dsLspvV/Q9b81ZolAJ4d5Uuq68OqS5PiMR57pSIzXkKrB72b3Mqy/vy4Xg== X-Received: by 2002:a17:903:24c:b0:16f:8937:6ac7 with SMTP id j12-20020a170903024c00b0016f89376ac7mr660369plh.6.1659622113436; Thu, 04 Aug 2022 07:08:33 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 196-20020a6215cd000000b0052d5e93fcb7sm970261pfv.191.2022.08.04.07.08.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 07:08:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 2/7] package_manager/ipk: do not pipe stderr to stdout Date: Thu, 4 Aug 2022 04:06:05 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 04 Aug 2022 14:08:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/168851 From: Shruthi Ravichandran Some opkg commands print an error during cleanup when the tmp_dir does not exist and an attempt is made to delete it. The error messages are harmless and the opkg commands eventually succeed. When these commands are run and stderr is piped to stdout, the error messages may clobber the stdout and cause unexpected results while parsing the output of the command. Therefore, when parsing the output of a command, do not pipe stderr to stdout. Instead, capture stderr and stdout separately, and upon success, send stderr to bb.note(). Signed-off-by: Shruthi Ravichandran Signed-off-by: Richard Purdie (cherry picked from commit f2167ae80258253eb47a5b148546b265320284cc) Signed-off-by: Steve Sakoman --- meta/lib/oe/package_manager/ipk/__init__.py | 23 ++++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/meta/lib/oe/package_manager/ipk/__init__.py b/meta/lib/oe/package_manager/ipk/__init__.py index 4cd3963111..9f60f3abcc 100644 --- a/meta/lib/oe/package_manager/ipk/__init__.py +++ b/meta/lib/oe/package_manager/ipk/__init__.py @@ -102,12 +102,14 @@ class OpkgDpkgPM(PackageManager): This method extracts the common parts for Opkg and Dpkg """ - try: - output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).decode("utf-8") - except subprocess.CalledProcessError as e: + proc = subprocess.run(cmd, capture_output=True, encoding="utf-8", shell=True) + if proc.returncode: bb.fatal("Unable to list available packages. Command '%s' " - "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8"))) - return opkg_query(output) + "returned %d:\n%s" % (cmd, proc.returncode, proc.stderr)) + elif proc.stderr: + bb.note("Command '%s' returned stderr: %s" % (cmd, proc.stderr)) + + return opkg_query(proc.stdout) def extract(self, pkg, pkg_info): """ @@ -443,15 +445,16 @@ class OpkgPM(OpkgDpkgPM): cmd = "%s %s --noaction install %s " % (self.opkg_cmd, opkg_args, ' '.join(pkgs)) - try: - output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) - except subprocess.CalledProcessError as e: + proc = subprocess.run(cmd, capture_output=True, encoding="utf-8", shell=True) + if proc.returncode: bb.fatal("Unable to dummy install packages. Command '%s' " - "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8"))) + "returned %d:\n%s" % (cmd, proc.returncode, proc.stderr)) + elif proc.stderr: + bb.note("Command '%s' returned stderr: %s" % (cmd, proc.stderr)) bb.utils.remove(temp_rootfs, True) - return output + return proc.stdout def backup_packaging_data(self): # Save the opkglib for increment ipk image generation From patchwork Thu Aug 4 14:06:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 10947 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 4FA7AC19F2A for ; Thu, 4 Aug 2022 14:09:05 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web08.5201.1659622138912824570 for ; Thu, 04 Aug 2022 07:08:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=PXHkLNbW; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id y141so19451214pfb.7 for ; Thu, 04 Aug 2022 07:08:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=YpQhel4k9Iw1jJDFphbkwOK5PAEwXmIQg+IeyudthYQ=; b=PXHkLNbWH8ia7Ae+hI1CMxpEVrS+Ruiyr4nstLmVa0ADideot3kv66jbS605qxQzRf nTWCu4hsvc1k4+kfNoA1+Di+8bXZGyws0klm3+QQbVVAnuB5AX4vUsAnsXnVyjPkBRqE a7ve194mIWT5vQuquwU1gmp6i2jA29P36qIzD5YD0EvXRpPOlheJSaIEIg/tyto8jQrN zhPFikVHtuEJP+i4/q9agFtc405hrscjnqdg9EwUn7Exm6gY1udT09E7B4gZIsi/YVV8 6O68KQn6YQ1I5AysKpGkv1MkYGdBemAz6QBuxo+RqiQChlOG11ehRX67gLE2PGE47yvj ZLMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YpQhel4k9Iw1jJDFphbkwOK5PAEwXmIQg+IeyudthYQ=; b=XIXucTRZ5Gt4HJQpxDv8BP6g5WoiEZNGTFWBnX2eGAbvByv4EOV5ChFUr6vCPPOY46 capNYCZTHbJi9AjwT0OGiXDowZfJF+7A5VBoq7sgH7PRBWFVd5sPObE7kGL/j8QNP7t8 +D1PNCa5KmTsXomHh9SGiqgFeh/aiS4brmwpN4sIkP5Vtte7eCJpL7JJR9gK90l9gUXS XWnTQArYSB+dOAvavPdP7Kq09g/qZZDvNn5PrCfNM4gAYORdeF8BCbuUYHwjUBDyRrj4 Sb8Qno0BiGeAwTVWeqci/XDMulP2ds04ObGkcPfIVYsG/ZAln4xLJ6dgSWrJIF050U9G f6Sg== X-Gm-Message-State: ACgBeo3bJrRpd8p9oXw71RLZ/fjHCpTwcTfQCWae+A4/A3VG21EEu7jp h0Sqxgufu73Mlfkg6BCf4y/jtbmpE7P1K+wz X-Google-Smtp-Source: AA6agR6AhTrPl0nY4VBE7q3dbMb1ypu/w43uqbAmoWmgu1XaICMvR0icuzpbyiccAXuZlt1qdSeG5A== X-Received: by 2002:a05:6a00:a8b:b0:4e1:52db:9e5c with SMTP id b11-20020a056a000a8b00b004e152db9e5cmr1886910pfl.38.1659622137766; Thu, 04 Aug 2022 07:08:57 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 196-20020a6215cd000000b0052d5e93fcb7sm970261pfv.191.2022.08.04.07.08.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 07:08:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 3/7] libgcc: Fix standalone target builds with usrmerge distro feature Date: Thu, 4 Aug 2022 04:06:06 -1000 Message-Id: <38fb876253e28577b8fcf4dd47fbb1d0673c6220.1659621460.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 04 Aug 2022 14:09:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/168852 From: Khem Raj Ignore the rmdir cmd if using usrmerge distro feature since the intention is to delete /lib or /lib64 but not libdir under /usr and base_libdir = libdir when usrmerge is enabled in distro Signed-off-by: Khem Raj Signed-off-by: Richard Purdie (cherry picked from commit 3b7f6b0e0f1f16f89cd924aac001b4f661c145ca) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/libgcc-common.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc index d48dc8b823..31f629acaa 100644 --- a/meta/recipes-devtools/gcc/libgcc-common.inc +++ b/meta/recipes-devtools/gcc/libgcc-common.inc @@ -45,10 +45,14 @@ do_install () { } do_install:append:libc-baremetal () { - rmdir ${D}${base_libdir} + if [ "${base_libdir}" != "${libdir}" ]; then + rmdir ${D}${base_libdir} + fi } do_install:append:libc-newlib () { - rmdir ${D}${base_libdir} + if [ "${base_libdir}" != "${libdir}" ]; then + rmdir ${D}${base_libdir} + fi } # No rpm package is actually created but -dev depends on it, avoid dnf error From patchwork Thu Aug 4 14:06:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 10948 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 55C1DC19F2A for ; Thu, 4 Aug 2022 14:09:15 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web11.5158.1659622152514818953 for ; Thu, 04 Aug 2022 07:09:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=R8/CoUeF; spf=softfail (domain: sakoman.com, ip: 209.85.215.179, mailfrom: steve@sakoman.com) Received: by mail-pg1-f179.google.com with SMTP id bh13so18051635pgb.4 for ; Thu, 04 Aug 2022 07:09:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=RCpn7XTT7fprPmmJMxw7UYQsajxZ6b74p4I2t4B4RfE=; b=R8/CoUeF1sh7/gNGaeL/iRR3FDB5nKsyG5DyLohSWMNgNXv/BUbqQXcwAsCQOy11fR NVX0yUucfJDQ7FBhFdxZA/OYAM85KhyMqG3yyLwCrmIpFuMhp6h2hoB9eCD2tqIuDCow 7amUovTZyZSMANdWXOJECvc6SyFwn+Q+CAED6TherYump644jtvgjKVmqijqlAX64iL2 Bg/BYoDGFSPptWCdiB3wiZzc2SK97fY1oXWYUbDKc35i9VwLd3iJpdEKRMiBYRo6owGz ifuByR6O9EEERgnWe56WDLXgAn8UsAqRNyqjhqo+eiI6As+/zmZIKzD9eARxEFP61cfM frMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RCpn7XTT7fprPmmJMxw7UYQsajxZ6b74p4I2t4B4RfE=; b=gaFpxRH/7Q76V1aMdHjDh22D3J8o+YbKciD8DI8NG1/lgYDeGMnQt7hIKIIayAQejf 2ed1Omz5pdLGqdU13sx3t6uyyHs3qNZmOnU7LgzgPfF4lRpELHkEVd/xknLUJx/CM0JK ASPTI+ttK6OY90lxtemG8y7IGWONHFH3XXGzeKnP9OQIQ2jIzNr0kzqQ5Lt9LUfigw6T nSUBvBdzKqpWsYDhhZ7pVGGQXhkvpKVB1sdKqMoAjB7KL2Ofg3DZymEb+Po84eH8J5S/ Kbxsrc9M173VzvPgMow3JkKeu80ZMaIjEVp1cJsy5IsjZQmydTM18vDtK4DQWqhcyZxH MFPQ== X-Gm-Message-State: ACgBeo2e8k8okXF2dI4nVeKU6A1d650N8CfJvLTEPYf8WMm7JXIU5mGZ rJoF6izeOa4L4qpifXkv2wjDcFYTg3tEVHgC X-Google-Smtp-Source: AA6agR7xbVLQQlE+oVv5JxX03/Taoxqta3kGepAvPMO1cCcbMhlBq28E3/f8VO+asqceceF94foYSg== X-Received: by 2002:aa7:8b58:0:b0:52d:8816:a905 with SMTP id i24-20020aa78b58000000b0052d8816a905mr1961532pfd.74.1659622151406; Thu, 04 Aug 2022 07:09:11 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 196-20020a6215cd000000b0052d5e93fcb7sm970261pfv.191.2022.08.04.07.09.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 07:09:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 4/7] linux-firwmare: restore WHENCE_CHKSUM variable Date: Thu, 4 Aug 2022 04:06:07 -1000 Message-Id: <10bc3153effd8c74c541daa00c9c21d0d67165d6.1659621460.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 04 Aug 2022 14:09:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/168853 From: Dmitry Baryshkov Restore WHENCE_CHKSUM variable which is used to hold the WHENCE file checksum. It is necessary to allow easily overriding it from local.conf if the devupstream version is selected: PREFERRED_VERSION_linux-firmware = "1:20220708+git%" SRCREV:class-devupstream = "${AUTOREV}" WHENCE_CHKSUM:class-devupstream:pn-linux-firmware = "abf1077491eeb261ecdcb680a34fc059" Without the WHENCE_CHECKSUM one would need to manually patch the LIC_FILES_CHKSUM variable to change the checksum of WHENC (e.g. using the anonymous python function or remove expression). Signed-off-by: Dmitry Baryshkov Signed-off-by: Richard Purdie (cherry picked from commit 554be2af1e0a03a2d23032d48afbbe0913a45409) Signed-off-by: Steve Sakoman --- .../recipes-kernel/linux-firmware/linux-firmware_20220708.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20220708.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20220708.bb index bde7178164..91c32e49d6 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20220708.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20220708.bb @@ -128,8 +128,11 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=def08711eb23ba967fb7e1f8cff66178 \ + file://WHENCE;md5=${WHENCE_CHKSUM} \ " +# WHENCE checksum is defined separately to ease overriding it if +# class-devupstream is selected. +WHENCE_CHKSUM = "def08711eb23ba967fb7e1f8cff66178" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source From patchwork Thu Aug 4 14:06:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 10949 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 4C5D3C19F2A for ; Thu, 4 Aug 2022 14:09:35 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.5163.1659622174975499027 for ; Thu, 04 Aug 2022 07:09:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1o5ZGWG7; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id x2-20020a17090ab00200b001f4da5cdc9cso5454160pjq.0 for ; Thu, 04 Aug 2022 07:09:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VC8WL8DonGfLOSXiTf7ZcRSAVpL0nBylmnLpByqwTMg=; b=1o5ZGWG7CBfrLrPewl/RDPGratKO6e2Ft//imIFkO2V2eQgmmE0DcIhAZb2zRnabtM llTRQVRTrWQ42uCYbJI34B4NgaChljv2uQzvS0DnLlDMFYMS1InOCLZmbksx0BvzC7DT lOPAMpLtP5jbWKP1pqgAi5HQExDcjADWpcO8oSw7qWE5EnE9qGRyyJs9AFiCLf1Vy9YN JVGmKffjKIVlQ41UjAu7NW83XVRbB/dIvRoUpTFXemeX/tT74RtHqYfrYG4Dvx4wMygt z44GaZZ3yuxeb/MQQh/FuveYF8j2EIjfslrr9uLty0QoF82Td49HhfvHaiXZGNRdYZt9 gOJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VC8WL8DonGfLOSXiTf7ZcRSAVpL0nBylmnLpByqwTMg=; b=K373rnaE7FK/j5PQdXWVzephdw31PNykkQWkKA0FAuwYmZSH6D9XRswZ9fr5SyeCN9 NbHYVT0XBiT1uzUE9VzzmDccMjzTkpDvx4f4tSNDKTEHwFrL5lZrcc2DxUnQIu2IFSDC F5QU7hpWqt2NhohnmnziO2S6DBJQE3RE3Y/VewbpLxIsSwMsejvv8MagWAHfOwAVcR+Q 5RGU57mSqHc2COLgS35jVd01m45BzQXuic2gxvhIz0AsDhlNFGMY+cXjSFwBT8M+STOy bn8PIVn2/Wh8USyXMN7jkBHDt6T5YuqxB4rAQMku+Q0WkYlgMNL3ErzIrlsMLdZTmLGI ZoFA== X-Gm-Message-State: ACgBeo0KcXTNt4TII9mwAz8lfg9x0w8zGqdfaBj4YA6ZEz3Qublyq9en UPuYqXWB05jZB4uc1DWQRUxgPJQgu+VP1xvb X-Google-Smtp-Source: AA6agR5cv1KBx9JWri2v7pjsiqZ6iWcSU0ASjzLhPeGFZdKwkstZ6RfF8PFU72ciaw7FvPGFz0hY3Q== X-Received: by 2002:a17:90a:e58a:b0:1e2:fe75:dd5f with SMTP id g10-20020a17090ae58a00b001e2fe75dd5fmr10969976pjz.138.1659622173517; Thu, 04 Aug 2022 07:09:33 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 196-20020a6215cd000000b0052d5e93fcb7sm970261pfv.191.2022.08.04.07.09.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 07:09:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 5/7] kernel.bbclass: pass LD also in savedefconfig Date: Thu, 4 Aug 2022 04:06:08 -1000 Message-Id: <9d2f5c11c71a39db8d488644e9d3c338811e86d9.1659621460.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 04 Aug 2022 14:09:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/168854 From: Martin Jansa * similar to: https://git.openembedded.org/openembedded-core/commit/?id=66c1f4b0abd3483759f9e4141a80f982eaf8ccfd https://git.openembedded.org/openembedded-core/commit/?id=36fe2efc91fec5a52374a2dc4814a69076a2d28e but for savedefconfig task * otherwise with ld-is-gold it will fail with: gold linker is not supported as it is not capable of linking the kernel proper. Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit f0c9e1bf35289afa63f040bbc13ca1755e4db0f9) Signed-off-by: Steve Sakoman --- meta/classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 8299b394a7..c29bd3d5f3 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -629,7 +629,7 @@ kernel_do_configure() { do_savedefconfig() { bbplain "Saving defconfig to:\n${B}/defconfig" - oe_runmake -C ${B} savedefconfig + oe_runmake -C ${B} LD='${KERNEL_LD}' savedefconfig } do_savedefconfig[nostamp] = "1" addtask savedefconfig after do_configure From patchwork Thu Aug 4 14:06:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 10950 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 4D155C19F2A for ; Thu, 4 Aug 2022 14:10:05 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web09.5269.1659622201897309698 for ; Thu, 04 Aug 2022 07:10:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=V20k9pfP; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id s5-20020a17090a13c500b001f4da9ffe5fso5398502pjf.5 for ; Thu, 04 Aug 2022 07:10:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uMAClPVSYUuQJe83+YiLapruH1TT1T/IiyD7uDnM/kg=; b=V20k9pfPx55mft8w4IVwbvTViAZ7jerx6zfaZluo4SxDIh4tO612fDq7G461rPdXeU 9jQLgJOVdfHbaigjCr0kAUb/qjwkJ8ADSlKBa9WNmaRTJET26lozxTgZ4agXqWf885hZ +qSUZGnNk7o3ofKC2MZbvH0G+8xGH6tmwnQzhdN82eAcf78Pc8s/HZqI9ScrNuY8/joU ipbRfKf/nVeA4nx524xYwcpeuorDDD+m+0/SdOTTjdVnke2Vweonnyw/UArTZJN9EIe/ 7BSuRU1wMKqtb21hqhRNWF6PBgGdTljN1d35v9gO1wpDlpn7JpcTVOvl3RDi1ZNeYbiO FWog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uMAClPVSYUuQJe83+YiLapruH1TT1T/IiyD7uDnM/kg=; b=dk3SNCzMpIz/W783VuNMVJJqg5vmSBaiv3bV1JtJGYTIS0/e0QV3QbWWNPNUAbN/js JfamGxR9fIfusaFmxjMzgQoZuwcjr3dx/7DNsAK7KhnlL4WswbPy9LKcTXQz4yI2CL84 k0VBP2qtuZ5WCXMlmg8YpYLmBjnB8InPGjNWsh68Sk7OSXkKvY6MBKlCdhJLfe4M/7tF 2TLSbwx9Q/d2zisns+Mt/vv4/cwV9yf8ITz9PQ/xeL0pwO33QR5dJdf7jk0ytKPN4DYN f6Hy4vfhffbkPhKf+pt6qAtAux01MWlxgO/7TahNr3Hif8p7KSSCDrzqxZJsAy5IEjds 0h0g== X-Gm-Message-State: ACgBeo3WYA7pn48jSffqNGDRPJU7CG6ggiV5sw5jkkBye0YtEyHBqLN0 x7BDLF/jStvLek51cmOjreVoUtLY6n505m9Z X-Google-Smtp-Source: AA6agR7AQB8/faxEqOdnJvb+JIuTfbTG2ZDx1GunbjMK4ORv1RZW+Mu75ZUdrGtYcru4xgRULqEMKA== X-Received: by 2002:a17:90b:1bcf:b0:1f5:53cf:c01d with SMTP id oa15-20020a17090b1bcf00b001f553cfc01dmr6937769pjb.37.1659622200705; Thu, 04 Aug 2022 07:10:00 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 196-20020a6215cd000000b0052d5e93fcb7sm970261pfv.191.2022.08.04.07.09.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 07:09:44 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 6/7] strace: set COMPATIBLE_HOST for riscv32 Date: Thu, 4 Aug 2022 04:06:09 -1000 Message-Id: <4d6b260bd356dab6d74cf771e52649e0a41cb7ce.1659621460.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 04 Aug 2022 14:10:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/168855 From: Mingli Yu Disable the build on riscv32 as it's not supported on riscv32 [1]. [1] https://github.com/strace/strace/commit/69ff62ea5087506ad36a27599db088096db215da Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie (cherry picked from commit 5276a9a845d0277936e9321ada296818f7bfd84b) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/strace/strace_5.16.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/strace/strace_5.16.bb b/meta/recipes-devtools/strace/strace_5.16.bb index ae19318c20..23ffa25d29 100644 --- a/meta/recipes-devtools/strace/strace_5.16.bb +++ b/meta/recipes-devtools/strace/strace_5.16.bb @@ -19,6 +19,9 @@ SRC_URI[sha256sum] = "dc7db230ff3e57c249830ba94acab2b862da1fcaac55417e9b85041a83 inherit autotools ptest +# Not yet ported to rv32 +COMPATIBLE_HOST:riscv32 = "null" + PACKAGECONFIG:class-target ??= "\ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ " From patchwork Thu Aug 4 14:06:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 10951 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 4D7FAC19F2A for ; Thu, 4 Aug 2022 14:10:35 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web12.5281.1659622229970992692 for ; Thu, 04 Aug 2022 07:10:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ZhDegzzW; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id bf13so18032023pgb.11 for ; Thu, 04 Aug 2022 07:10:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=TgkaN63K832LwQshWGJH3rH8iDhncJ54z4KkWYlH7hE=; b=ZhDegzzW06ebdBiS3dSWk4SlANzFlkWD66/oKdBjN4pLkYe0VSZC61mQ8wzuWn+fuq npLZBivmlz+hR00DaXvG7hpn0bG6JCoqkLlYIhDH5rY/uwXL5/S9l6fapIpjmMGpg9Wr Fdzx8jwx8zrONlPiNLC+TLAJl3sPF1nqPzVYXYnSC+5YUqLfpsosjdxCSaLhC3eGdtrx E/A7YsX536IYo6Qq3HMLpPQKr9u9f+lIYIWGakWE7FE2+ICql2/eqaq7zeh9bpoTyX/d jxN6HRpmWeP5ffbtra0rG/EvMGMOS/9yujCfUIA6Qn0VeWqqDCHDPxMOvKGWbwOYDPrP Ypcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TgkaN63K832LwQshWGJH3rH8iDhncJ54z4KkWYlH7hE=; b=W9qTLy3ixSn84L8dDAPTl3MmjAE9mpg2wC77ZVmqyQLbcWa+6LAlQLjztDviOkEMTv Ox067OeB/OoyrWcbHyiHQgcfc/FTVCizu2D6vbviznwnH+XTxD1eHe7gIC8OVZb9HT4H AkOlMoI2jrRKCcvFrXTtMEAnpBjkv1ZeiWlJyQOPfxUzg/K7kh9XsQpqO0+wHXgr5u7q 6FeXij1iD2daGPSZkSa+HU0eiLp1nJ0QMAQeLM9gvaax9OgzHAbABXTngSA6qx3+ldUk g2VY9Jh8db56X8Z5/1fcoML8q+Yt+B4AuKXJcNSVG4VJ/cP/Al/wRSUMzGyXQFUWfiX1 Nwew== X-Gm-Message-State: ACgBeo1jXLUlgaxGZjz25zLusdTfAMJQ4SoqLc2BFiJX5wXFbp37jO4k MTGJoTuQknr2IGGQpa0IwF/qxmEzRq+WM0RB X-Google-Smtp-Source: AA6agR5YCOlhpFYKL3Md4QVzu4Eh4K8laPXO8l8X6+tgs/fA81XyRCrmHmNQm84CRAaAcax+Du0GYQ== X-Received: by 2002:a05:6a00:14c4:b0:52e:6b0f:209b with SMTP id w4-20020a056a0014c400b0052e6b0f209bmr2057206pfu.36.1659622228713; Thu, 04 Aug 2022 07:10:28 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id 196-20020a6215cd000000b0052d5e93fcb7sm970261pfv.191.2022.08.04.07.10.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 07:10:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 7/7] openssh: Add openssh-sftp-server to openssh RDEPENDS Date: Thu, 4 Aug 2022 04:06:10 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 04 Aug 2022 14:10:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/168856 From: Alex Kiernan OpenSSH 9.0 uses sftp by default as the transport for scp, add in sftp-server so that this works as expected for users, rather than being left with a confusing "scp: Connection closed" message. Signed-off-by: Alex Kiernan Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie (cherry picked from commit be61b9dac78f0d85c870a0d8304fb4b536ec4bc8) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/openssh/openssh_8.9p1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb index a3a0016ce5..e4446280d9 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb @@ -160,7 +160,7 @@ FILES:${PN}-sftp-server = "${libexecdir}/sftp-server" FILES:${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" FILES:${PN}-keygen = "${bindir}/ssh-keygen" -RDEPENDS:${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" +RDEPENDS:${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen ${PN}-sftp-server" RDEPENDS:${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" RRECOMMENDS:${PN}-sshd:append:class-target = "\ ${@bb.utils.filter('PACKAGECONFIG', 'rng-tools', d)} \