From patchwork Wed Oct 14 04:27:24 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: 145 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:e04f:0:0:0:0:0 with SMTP id v15csp550371oos; Wed, 14 Oct 2020 06:28:13 -0700 (PDT) X-Received: by 2002:a1c:495:: with SMTP id 143mr3293861wme.63.1602682093209; Wed, 14 Oct 2020 06:28:13 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602682093; cv=pass; d=google.com; s=arc-20160816; b=srjp9xP3aVTQeQLYnrgx7ktOkFkDcq932aLbgXH/tCsOF4ky4f6IgsBAYuSrlT+MjY rtCRSbPoiy0OfIwlXF5mnVsvB6SZruNAmUL7CYGdV3dugK82c/yAae2VSNmAupHM7Yz0 ipHgilbTKLaoubPyMEtWiCDy6OoqW8P9I+49r/JpyKVw+AuuyoHcqZLGhU34Zk6GjO8R 3fsyNz5UjXQa1zN6Wc41yr/SV2wEudKtWyE4mSGG1dcinzjJI+0t6ULhWKrZvzrNtuyX pACiF9Ieqr3gYUhuS/K1O4qru5L9hq/ApOGgMBqn+1Fyv9n4dpxusG8yp94K1CUnUnop VwJA== 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=0iCVkvIWKwTo1GotIojaXL5BjtGDSCmG+pddGbhRsRI=; b=MYbCUFfLSVe7ngsKZ83R8utTPcKXu4JA1xZwY+Ky7PV1ffzOp5S1ZgnKMCwYE3CysP 7aWBcxjkju5y8xxtnUntK/KfdA+fM18mxT+thz+e1Nt287W+musm8iCiYQaN/ChEp3aM mBj9eDfW7yYisnWkiWNBnS0SCxvnXrf6sBn+MsQMYWX5PcTAgVPaSOBst4xJdV2it+H7 bXy/2kSQqtXE2JzK707Uu2CdInhS94W+32c5RhfusSooHu/mwI/Nw/Ms1Aih+83UHz0x KSocpUr7o00SgBPk6FvlIdMBjdDoYNb82GB1kiY7KONKkFTOzUB+JvL87RZ2g8lyKbTX Rpyg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=N8qvaAza; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb3hztp6akgqehuml2na@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB3HZTP6AKGQEHUML2NA@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 f10sor2254927wrs.27.2020.10.14.06.28.13 (Google Transport Security); Wed, 14 Oct 2020 06:28:13 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrb3hztp6akgqehuml2na@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=N8qvaAza; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb3hztp6akgqehuml2na@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB3HZTP6AKGQEHUML2NA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1602682093; cv=pass; d=google.com; s=arc-20160816; b=ouZKSJYWulEQvkilK2mvRsCBmOJcDCgAoTfcDhofVxXVlETvll2UgOLpRZZNoSFv0y FiJrL8y/uMOqgHh8iGWUrhVFt8tt6FqfoLmyt3xJflpgqjsUXDDSzPypbgfELpgpxW9p KRCHeEIht7CqXYReMKWT4eNzzu2PizxXzww62Hh7cKIYA5a/OPTDB2ErtL0T5lVEzJHM hs5KuwzQuaTR+gEaDj1MTmk0B/xp8+4uFDxmi29KplH74jCkDEVxeKpE/LA9XcjQfeAu feS4ge56AHvhKeFzAJgb85wx0CCpotr3dTcbxA+8L5i98WJFM9Jwa6ZV6PCJTTJLg4CE glRw== 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=0iCVkvIWKwTo1GotIojaXL5BjtGDSCmG+pddGbhRsRI=; b=m770hW6tjjntzf4CU3TXrR0xpguwGYbcuN0cPHCfF8ciMIlrSUbM54GdBa/kwMGx6Q tasXGgqe1QOPJry75TqLi1nH1+EmE0w3YmlkZqlHEW/uYYyJbPcULiH//aFpHy8veKvg rw9xc1N6A2UGbxmOimmwUTXIHRdvn0M7WGDrbexpqxQd2sd0qHb48dfjG9Ap+F2PBNuh tUJDPbYvkNv/Hfj6r/ayei2H0XYGeyRllMNHZCpulqwgWQxaxr9kflcvhaf3Ol9mlbDt ElDybUkV8U4iPpF3U4TsLbI0H+fcTOvgakIMMU7hD5ojwLU0YsHkqs9qgotMRqkR8xHe Fv9A== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 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=0iCVkvIWKwTo1GotIojaXL5BjtGDSCmG+pddGbhRsRI=; b=N8qvaAza/FSaul3YgdUk9tMrd2jfTnjukw7LNEdkM2ob7XkUwBGSx6Da4tzjRPfUD2 o/i+QLgg06DCkwz50VBzdZrdSolJbNqWsvDn0m9PI12Xd1h7lFy2l7M7+Sf35JU9PVVQ vlK0r6sWeTcfsBTs5dPFA98eC5nJjy/MzUjuct9txiSH+tN2Hj/kCg1o4VnwIQjNmY3z acohVnmDWUdHIBkHtQb1HzRjHhN6Fzw+5NpmtnxLS+GyQJn5yY29tdvA/qjgszD7rFc3 VFC+3dSJLZcJn998jUlwBzHhOFbIiBz1Q8lZ1W3VDr1tdaHlt/pYh554qVSDNcqYAHd6 VoEw== 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=0iCVkvIWKwTo1GotIojaXL5BjtGDSCmG+pddGbhRsRI=; b=J/AkXLNh9RJsGS6eUeGLwvwVJGlL5xfWFCgOH1evXkGItA63lzw3mz+ezQmuIBntw6 0wZ/Jed9/XDZlo+7+g63jaEGaLea5f/f4BqGJDrydHTtgiuEMc5sBx+aQiaa5bhIE+Cj DExnzMSyOTlbr/2UCJQHBw4dE6MJgeocwmH3HoBd9JGn6tK1RnGf4WrR1YoevlwwCUAy XxSXswQjtZOm4beGMvOz/wRPTdx8y8B/QpnnyOPnWyFpeU9DuO8ZJQOHjk1B/PEssxuK JDMngrhOUMniliQjmy0WD+9aAqWTZ3/LOdlyjHuaxX4mTqkiqH9vH5Il4S5cN1gqG/rM 4slQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5313z0201Me7fntTVA72aEVrKoZlmMoy6U4b31S4VavqvXws1Q4K yyQMl3K972HBprDQhyTIEzU= X-Google-Smtp-Source: ABdhPJz6IvQF0HNEG0urPs5WKnmqhAGUjFkUh56+v7wIFoHYHS4twoWX9zFX4gGFREDx5956VC6MdQ== X-Received: by 2002:adf:e4ca:: with SMTP id v10mr5972716wrm.53.1602682092755; Wed, 14 Oct 2020 06:28:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a544:: with SMTP id j4ls4486286wrb.3.gmail; Wed, 14 Oct 2020 06:28:11 -0700 (PDT) X-Received: by 2002:adf:9e41:: with SMTP id v1mr6127427wre.60.1602682091769; Wed, 14 Oct 2020 06:28:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602682091; cv=none; d=google.com; s=arc-20160816; b=TYtVwiRQsDne8vwTzT67/Bdt6gY5EXjy9YKp+wDaX5az93qmih0AzW7/so6bjkXFx2 Ya0/TAlZzxWvaUwtCF75bj+LhY9CZkR72EnUubuO7qzSKAZUzyPu/tLZPRFxjUE85PM1 6efjZyxDb0E/l0JyMFt447ZbWpsV/ar0ABHNsiv0onISfTDZJa4XZDmqo67AcEEAvAaJ sIIMwZnc8KZJyiFAQ1JDi8ftosnKL5D8rbw4ahDY2+n8VN7SuacZh5Enpx0F7rNqHWAX nKd/NlN97z5ZijUOFXFcQwAurpRbqJxcrs+kRyvIraVenAHT8bwrYicB4BbmW6k9tsWN ftkw== 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=m/ITXQ0YK1yfGnPRUoUhFoSqKbgwYhEbuIWd3qi9qcI=; b=wrBn+qQkDHRJ5FzS+LbjwFVauCVIbyb0jb90J9yCAqGPwBZ++zDPCHmbbHAj1Aha0B lT+7+d98k00EIUE9G3Eba+zSxDqup951ozXt+UecieNtUW2eiFstE5+AV2kcncbM+mDV d7RLYdrpqkIC5r/kYqn8ClvzaXkoaxSh0WnsBXgUmBwqDMA7rl0VDdSBtBeS7aJMkS5g 36Fzr9A+zZy5oOaHPPv60PIOe4AJpnLmmqW/dLhLCeqXl522rIEvbzN1Lw23oWXk6q8T x/s7f68AF1gFnQEW2pTLZ6T93FRAwmBdyBR20dKfbh0mKWAJAFmLfsoNkMKaayo6BZF6 88Ew== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180]) by gmr-mx.google.com with ESMTPS id 63si57552wrc.0.2020.10.14.06.28.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Oct 2020 06:28:11 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180; IronPort-SDR: +Q2ZopsZ1SceTOgFurAKXbQVqiuxjWCuenEF1OVzJOqDwYJCVJqjfEjoG7ElLT02kkJRUKYCAc G9ziJVRKbRdt/C/G/+m7PFyHyBmXDDEfyVvwoFS6VD/AlqVvxs5GXfDZjlbkTEBseXIG6WA6dW kWN/H1FqRxMcPUnag7Dt8NJj3Tt9cOaRFdqHVG5jWcyRLYreAHNLhb7EF2pkL45nr5axVzIf03 eSDIkJgVm/xlVBiFYL06Inwm3+wsWmomlvL9k6GiT3w99YE/kKMvQLnPy5x8usMmoSqsfN216N Ixs= X-IronPort-AV: E=Sophos;i="5.77,374,1596528000"; d="scan'208";a="53925689" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 14 Oct 2020 05:28:09 -0800 IronPort-SDR: J3ga9XpplOV9Swk5O365VaycwWZz0ri9vF7y1YVFVmfBJtjlHfdVV0ZwVDLs6pVbhp+WtVrHQy BM9zjZNh6ECXqDm3SzqKl2sDjDRllUK2t82dYX288Ybohdmi5BGMSmfU9dvaa7l3r7xa//Xqp8 KG7hNdkEo+y9/RSZNaqAAYlYN20uSUISO5QyTkzps282VY061YoyWljdHPgiL90nz2bTF7SK9Z tv7EAg2r3JWftjYf/WvGA0XD8TN8tFQZ+lLWNNKBi1a5CQLeTaw85raGUG6PZ9d9w5i5G3SpFA WMo= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 3/8] wic-img: Satisfy the quirks of latest wic Date: Wed, 14 Oct 2020 18:57:24 +0530 Message-ID: <20201014132729.18571-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201014132729.18571-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201014132729.18571-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-09.mgc.mentorg.com (147.34.90.209) 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.137.180 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?1680533978509093155?= X-GMAIL-MSGID: =?utf-8?q?1680533978509093155?= 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. In case of stretch, bmaptool is based on python2. In case of buster and beyond it is python3. Grep the first line of bmaptool to find out which version of python is used and symlink the appropriate binary to /usr/bin/python3-native/python3. 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 0ec9575..057429f 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) @@ -158,22 +159,31 @@ EOSUDO IMAGE_FULLNAME="$7" IMAGE_BASENAME="$8" shift 8 - + # 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="$BITBAKEDIR/bin:$PATH" "$SCRIPTSDIR"/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 "${BITBAKEDIR}" "${SCRIPTSDIR}" "${WKS_FULL_PATH}" "${STAGING_DIR}" \ "${MACHINE}" "${WICTMP}" "${IMAGE_FULLNAME}" "${IMAGE_BASENAME}" \ ${WIC_CREATE_EXTRA_ARGS} + sudo chown -R $(stat -c "%U" ${LAYERDIR_core}) ${LAYERDIR_core} ${LAYERDIR_isar} ${SCRIPTSDIR} || 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}"