From patchwork Mon Aug 24 01:27:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 9 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a05:7000:4605:0:0:0:0 with SMTP id b5csp2149903mae; Mon, 24 Aug 2020 02:28:29 -0700 (PDT) X-Received: by 2002:a0c:bd8d:: with SMTP id n13mr3959846qvg.199.1598261309046; Mon, 24 Aug 2020 02:28:29 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1598261309; cv=pass; d=google.com; s=arc-20160816; b=sNIRDCk+VFOoohUCvRywrVZdWrRRynkFfYuQO0qWRjOklcB3Hh/0mIHXZ2hhtZ3YNH EpOn631x/iu30dUQ3KWc734vE8iW86O7ntmqaEGypyS26yYEJ5fcUXjlifl35oVh6S7D 3v6BZJ2uMBFaIWbWjQH6h5oZWs3P1949l52BsnHAoHHA98qEO+NVyqNzKll43OTXRFbV X6OEsEPmTVoBEYd1pMgBR13gg8grQExPf9XfFMgvRpMiwAGX4Zr84cIwf/13C/Xm3Wep 73NzwfJymHFtx70FJ8AVq2A8MH6o0olJUZAdE6AI9ZnxCoLbnUW05IMqXlSU8Uo8JqBJ vK2w== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=07Aee9b0fuC6ahs/T88o+jjyHYEFNp9fgOTbDgzq4t4=; b=LvuE7RIJDGL03GgXmYqb+RZtyb0kBh2IvQeC2S1rYPksB4/Qu2HJqkgoJzZ8UxwDOa fICkIBWa481H/D872DSuGTfr7NGEQ4FD7M2oKcAE+0vPyIruxxCFeC5Zd5yBzWIWtlid n4he4gmztSYgVGNktboLM7ocIbw84ZQZAmFMQefzIA8WdBmzqxWBe6R6SyOEgKqNkWFn 6kkBgQfSTjllkwt2LghnSfzPESMm+dzQ9NmSP+nLQW7l1jDNCOIclDLC/w7hgr6EYQhG TEP8sTZMEdQaXCAh72ZTCW9cWSHtUrNanazdC18uaXm0/7hPK0N+k8+IEcazPWCB5Bii HLSg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=m59hQ00+; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcw7ho6fuybrbpeqr35akgqer7myqjy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCW7HO6FUYBRBPEQR35AKGQER7MYQJY@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id p7sor4399669qvm.13.2020.08.24.02.28.28 (Google Transport Security); Mon, 24 Aug 2020 02:28:29 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcw7ho6fuybrbpeqr35akgqer7myqjy@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=m59hQ00+; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcw7ho6fuybrbpeqr35akgqer7myqjy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCW7HO6FUYBRBPEQR35AKGQER7MYQJY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1598261308; cv=pass; d=google.com; s=arc-20160816; b=Vf86cLLmFaAdhSlaidIjzTI0Iyn0LFnWZqqwS4pQFiwtNhX+5kBDSW41q4BFO0FJi5 ADBe9GsVpWwWNo+Y0Br2Wyy0/a7hvgdmrFbAcLxRYsWxxxX7lJ9Db+LjEiwh82Uhb1cf ZTbupw/NXNm/9cFFA4cs8y9Iruvc6pDX5dTeDJz8AW38Tl2ODrF37aSForsG2uBFqP6J IU1EBp95IPeqK1nFIBmHcu55ZNLSCIxRFoMoUEEnZKAd79rRh+mVtERpXTL4TuRnRmVI ty2IqzcsQNhUGE/ffrZ/zoXorVnaN2pvhTPMZD2ll24wYymtqXygZpSRTzSrtM4VM25c 3yFA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=07Aee9b0fuC6ahs/T88o+jjyHYEFNp9fgOTbDgzq4t4=; b=HPPmRKclZeLBhOAI/AaKcpK12xM8bw9Anss+TvDSXMrhg+kFP06y2xnKJsEhINnKGS YQqLEjosr9XCUW6E57HYRKjERwI23o5+QWRTB7RV5IharXtTf6RkJO10fLqfTMzxOROW gTMY9+61BCtuH4AB5LJXf/Oz3Yn3yW/1zhahhaCteteyk94PG1rlpN8rgXsY8X7bU2T+ AOOEKnd6NaJIaqdfIJd4MD0gEtIKKNWR9fLpE1JDQtPNCeTxy9q1eRKObEGrQrjPtRd3 ZgJuJgO9QRl7RvqCHm/m+S/20ccpeKGjX4TgfkxMlrsY4YFN+7h6KFfYM9v1fr2Oidet jFlQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:ironport-sdr:ironport-sdr:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=07Aee9b0fuC6ahs/T88o+jjyHYEFNp9fgOTbDgzq4t4=; b=m59hQ00+X8X/fgYggSYPpREIkDtXZmEqWJmaUpQa6uvPGN3SovDhbKzoCOHrmidyvA Ddyzc9AMMm8YlIuxtMTy8mjb5Vk5rG7a02IzVXLS3p8j31AUlmEV41if5/wXEazgyf7s +6o6jE4fGcLsloY9aZQhLawTSb8F7ud4e8ZW4D2fhsjLw9AB0wXSUzoCRwrtW1CYeqs6 ojZsabiwBIBJLDcfcv70ggw6JOpefew+Q+URTQBmeIzVXBTfGj5y1Efqz71PiJmySLWl aHCS+tI6w/UWmWZm6UsVOa+7dwv1AURL3nrHmouPgsGr5yNdpD/f8ROYz8djsKzIa/5V dGrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=07Aee9b0fuC6ahs/T88o+jjyHYEFNp9fgOTbDgzq4t4=; b=DcqzFH7KENXoyF+lf+YQ+vq0B5SdMeUKdcb/h8iBEgMh6ni361UhxNvoFpe3dpJ4el bIJgNXOAuPAvqNRigh9t+FPYegPHPwlgitN/N0OznDT5GtTRXF502rqnBOgZQ0UOfh9p gv2UVhrAz4reMGU0yuAYdFdcZSGAiqrW7815KYXWsJK8BS6xC0hKehdqV7WfzST9+g9u XGKaZOIUGa+BkCo7CzO4wiE/W+CQcAkJ5I40lVAIl/pisAd7VZzSFQ/uldxAQrp8LEu9 2sPBtHDDz58sBC1Ambj3lMLiAcfN2+t4+vecQHDFD4dXMrYtfowAkf0Df7gMX1LmvXj2 mRsQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530LgMRFFX1tQpSDFE8rYZRrIgP8byamEEPY6iWtj/OPeDzR1Tod LSCSFCJiTbdwXS2NsgX1//E= X-Google-Smtp-Source: ABdhPJyhVdnBS7QrVismlGicbHj+fq3ehnC9acSvbuuaMuEIiqaSCU35xd1c8wH6vE8J8MzFyc0mTg== X-Received: by 2002:a0c:ea30:: with SMTP id t16mr4077829qvp.177.1598261308717; Mon, 24 Aug 2020 02:28:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:4986:: with SMTP id f6ls1908007qtq.11.gmail; Mon, 24 Aug 2020 02:28:28 -0700 (PDT) X-Received: by 2002:ac8:43c4:: with SMTP id w4mr3908471qtn.319.1598261308370; Mon, 24 Aug 2020 02:28:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598261308; cv=none; d=google.com; s=arc-20160816; b=kNRKHipPIupC4ys1MHLe7i0c5/nTcHqmANqFOFeb+4/QNiEMKYQf7tM0igl9b25fQh 7ZQIVI1qq5rB1evC4Q+u/VS67wV8K/oTorUdOpMUPFLCEjo3reWdpH8HEyBCfcuT81ZO 69Ib35xgbAmQQeFTuHHbwXnB4fUYoNHAhweL1aJXFqpnwIvyVS6qPzzfopqr7C7dvy8W GFMiyFEtgM/C4EJOUrmEKOC4762Nf/ltNg5Ky1NI/aqQlbzvTTsmWg138l78IX78JpHf LZo6YX+tpYXVBjxIQTqFZJ9a/93Uy0LBx0+a7xEa4dlDMTJjpjovXNn1kmRcdA3OQ2kF kcVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=OrLuNMyHVxxcStkRcuyuJODLf+QWu430PBk1dReaB5o=; b=JZvmhs4PuLE+8rTz5jN6nJXeykmRH7a4C+GetUCZRcaeDJ2/EUqPPQLwzDcASOyZX7 IRlpCm2C/6vLTjaKKzEBALjLw70PuahftAJLAqUohXU+kmaQIQ3n3nqpGM8w9IZGzOCv 3+d5unQmjbT+BfWtnIMXGYGrpvEhT+5XgJ7d/bYcbN3ibKoSrtzaNghs6MWM7TMUaR1A LqCYMXQPspkp3G7bMS4Sh9HPy+CwWOd74FVpxSAezl2tm0c/Yhyg9qw69vsitXbThyXt F1cRdxVMePlyokokursknoWg9EQG/g9DO2nWInn3088Jd0vW4Hh50cyyH5pgqZwm0j1u rrZg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id e16si360474qto.5.2020.08.24.02.28.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Aug 2020 02:28:28 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; IronPort-SDR: 7Tf/6B0BKx9MhGHEcA3hLfwRTKVOBe6DkP14Wm/UGhyYmUirMrSyrl058Rj44HDsqkd/RBE4og qJADDSQ/LvjTkqeQP/22qHqL46NwCuev1Y9XglgzMTHoCBX3en8SADVCdfRLRCjOv384MFYnLm 7z00bZnppMzIeZfDcHSIshUq902cACJZtqosqKO1NNLX5jFKrNjknZUw6THDjk3GaJ6TESe93t vAGnlo61DXpmEXKRukFuynKB//6kpsc8qMDceK8l6w5OgFLbzFXVoMsEcku4ewGUwlPPYdlMt4 vZ0= X-IronPort-AV: E=Sophos;i="5.76,348,1592899200"; d="scan'208";a="54369370" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 24 Aug 2020 01:28:27 -0800 IronPort-SDR: d2rrFIqNT61WTs+aOTkdLCskKxd5vzQxheB0BtG4jScznLnJYYpo7+FHvGGyv1rUYVL0xRNbEQ /dWrnHOcygUmglYrYp3qL5ENmGObKgWMcZUbkcs1VkKaQOXcTeecX7GFU2Pbsola5QeKJLLsJ1 zLNDro6v/8/E4VKgztq3DKQoaaRz4YGzDIIIwH6KYM3C/uA1hjNFboGqs9To/g7KaEqpjF+kjb RO0AmUSU+mgDHXh2hxjI+qVxzFZiqtbCypfyoqfSgUHJ9IQ5FKIVrGroWkWjY9XKMOMNkW2ya6 lY8= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [RFC PATCH 03/10] wic-img: Satisfy the quirks of latest wic Date: Mon, 24 Aug 2020 14:57:43 +0530 Message-ID: <20200824092750.19642-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200824092750.19642-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200824092750.19642-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1675898450685813895?= X-GMAIL-MSGID: =?utf-8?q?1675898450685813895?= The latest WIC doesnot use fakeroot if pseudo_dir(IMAGE_ROOTFS/../pseudo) is non-existent. This results in wic_fakeroot not being used. Create a dummy pseudo_dir to satisfy wic. WIC hardcodes the python(/usr/bin/python3-native/python3) to be used while running bmaptool. The above path is OE specific and hence breaks build in ISAR. Create a symbolic link in the above location to satisfy wic. Signed-off-by: Vijai Kumar K --- meta/classes/wic-img.bbclass | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index afab394..a2c9627 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -143,6 +143,7 @@ EOSUDO export FAKEROOTCMD=${FAKEROOTCMD} export BUILDDIR=${BUILDDIR} export MTOOLS_SKIP_CHECK=1 + mkdir -p ${IMAGE_ROOTFS}/../pseudo # create the temp dir in the buildchroot to ensure uniqueness WICTMP=$(cd ${BUILDCHROOT_DIR}; mktemp -d -p tmp) @@ -157,22 +158,31 @@ EOSUDO IMAGE_FULLNAME="$6" IMAGE_BASENAME="$7" shift 7 - + # The python path is hard-coded as /usr/bin/python3-native/python3 in wic. Handle that. + mkdir -p /usr/bin/python3-native/ + if [ $(head -1 $(which bmaptool) | grep python3) ];then + ln -s /usr/bin/python3 /usr/bin/python3-native/python3 + else + ln -s /usr/bin/python2 /usr/bin/python3-native/python3 + fi export PATH="$ISARROOT/bitbake/bin:$PATH" "$ISARROOT"/scripts/wic create "$WKS_FULL_PATH" \ --vars "$STAGING_DIR/$MACHINE/imgdata/" \ -o "/$WICTMP/${IMAGE_FULLNAME}.wic/" \ --bmap \ - -e "$IMAGE_BASENAME" $@' \ + -e "$IMAGE_BASENAME" $@ + rm -rf /usr/bin/python3-native' \ my_script "${ISARROOT}" "${WKS_FULL_PATH}" "${STAGING_DIR}" \ "${MACHINE}" "${WICTMP}" "${IMAGE_FULLNAME}" "${IMAGE_BASENAME}" \ ${WIC_CREATE_EXTRA_ARGS} + sudo chown -R $(stat -c "%U" ${ISARROOT}) ${ISARROOT}/meta ${ISARROOT}/meta-isar ${ISARROOT}/scripts || true WIC_DIRECT=$(ls -t -1 ${BUILDCHROOT_DIR}/$WICTMP/${IMAGE_FULLNAME}.wic/*.direct | head -1) sudo chown -R $(id -u):$(id -g) ${BUILDCHROOT_DIR}/${WICTMP} mv -f ${WIC_DIRECT} ${WIC_IMAGE_FILE} mv -f ${WIC_DIRECT}.bmap ${WIC_IMAGE_FILE}.bmap rm -rf ${BUILDCHROOT_DIR}/${WICTMP} + rm -rf ${IMAGE_ROOTFS}/../pseudo } do_wic_image[file-checksums] += "${WKS_FILE_CHECKSUM}"