From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750962531146137600 X-Received: by 2002:a19:7511:: with SMTP id y17mr3524624lfe.19.1573152967573; Thu, 07 Nov 2019 10:56:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4184:: with SMTP id z4ls1307683lfh.9.gmail; Thu, 07 Nov 2019 10:56:07 -0800 (PST) X-Google-Smtp-Source: APXvYqxfgZQ2Hx/s9gpnywv/IqDJ/54FsqFPeFXTck/8hFwSnCu/4KWlheo6uCPuXAiDlpRHvR4T X-Received: by 2002:ac2:523c:: with SMTP id i28mr3345948lfl.165.1573152967045; Thu, 07 Nov 2019 10:56:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573152967; cv=none; d=google.com; s=arc-20160816; b=vUdx6CD2pwNBHVWtB93UbONhV17r55UsOmWy5pyLRCf5ESp176mv13rk1i7NiVmO5G KPybonUGOYxmPsiTTstR012r8VKV8TKU4vgmk7bLh/hkxymEj0H7Q+nlxmVXdf7LFm9E N1fj3pEMXHo73gxetHbqvdFoLXAFz7dm9epJ5ZjtamgDoWyCWxF2aVfsOL2QijQsQBui HxHIXpjRT3R+EdFva7V01z5A1X0z0LPE6E/IwMvRN+2GDhu+aWnprVOhYlOUVviH6Cds DOLLOGOQrfOS8UXLNH5sWiq3er16z1jJwaAOtMmJUVLi0PjxAp+EDgF+IlqGTcF1p5gk oucw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=eyGj4/OJTm4FTSQ0iD2Noh1iBeI7DTUMQRNee5SaxnY=; b=gUS0YOz/lpwzG835bSOWbkA40JVCIzJx9iPR2Q4M+86AT0vvV95uGjIWqPBr/uskJp +ee51Rd2a9qskLJaYk3QcRML3j4nB6wHG9e7+/s95EAPEjGgEZUK0gW7J0+Qk2GNTqyb hkDG/9Q3dZK2Kwj1ue0HSZB4fGp8e3Y8zkXgh8ObVBZxr0xla7EMPtgG+ueUCSNRdPyZ f615/NZX9x5jiiNXCzOwDBG5PViZviRS0+oWwV3Dq6CC5NoN3gfa91R5LOFs42m2gsBh zK/BbcXVdl0kpr3hXYOOUaYUTRk6z7Rph5Nv2nT/oz9hNZe7mN07R2a4oYUDrWmCtT3Q 6uZg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id z18si258931lfh.1.2019.11.07.10.56.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Nov 2019 10:56:07 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id xA7Iu5JM007791 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 7 Nov 2019 19:56:06 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.32]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id xA7Iu5AD030558; Thu, 7 Nov 2019 19:56:05 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Baurzhan Ismagulov , chombourger@gmail.com, Henning Schild Subject: [PATCHv3 7/9] meta: do not equip rootfss with resolv.conf when BB_NO_NETWORK Date: Thu, 7 Nov 2019 19:56:01 +0100 Message-Id: <20191107185603.9077-8-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191107185603.9077-1-henning.schild@siemens.com> References: <20191107185603.9077-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: fCPHWbV9SyfQ From: Henning Schild A second "line of defense" to implement BB_NO_NETWORK in Isar. Signed-off-by: Henning Schild --- meta/classes/buildchroot.bbclass | 10 ++++++++-- meta/classes/rootfs.bbclass | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass index 64ac450..1a8ee13 100644 --- a/meta/classes/buildchroot.bbclass +++ b/meta/classes/buildchroot.bbclass @@ -48,8 +48,14 @@ buildchroot_do_mounts() { mount --bind '${REPO_BASE_DIR}' '${BUILDCHROOT_DIR}/base-apt' fi - # Refresh /etc/resolv.conf at this chance - cp -L /etc/resolv.conf '${BUILDCHROOT_DIR}/etc' + # Refresh or remove /etc/resolv.conf at this chance + if [ "${@repr(bb.utils.to_boolean(d.getVar('BB_NO_NETWORK')))}" = 'True' ] + then + rm -rf '${BUILDCHROOT_DIR}/etc/resolv.conf' + else + cp -L /etc/resolv.conf '${BUILDCHROOT_DIR}/etc' + fi + ) 9>'${MOUNT_LOCKFILE}' EOSUDO } diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index fa915f8..c67abab 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -105,7 +105,10 @@ rootfs_install_pkgs_update() { ROOTFS_INSTALL_COMMAND += "rootfs_install_resolvconf" rootfs_install_resolvconf[weight] = "1" rootfs_install_resolvconf() { - sudo cp -rL /etc/resolv.conf '${ROOTFSDIR}/etc' + if [ "${@repr(bb.utils.to_boolean(d.getVar('BB_NO_NETWORK')))}" != "True" ] + then + sudo cp -rL /etc/resolv.conf '${ROOTFSDIR}/etc' + fi } ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_download" -- 2.23.0