From patchwork Mon May 15 17:37:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 23973 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 6B43FC7EE24 for ; Mon, 15 May 2023 17:37:52 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web11.460.1684172268851402290 for ; Mon, 15 May 2023 10:37:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=qBSFZ7YT; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: martin.jansa@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-3f450815d0bso65422435e9.0 for ; Mon, 15 May 2023 10:37:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684172267; x=1686764267; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=EIRCvkiUDc6mjEJNlGcpZviq0PLurklRD+8/Rwwu9Nk=; b=qBSFZ7YTGYQaEjYUbgCwdQ3T9hTqPu71k0p6B2eOuImDyFBV9+PrHp9JnxD8ue5URZ rD0+rpHnZsovGGPMIRwf6sUN35nE8ZGwinlD/f8vxqjtjN5rEQo32st0hoPFhDeuABFx O/FVO+Wg8UUnn5oX7akUG62h/oSIP7j8PkDugFA9ZRGem2ekhADilv7NrusaVnJczRjd q1OsuEG4QqcJfKt83LRt6aKjSMle6ZAJEApfny8rjs6H83IIv1Ga3sacYBVMxD29ccTr fprTW64vLGaa3XyQcBbomu5daV8t63yCDk2/6FZm1AOeXfWE9nuuaa5Lp7ILDZhYWPW8 oW7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684172267; x=1686764267; 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=EIRCvkiUDc6mjEJNlGcpZviq0PLurklRD+8/Rwwu9Nk=; b=lyHIA5gK3iK11bQbxNm4WukQA96Ha7AescvG2was3Yj1VLgvNYnvBlBoXqkV5t0oXE FIn3t2ZIsMk7ZSuzlwyLrxONxi6AJ+kWTCJ+SVprMJywDUDcNWLC+u7Rsru0pvx5I2G7 3UzIQGaPvtNO/sIbph0H6XWis4ZrYptohrQOgmC9yFbCsguKUcJ5q3XY0elUKewb2Egg lTEyDPoYbTcE5x2vG1pO/yRriBBlKBQebBCFwipNK+u+SyXYradFyqD0MXOv3ZH1RS/m oU0YdCawLNSqO5rc3+h7Q1QosQvl5rx+oS6eAzGiytjLdlTIyfsMyo7Iwp9Hik+WOt1y MCMQ== X-Gm-Message-State: AC+VfDwhL3m7v60GgpMRq7zNw5E/sNMy55nSPJaMJQ6eoLZ5DNUl6dgX gpS+LEbvo3cuZTwDgUcQNRzuLdVkU0o= X-Google-Smtp-Source: ACHHUZ7jjkLbaUOXr14C+AF0XoLyDJgRdUP/RMWz64eVK9hKBNDg2TmL6+bLp4Mu+27C47anJUYCJQ== X-Received: by 2002:a1c:750a:0:b0:3f4:16bc:bd19 with SMTP id o10-20020a1c750a000000b003f416bcbd19mr22615431wmc.23.1684172266988; Mon, 15 May 2023 10:37:46 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id f12-20020a7bcc0c000000b003f423dfc686sm42219wmh.45.2023.05.15.10.37.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 10:37:46 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-core@lists.openembedded.org Cc: Martin Jansa Subject: [PATCH 1/2] go.bbclass: don't use test to check output from ls Date: Mon, 15 May 2023 19:37:39 +0200 Message-Id: <20230515173740.2095615-1-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.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 ; Mon, 15 May 2023 17:37:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181269 * avoids possibly confusing error message in log.do_install like: ls: cannot access 'etcd/3.5.7-r0/build/bin/linux_arm64/': No such file or directory Signed-off-by: Martin Jansa --- meta/classes-recipe/go.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/go.bbclass b/meta/classes-recipe/go.bbclass index b02a83a561..39bfaa5156 100644 --- a/meta/classes-recipe/go.bbclass +++ b/meta/classes-recipe/go.bbclass @@ -132,7 +132,7 @@ go_do_install() { tar -C ${B} -cf - --exclude-vcs --exclude '*.test' --exclude 'testdata' pkg | \ tar -C ${D}${libdir}/go --no-same-owner -xf - - if [ -n "`ls ${B}/${GO_BUILD_BINDIR}/`" ]; then + if ls ${B}/${GO_BUILD_BINDIR}/* >/dev/null 2>/dev/null ; then install -d ${D}${bindir} install -m 0755 ${B}/${GO_BUILD_BINDIR}/* ${D}${bindir}/ fi From patchwork Mon May 15 17:37:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 23974 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 6C01DC7EE26 for ; Mon, 15 May 2023 17:37:52 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web11.462.1684172271339380227 for ; Mon, 15 May 2023 10:37:51 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=KVDComjj; spf=pass (domain: gmail.com, ip: 209.85.221.44, mailfrom: martin.jansa@gmail.com) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-30771c68a9eso12329907f8f.2 for ; Mon, 15 May 2023 10:37:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684172270; x=1686764270; 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=dATkPclsLhlmy3bJxxWBVuS2XHP5rqp3nHUDTbJ3kIU=; b=KVDComjj80MvOnvSa7XZF3x9MTkdvQZyrCbHswu2gTaePBHtda5Ae74gI/ldkKG8IA 9rM11Mea5+l/mvA0KHT0cQuI98q7R1S5keGhsgI5pQwGGtFczIqPAg9c3XNKx/RZFDGd o0/jJ/G3hqX5u0itDbb5DR5Ch/J14//DtJO8maCidVNUlW5cERq7Xa0hFyKIk9qyLteX stxcYfxIo4ItlHi4uJ/sjDunbMHR32kqT5I3t238YlpVR/2TUvHxJUGr89erf4fQx20L CQP2x1PnPVty7kR03b6h581xA2kXbbmQNCqnURIoY/hx8Eu+BuDML85++6NtKgoVPfsZ zD9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684172270; x=1686764270; 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=dATkPclsLhlmy3bJxxWBVuS2XHP5rqp3nHUDTbJ3kIU=; b=EG7Ca5aZJYPb2xmU4n5m2C2KkHeBnFFEYnnlOauoDsC6qIq9zc0ngav1BXzPh13Rov V4nQAxYiYKkDsCkZDtDIHwhvJfIM8BQO9qEUClBkVrkG3glmlGEl43L//YXTHPZpPRwO 04CW/MXL/CtjJku0yMOMgEZwVmP6wssFU19ZS911xPwZLwwNr23uNvDENgVumz+yI1Vn KU9XXWcGWHCtpGagnuZmJNRBv1i4vIoIJfqoIr3ArEA3+T5LzECMc7t8RYI9jUn77RcF iVG7k+bRcRJQNIknfvmHJJY+nS04lOJMKyu8RrPObm2QJLqaG28adsENGMexzenhnHxo 9xDA== X-Gm-Message-State: AC+VfDzpovUglrori1vcRiNuFpZOnQR8Pto+Mu9Pv0nmDTORAA32eB9d V1t0se5T+jKrtwMR5KGxnaeJn3LTJgY= X-Google-Smtp-Source: ACHHUZ68s59nj6PHtrVwzmHdZzvrAsSHA62wrtC5qoQKfl+HJZcBEAMasoeuAFhRtWsP52As+eEh2w== X-Received: by 2002:adf:f946:0:b0:306:32fa:6750 with SMTP id q6-20020adff946000000b0030632fa6750mr21809863wrr.33.1684172269609; Mon, 15 May 2023 10:37:49 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id r10-20020adfe68a000000b003077a19cf75sm398817wrm.60.2023.05.15.10.37.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 10:37:49 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-core@lists.openembedded.org Cc: Martin Jansa Subject: [PATCH 2/2] image-live.bbclass: respect IMAGE_MACHINE_SUFFIX Date: Mon, 15 May 2023 19:37:40 +0200 Message-Id: <20230515173740.2095615-2-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230515173740.2095615-1-Martin.Jansa@gmail.com> References: <20230515173740.2095615-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 ; Mon, 15 May 2023 17:37:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181270 * fixes: ERROR: core-image-minimal-1.0-r0 do_bootimg: /OE/build/poky/build/tmp/deploy/images/qemux86-64/core-image-minimal-initramfs-qemux86-64.cpio.gz is invalid. initrd image creation failed. ERROR: core-image-minimal-1.0-r0 do_bootimg: ExecutionError('/OE/build/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/run.build_hddimg.2001892', 1, None, None) when IMAGE_MACHINE_SUFFIX is set to empty in local.conf Signed-off-by: Martin Jansa --- meta/classes-recipe/image-live.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/image-live.bbclass b/meta/classes-recipe/image-live.bbclass index b95e714258..95dd44a8c0 100644 --- a/meta/classes-recipe/image-live.bbclass +++ b/meta/classes-recipe/image-live.bbclass @@ -38,7 +38,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \ LABELS_LIVE ?= "boot install" ROOT_LIVE ?= "root=/dev/ram0" INITRD_IMAGE_LIVE ?= "${MLPREFIX}core-image-minimal-initramfs" -INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.${INITRAMFS_FSTYPES}" +INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}${IMAGE_MACHINE_SUFFIX}.${INITRAMFS_FSTYPES}" LIVE_ROOTFS_TYPE ?= "ext4" ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}"