From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6612472042631462912 X-Received: by 2002:adf:dc81:: with SMTP id r1-v6mr1397956wrj.10.1539586121855; Sun, 14 Oct 2018 23:48:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:3017:: with SMTP id 23-v6ls4583267ejz.13.gmail; Sun, 14 Oct 2018 23:48:41 -0700 (PDT) X-Google-Smtp-Source: ACcGV62w4QE6APlaGWhduBExjoZZyKGQC3zS6jvblvj7nkrGNtm1Hf8lmp9SrqDcO9ojg+ppk8KS X-Received: by 2002:a17:906:8695:: with SMTP id g21-v6mr3022883ejx.4.1539586121461; Sun, 14 Oct 2018 23:48:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539586121; cv=none; d=google.com; s=arc-20160816; b=U20X1rc8oPXvjfh7Bv2WMNftW5FNt7K++9liA0+Olqnu/eHszzjLfLNwzc+xRjYqVj qPZkQXmEXgvt2Pcj7yIMjN+RVoYRdZVeYsThmleceOawcW9EnSlNpA9rG/mKENy+9Ncd AQwr13N8XGC1lBcip7yRjrGxed6nM/oJty0nawTtt2b73VgvT+aTUjqNgikQGkiKSK61 Yn2E0r7N15+IXEDCAdllNi8E9vteeResD6j2EscdLyl/Hdp9t/U/ixMX+GhB0sYwqHD4 TZ3uH/gDNtZpUpJemOfkYG1gDw7dW1ZVEKdrv3VgnJCzul8kg1XZd/dMwtIcgu1LZXtb PIeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:message-id:date:subject:cc:to:from; bh=/tZtGjVnVTh3npyXfr26QuJvEVOO5cSZsblripgsIM0=; b=KDyerSUakgUeL3W8GoF+UT82yJEoK5VD3C6Hn+T6BG7vKM1ag1Z7Y4Ngt/Pts3D9Oo tQKnOWZeWkm/B7X5ZU7DMYHbfovDK7Nv3i/LmBorrs6uuLXCjkLJTxaugO/pAXJdUZvS YfOLgQ7ReDVz0jv0TbSnobXMrU4R1OCSaWvAikTwklRN11hLmrnOE5VrHgH0qJpIDIZK vvFnhmZK1XiTv21/kkvXns/H6L09rUEUQjie03RfaTJrsc57OIWVhd8gYsV70Kb2sWxR Dp3445hDsrRwYPsCj573D+szRLD9BaFeutG5rfyJHzXHjwg6l7aQChlOA1ZH0zWTRHDI 5QJQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from relay1.mentorg.com (relay1.mentorg.com. [192.94.38.131]) by gmr-mx.google.com with ESMTPS id w11-v6si392985eda.3.2018.10.14.23.48.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Oct 2018 23:48:41 -0700 (PDT) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) client-ip=192.94.38.131; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Received: from nat-ies.mentorg.com ([192.94.31.2] helo=svr-ies-mbx-02.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1gBwgB-0005hT-VK from Cedric_Hombourger@mentor.com for isar-users@googlegroups.com; Sun, 14 Oct 2018 23:48:40 -0700 Received: from FRG-W10-HOMBOUR.world.mentorg.com (137.202.0.90) by svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Mon, 15 Oct 2018 07:48:36 +0100 From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH] wic: refactor to use buildchroot_do_mounts Date: Mon, 15 Oct 2018 08:48:28 +0200 Message-ID: <1539586108-213-1-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-07.mgc.mentorg.com (139.181.222.7) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: Ig0Fax3RkjAS The wic code needs to bind mount buildchroot directories. Leverage the newly added buildchroot_do_mounts function instead of binding required directories ourselves. For additional mounts (such as layer directories), use mountpoint to check if they were already mounted before bind mounting them. Signed-off-by: Cedric Hombourger --- meta/classes/wic-img.bbclass | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index 5ff8b45..d0747e2 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -9,6 +9,7 @@ python () { bb.fatal("WKS_FILE must be set") } +inherit buildchroot inherit wks-file WKS_FULL_PATH = "${@get_wks_full_path(d)}" @@ -67,13 +68,11 @@ WIC_IMAGE_FILE ="${DEPLOY_DIR_IMAGE}/${PN}-${DISTRO}-${MACHINE}.wic.img" do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" do_wic_image() { - if ! grep -q ${BUILDCHROOT_DIR}/dev /proc/mounts; then - sudo mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${BUILDCHROOT_DIR}/dev - sudo mount -t proc none ${BUILDCHROOT_DIR}/proc - fi + buildchroot_do_mounts for dir in ${BBLAYERS} ${STAGING_DIR} ${ISARROOT}/scripts; do sudo mkdir -p ${BUILDCHROOT_DIR}/$dir - sudo mount --bind $dir ${BUILDCHROOT_DIR}/$dir + mountpoint ${BUILDCHROOT_DIR}/$dir >/dev/null 2>&1 \ + || sudo mount --bind $dir ${BUILDCHROOT_DIR}/$dir done export FAKEROOTCMD=${FAKEROOTCMD} export BUILDDIR=${BUILDDIR} -- 2.11.0