From patchwork Wed May 21 20:01:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Badrikesh Prusty X-Patchwork-Id: 4217 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 21 May 2025 22:02:05 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f63.google.com (mail-lf1-f63.google.com [209.85.167.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 54LK24OV030241 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 21 May 2025 22:02:04 +0200 Received: by mail-lf1-f63.google.com with SMTP id 2adb3069b0e04-55203a08e39sf711661e87.2 for ; Wed, 21 May 2025 13:02:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1747857718; cv=pass; d=google.com; s=arc-20240605; b=Z8cVxQ0AifUAOMJZpXZ8rQSIS67ylxmfObunYTiZ68un2txEHsIHydzYugVumTseAi IsvfwpqJcEZbiAYwNnA/GDQh6SCyJbXWA76E1yUGuDKkXsFtmv73BDMnqZbotW0l1rrh FEB+5UDDG4LqOE3k+4Ym3Pn0/87vqZ1QfOj9XB3DZTj0VS5ck1ZjeYZpkm4M2STbntBA eUJHgUAtZXAIf59Lf1duYFHlVvLTT0i3XtkjnGPwMPhZKWfaWfj5Fqmz5mMXxLEKF7Qo ZgK6mMuroRa1flcnd0r8p4LsjuX/wuOKrRPNgKS9i0ZJa1tmHbHkrwlG4fqLBlFHEKg6 vyIg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=re3mImHJf0F8SfUDUUKqy0YEEEyft32UGXxKs9ETXhk=; fh=b42WbvwM48LqyauLQHXoxz91BygOF9yT8c3U5I0Dad8=; b=IRTKCOckh27kjdnmdi6cCIvcArmvOCdGQXHKYZtyrmdouHkHzcE09N6B+mBMH04Al4 dANRuUaKdrsVEH2T5sdIL+pgcmxxW6tJAtYhmCC+XnGGNrpnJWnwWleBSx6yxdJewoWj /qrxes0fpGzbcKgMBGRanjuQHdDnwupMUFpufBuswL10qTm/bsYPQ+Sy3GF+0nIQ/rPo WIPsfcd11dkFmoagqBxAuSatRU1L2tdYruSZtVobE+TIEXnbVEOcJkoKb3V7txIMLM1J MA5gAMcGmVddRPQ0LlLm4z4ODlP4twv0YsL1B+ALgYImjJ+YxcCu7JpqkpE6Xvpm0Ydu mB8Q==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=hvXBYRDc; spf=pass (google.com: domain of fm-1328765-20250521200153daea30c35c1960902c-peloma@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328765-20250521200153daea30c35c1960902c-pelomA@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1747857718; x=1748462518; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=re3mImHJf0F8SfUDUUKqy0YEEEyft32UGXxKs9ETXhk=; b=GJq3aBjqBYwNqfOVgYFCPblPl3TXLWYGShsYG6ajoJpH+o55M6OTlE674YCZDbWHXq UCQEFbUBofibndFnMxUBxWC76AO/The1165tUNfCM2UA/OoslpoW6vcrOBMsJBOnQkqF Adb8sEIL0BA1OqrVfmfykak1NMPb2yoUZ0uHUMaxvH40nOLUfhIZr+R4lRMab7YCp1p8 KUPj0hw5a1ZigGDQ7Kua6UVNDZGYjZyq+eNkUNCtcH+GjWT03R9VU2dFRZIq9V0vp6US dNxeXiZdaV4EHe+ZpGmw7+81aWdEdZBmGaINrLeDqwd1NSW8eAZ0qy7Q7W8OqK3BesHI ZkQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747857718; x=1748462518; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=re3mImHJf0F8SfUDUUKqy0YEEEyft32UGXxKs9ETXhk=; b=CHv17aLbL6ZAHRx3SSKJKb7NdqGi9ksjpssEw3jCE2+z/fNkmkuEsTNY9d0zEZoCca kgo+3pNOOBHUclNjRSjJ3ebQupPhhoBSZDk9wEqoNithXrXoVSyTzCT36QzUiYlxsEZh pJ/N9nA+C85WUxvh5Wq0/tjUCPIhB0s6pTjb6ZQgBck3l9gYmGGGH1giDvqyniwbfklj TYo35PviWiJP5nRV/egHtiRUhsxTQINJzqVTd6k9K2RJGn/+zphObitAFx17Yr698k8X B0V92AINm0xrGWeiTLwA2sdTXUFoTuVjQnbI0bopsTiLmy9aYs08KFsZAIa402xjNIKn bWdg== X-Forwarded-Encrypted: i=2; AJvYcCWQjUe/1+IPOZX/reCF5GGxpfJt4qBAST24a/e3eIFPkwDWsGMeKkQg+rWsHohDI1OdXCpHKFs=@isar-build.org X-Gm-Message-State: AOJu0YzIwzpWXRwi/y3fZL7Gpau9LhOC6bP4SWFw8oekvzaE31xC5jCt 82okqsMY2VzdhlS0xOsPbUhoLbbJoUNTWNWlGD2emLLptO5rwhXJcKa5 X-Google-Smtp-Source: AGHT+IGplIu3hi5htzlHD9GCtjUet9iwIdVPpbcM3iA3G5L9h73kAN/q/rwuNsgcw4G20Z71fSPNTA== X-Received: by 2002:a05:6512:6c5:b0:549:b0f3:439b with SMTP id 2adb3069b0e04-550e71bfaffmr8794883e87.16.1747857718151; Wed, 21 May 2025 13:01:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AVT/gBFPJnEjmJZFOq1ELqg1CmHJ3NpMLk/Vpst5yBCt64KDOQ== Received: by 2002:a19:5f15:0:b0:549:8de0:31f0 with SMTP id 2adb3069b0e04-551eab08e29ls668434e87.2.-pod-prod-09-eu; Wed, 21 May 2025 13:01:54 -0700 (PDT) X-Received: by 2002:ac2:4c4a:0:b0:550:e648:182b with SMTP id 2adb3069b0e04-550e72438demr7253188e87.39.1747857714537; Wed, 21 May 2025 13:01:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747857714; cv=none; d=google.com; s=arc-20240605; b=fJ3QEKDdKdCnqUYd63Nw2zNIxjNAgswfRUCCm2V2V/vlDF3MOsGhplabavOzHVxO1e imp7LLaetJaiZIYu/7/Klqozwsy1CjzJworl5NgIUP4BIbK5yxZYIpFb6XP4ciAWtahF wLqeZqXiy5T5edZ8TMM5j512RlV319rdp/o+9+zb3CCIcQGQtsDKEsBTZda3SCdzoQXB eA5ixGiUPblWaihmKd37RvV0iDmGY9oxNQJvchadF9rm+BCbf3C0UKE5zItiReoVA+6h mclN49Tnfb8/ZVYUxJquC67gal+VZwQJqrgX6n5EkMH5rhUQI7aMIEUIzBEfk9ZMXzEp fQ4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=rAGHTKeeRN6HHYLU7wcrgU9ATyM8Ik2bWVUaMIZ/dkg=; fh=Pt40xOu0ssl96dVOzN1FNmNtHgqv9aW9VmLrBG8UyVY=; b=EREqCoWKoK+zXKSxs4FMDv2l7mDsuKATTiWDOBUAZm0IBVBVOV7y91fckxqbCatnOb 4WcF2aGZA7/CcS2otfn80CuQHgzcddjoWnFlIwNOOOGRVi438c6o7B7/+KT/UIgm+GWP eUKOP+DjtcH+WaOn15VHIZmELZQM/XgS09xC0GHVZlcjApZRUrJWnskTFG1qWeqzK5Dt zrc2bsGwyjDa2EFtWYtbOj+MHgCGgKBjfUcI0NftOMPWGHVwjhBzQdjptvSCRf1Wyc61 fCyG5f96uOLIFmFuNS69Li8BfVcGkmBmw1mOMAC9s3r0Js/JaeX/DtFixnwTvWaTLaIw MtNg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=hvXBYRDc; spf=pass (google.com: domain of fm-1328765-20250521200153daea30c35c1960902c-peloma@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328765-20250521200153daea30c35c1960902c-pelomA@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-550e6ef0f2csi169305e87.3.2025.05.21.13.01.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 May 2025 13:01:54 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328765-20250521200153daea30c35c1960902c-peloma@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20250521200153daea30c35c1960902c for ; Wed, 21 May 2025 22:01:53 +0200 X-Patchwork-Original-From: "'Badrikesh Prusty' via isar-users" From: Badrikesh Prusty To: isar-users@googlegroups.com Cc: Badrikesh Prusty Subject: [PATCH v2] imagetypes_vm: Use IMAGE_FULLNAME for OVA image filenames Date: Thu, 22 May 2025 01:31:56 +0530 Message-Id: <20250521200156.28627-1-badrikesh.prusty@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1328765:519-21489:flowmailer X-Original-Sender: badrikesh.prusty@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=hvXBYRDc; spf=pass (google.com: domain of fm-1328765-20250521200153daea30c35c1960902c-peloma@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328765-20250521200153daea30c35c1960902c-pelomA@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Badrikesh Prusty Reply-To: Badrikesh Prusty Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Fix ownership update in do_image_ova task for custom OVA names. The do_image_ova task uses ${IMAGE_FULLNAME}.ova for ownership updates instead of ${OVA_NAME}.ova, leading to build failures in virtualbox/VMware images. Failure logs: (Here, OVA_NAME = "isar-image-base-test") | isar-image-base-test.ovf | isar-image-base-test.mf | isar-image-base-debian-bookworm-virtualbox-disk001.vmdk | Removing /etc/schroot/isar-builder-88786470-74dc-4172-8907-531a0306c699-2655 | Removing /etc/schroot/chroot.d/isar-builder-88786470-74dc-4172-8907-531a0306c699-2655 | chown: cannot access '/build/tmp/deploy/images/virtualbox/isar-image-base-debian-bookworm-virtualbox.ova': No such file or directory Fix VM image filenames: Use IMAGE_FULLNAME for VM images (.ova, .ovf, .mf) OVA_NAME is embedded in the VM's description (metadata), so the imported image retains that name, independent of the filenames. Signed-off-by: Badrikesh Prusty --- meta/classes/imagetypes_vm.bbclass | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/classes/imagetypes_vm.bbclass b/meta/classes/imagetypes_vm.bbclass index b20a8e04..4057361e 100644 --- a/meta/classes/imagetypes_vm.bbclass +++ b/meta/classes/imagetypes_vm.bbclass @@ -70,9 +70,9 @@ IMAGE_CMD:ova() { if [ ! ${VIRTUAL_MACHINE_IMAGE_TYPE} = "vmdk" ]; then exit 0 fi - rm -f '${DEPLOY_DIR_IMAGE}/${OVA_NAME}.ova' - rm -f '${DEPLOY_DIR_IMAGE}/${OVA_NAME}.ovf' - rm -f '${DEPLOY_DIR_IMAGE}/${OVA_NAME}.mf' + rm -f '${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ova' + rm -f '${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ovf' + rm -f '${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.mf' export PRIMARY_MAC=$(macgen) export LAST_CHANGE=$(date -u "+%Y-%m-%dT%H:%M:%SZ") @@ -85,16 +85,16 @@ IMAGE_CMD:ova() { export DISK_UUID=$(uuidgen) export VM_UUID=$(uuidgen) # create ovf - cat ${PP_WORK}/${OVF_TEMPLATE_STAGE2} | envsubst > ${PP_DEPLOY}/${OVA_NAME}.ovf - tar -cvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${OVA_NAME}.ovf + cat ${PP_WORK}/${OVF_TEMPLATE_STAGE2} | envsubst > ${PP_DEPLOY}/${IMAGE_FULLNAME}.ovf + tar -cvf ${PP_DEPLOY}/${IMAGE_FULLNAME}.ova -C ${PP_DEPLOY} ${IMAGE_FULLNAME}.ovf # VirtualBox needs here a manifest file. VMware does accept that format. if [ "${VMDK_SUBFORMAT}" = "monolithicSparse" ]; then - echo "SHA${OVA_SHA_ALG}(${VIRTUAL_MACHINE_IMAGE_FILE})=$(sha${OVA_SHA_ALG}sum ${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE} | cut -d' ' -f1)" >> ${PP_DEPLOY}/${OVA_NAME}.mf - echo "SHA${OVA_SHA_ALG}(${OVA_NAME}.ovf)=$(sha${OVA_SHA_ALG}sum ${PP_DEPLOY}/${OVA_NAME}.ovf | cut -d' ' -f1)" >> ${PP_DEPLOY}/${OVA_NAME}.mf - tar -uvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${OVA_NAME}.mf + echo "SHA${OVA_SHA_ALG}(${VIRTUAL_MACHINE_IMAGE_FILE})=$(sha${OVA_SHA_ALG}sum ${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE} | cut -d' ' -f1)" >> ${PP_DEPLOY}/${IMAGE_FULLNAME}.mf + echo "SHA${OVA_SHA_ALG}(${IMAGE_FULLNAME}.ovf)=$(sha${OVA_SHA_ALG}sum ${PP_DEPLOY}/${IMAGE_FULLNAME}.ovf | cut -d' ' -f1)" >> ${PP_DEPLOY}/${IMAGE_FULLNAME}.mf + tar -uvf ${PP_DEPLOY}/${IMAGE_FULLNAME}.ova -C ${PP_DEPLOY} ${IMAGE_FULLNAME}.mf fi - tar -uvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${VIRTUAL_MACHINE_IMAGE_FILE} + tar -uvf ${PP_DEPLOY}/${IMAGE_FULLNAME}.ova -C ${PP_DEPLOY} ${VIRTUAL_MACHINE_IMAGE_FILE} EOIMAGER } IMAGE_CMD:ova[depends] = "${PN}:do_transform_template"