From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6631443383289118720 X-Received: by 2002:a1c:e308:: with SMTP id a8mr2480105wmh.14.1544003231774; Wed, 05 Dec 2018 01:47:11 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:168f:: with SMTP id 137ls3829888wmw.13.canary-gmail; Wed, 05 Dec 2018 01:47:11 -0800 (PST) X-Google-Smtp-Source: AFSGD/Vvh7zHyQuB1skZ25IKT/N8uQj5P60LLM+cthJLifEvtkHtnbpowLwRPLaeP7dfdKxcEH8+ X-Received: by 2002:a1c:e703:: with SMTP id e3mr2577051wmh.1.1544003231401; Wed, 05 Dec 2018 01:47:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544003231; cv=none; d=google.com; s=arc-20160816; b=MnOZDQs+D8b4s5FJIRdZhdZCvmI/08t/YikNNUTIWMyEp3xwoUj4LWGjnfAzuTQClu UkmWeVuJ1/qgZzZ2ZZwM7DEYrLr10eFqoFNtdVlBr60mJuMpUcsNA+siI/b3G2hKVr7s MjlH/plSS3hYf1Fljq1DbaIPJmx8RJ1ZgKKmZLcJ7W0JiB/69cyOWfJBthfKlcNKt3/e qwHxVevUcezkfOUCJZB4ZEpVAvTTmrY7pU0pq4BNqs5gM9yjXwYBC9JakD+AnrDmgMfQ f2ENhe8bniLJq04JusGlm+Di6NRGxEVBd74OFPBKjIr21D7Wias/c+lpFeqo+i0EKioG Cgkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from; bh=CrZ9wwzOKaPzgSi+e/jynGMSyNNX2FvOHI70SLtoD1A=; b=pFYXe5EMMGR8JuMZCdYQ5c9/uMftdaxtXyZ2q1XqxRMV03diGbuxlXKHxGHG9IkskS 3/IMALJ85sJNiHkKssNQvEhgyd0ZLfUFR3/mzGPReg2x8VTjES5+z/07yf8dRfNvFOkd VUnSz6l0FvW73ZwpmrmVjdNRvinE0CzES2zYEOmW04nFbBgSkBKiKlhIcyx0KU/O+yd+ R222m1D7o/z3HfqWscTxCESmFMc3m/3+42FEOfWoDi2bqmt2/Oj40CQy15n9myF9Z6WA GqkRbR8ajbfS/dsx9QrvmqdFAodKWa8i+UByVrnKQ6YMtN/yjNCQcnwjFV+NgzVSjFBd RtYg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id p19si616107wmc.0.2018.12.05.01.47.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 01:47:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id wB59kx6v027966 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Wed, 5 Dec 2018 10:47:10 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 2/2] meta/classes: Cleanup /sys rbind mounting Date: Wed, 5 Dec 2018 10:46:59 +0100 Message-Id: <20181205094659.25029-3-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181205094659.25029-1-mosipov@ilbers.de> References: <20181205094659.25029-1-mosipov@ilbers.de> X-TUID: PvTMQfCAsSh0 This patch eliminates rbind mounting introduced by commit 768908a "buildchroot: add sysfs mount since expected by some packages" as bitbake hangs when trying to unmount /sys). The following scenario causes hangs on Debian 9 (stretch) systems: * source isar-init-build-env * sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf * bitbake -c cache_base_repo multiconfig:qemuarm-stretch:isar-image-base \ multiconfig:qemuarm64-stretch:isar-image-base multiconfig:qemuamd64-stretch:isar-image-base * sudo rm -rf tmp * sed -i -e 's/#ISAR_USE_CACHED_BASE_REPO ?= "1"/ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf * bitbake multiconfig:qemuarm-stretch:isar-image-base \ multiconfig:qemuarm64-stretch:isar-image-base multiconfig:qemuamd64-stretch:isar-image-base The last command hangs on the last task. Signed-off-by: Maxim Yu. Osipov --- meta/classes/buildchroot.bbclass | 3 +-- meta/classes/image.bbclass | 2 +- meta/classes/isar-bootstrap-helper.bbclass | 3 +-- meta/classes/isar-image.bbclass | 2 +- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 3 +-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass index d7368c4..5a8a137 100644 --- a/meta/classes/buildchroot.bbclass +++ b/meta/classes/buildchroot.bbclass @@ -29,8 +29,7 @@ buildchroot_do_mounts() { mount --bind ${DL_DIR} ${BUILDCHROOT_DIR}/downloads mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${BUILDCHROOT_DIR}/dev mount -t proc none ${BUILDCHROOT_DIR}/proc - mount --rbind /sys ${BUILDCHROOT_DIR}/sys - mount --make-rslave ${BUILDCHROOT_DIR}/sys + mount -t sysfs /sys ${BUILDCHROOT_DIR}/sys fi # Refresh /etc/resolv.conf at this chance diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index f438f11..5806a59 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -110,7 +110,7 @@ do_populate_sdk() { sudo umount ${SDKCHROOT_DIR}/rootfs/dev || true sudo umount ${SDKCHROOT_DIR}/rootfs/proc || true - sudo umount -R ${SDKCHROOT_DIR}/rootfs/sys || true + sudo umount ${SDKCHROOT_DIR}/rootfs/sys || true # Create SDK archive sudo tar -C ${SDKCHROOT_DIR} --transform="s|^rootfs|sdk-${DISTRO}-${DISTRO_ARCH}|" \ diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass index 0750a8f..e755e4f 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass +++ b/meta/classes/isar-bootstrap-helper.bbclass @@ -105,8 +105,7 @@ setup_root_file_system() { sudo mount -t devtmpfs -o mode=0755,nosuid devtmpfs $ROOTFSDIR/dev sudo mount -t proc none $ROOTFSDIR/proc - sudo mount --rbind /sys ${ROOTFSDIR}/sys - sudo mount --make-rslave ${ROOTFSDIR}/sys + sudo mount -t sysfs /sys ${ROOTFSDIR}/sys # Refresh /etc/resolv.conf sudo cp -L /etc/resolv.conf ${ROOTFSDIR}/etc diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass index c65b13c..14b97dd 100644 --- a/meta/classes/isar-image.bbclass +++ b/meta/classes/isar-image.bbclass @@ -61,7 +61,7 @@ isar_image_cleanup() { sudo rmdir ${IMAGE_ROOTFS}/isar-apt sudo umount -l ${IMAGE_ROOTFS}/dev sudo umount -l ${IMAGE_ROOTFS}/proc - sudo umount -R -l ${IMAGE_ROOTFS}/sys + sudo umount -l ${IMAGE_ROOTFS}/sys sudo rm -f "${IMAGE_ROOTFS}/etc/apt/apt.conf.d/55isar-fallback.conf" if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then sudo umount -l ${IMAGE_ROOTFS}/base-apt diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index c19399c..b13ea9d 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -245,8 +245,7 @@ isar_bootstrap() { # update APT mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${ROOTFSDIR}/dev mount -t proc none ${ROOTFSDIR}/proc - mount --rbind /sys ${ROOTFSDIR}/sys - mount --make-rslave ${ROOTFSDIR}/sys + mount -t sysfs /sys ${ROOTFSDIR}/sys export DEBIAN_FRONTEND=noninteractive chroot "${ROOTFSDIR}" /usr/bin/apt-get update -y -- 2.11.0