From patchwork Sun Dec 13 21:11:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 259 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:b386:0:0:0:0:0 with SMTP id p6csp590660ooo; Sun, 13 Dec 2020 23:11:31 -0800 (PST) X-Received: by 2002:a2e:b70f:: with SMTP id j15mr10660154ljo.60.1607929890911; Sun, 13 Dec 2020 23:11:30 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1607929890; cv=pass; d=google.com; s=arc-20160816; b=ImSfk31kNrJw/YnniBVORu6sxpRia8np7MG1EbfI8M1E97tvSmFl7hrPxVlsCM8+/5 BmnFJ6h0jASi6Mm4Bhg/tsrRIBrfjHtBmmz7EP621jn+qAJ+MEfoVC+FVLEgz8Fi3Who yvdGCDhBOO1rkM7gRT1/OCKTEtjqr/CiTQGNQVJG4vfA43z90CNccdIBTjRkQurkqb28 ED3H9pquVhiQLlU0z4x5w3E7enptnHY5aTPTTrQ7SGsD4EMzS/7Oljd2iHAUnT6/KTa2 TLvXihJLoOw1Rex66y+MM/aZBjJKuMTFPJUINLQ4AEcizsQyGzJel6+NkKTBofhtbvnE T/MQ== 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:sender:dkim-signature; bh=rzpkyvo9TmmfZ9kIrB1+K2O6A+GqFeqK1PobpJKP2EM=; b=izXJL7neeEsAvVOvPqGszQwSoPbJpTFwymh27PxQUoyQwPcqTs2cU1aiHnH+caRPyF Z21Ph2NveHCG19d96X0gmNrgkJYpZNastHsnU/CF/QgCLDkrLhN0CO5BXTDm0mFZw1jU 8nIxn7S1PmfZmqkxrroRUa1Pk2KuF6RskvdhuTMjI9IMf+TYjnYmP4tWtePyAPxzWvfP fpzyqA0Ji6XEMeZXJv81juqXqtMBxV3c8yZ1sMpnW9gYEqmL+dh3HeBgvJfk45gt2f71 MRZLfahrW5wPp3vUbUITl7rfGIE/ZvFgFqSJYRdRtqlbuTLmjakjSb4NWEF7nj4H1bYG C1nQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=QWzl3cMW; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbiva3t7akgqerxvocai@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBIVA3T7AKGQERXVOCAI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id q6sor6810386ljp.7.2020.12.13.23.11.30 (Google Transport Security); Sun, 13 Dec 2020 23:11:30 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbiva3t7akgqerxvocai@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=QWzl3cMW; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbiva3t7akgqerxvocai@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBIVA3T7AKGQERXVOCAI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1607929890; cv=pass; d=google.com; s=arc-20160816; b=GyHLROYZ/sfj9SCbl7ZLi6jtaboIQaZ+kF+QGM+wDHhXLqAk6/nvBwVSVpxL29Gqzf IjAPssgsjtz7lo3X0amMmcWFmkHlwQTBVhNJlX8zGCAagChVuAlO7msRCnGdmnNtwx+k TtRtReNvDK60msU2lkHoXaV2fwuHIWlwbu35S1wlSZu4ViZAM3uyDGTokcb9kbCJwV5E di8DceosH8MGXGSs5tkvcWJSH1lr+lDGJFFExgibIDddic1kXO/2Fw7824G+5zae64SV U1ldvG0YwZ+j5O9dgCHD31dAHODQdpYRLBArEZe5kzXFl0TQO46OjPNFFXRIoUrjVIwX TiOA== 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:sender:dkim-signature; bh=rzpkyvo9TmmfZ9kIrB1+K2O6A+GqFeqK1PobpJKP2EM=; b=IOidw1G+VT7hsEFJQBsUnrZvvg8223dC3IVbdCMtvJxjf2TD6mHHFOX8GcDvo4xiFG g720Mo35PNi9pkSQ2t4KjqAUnvLaa10hBHpZjm9peTRo841V3HUmL0tSzyvg9ka64lGG nEMxJxQq2aStdNTCelrBsT/d/0vb14ctyfEMhKUCxdjEVukdYI5MEMeOSh1aUWdGDcKX F6wmDfmyUdf27zjLeq/zaJUvCyeBS1INNwcyQOmqIovvHK22GSQWoFB18A88QkTpG0NH lfyzID9Um9VGaiWDvdgZyzjqGctvAz/03kfmrZ1kbIfoYMUx+2ECZG6XUW64P2AjYXm/ KGYg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender: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=rzpkyvo9TmmfZ9kIrB1+K2O6A+GqFeqK1PobpJKP2EM=; b=QWzl3cMWmAknKslG6rTjJ2anW6z1SwW2Xk8rw1EpCRCtu/elf3KxiisInFoR7p5w6V CsBU2y0CskVQDGMJ4HqYRgfGSgDT83HEd+Jd2gs7rn7K6tqiarKQBWVsanlYUaE/SHbB rI/Wc2ZbNEM1IJlM9qEKfgs5frxyZeVlSe4QN2UEB7nYX6u4SUsEVxCESWBvE4EmrcH/ XHXy+XQgLLlaSbGyf2ocva+u3pZk1/AmBaFUi2HterscxmA3Xvuyzg7NREjgqyTKKIup l8JnEu6km8LjlIR/OeJU2S4y05QxgUuPa0Nd76YDEpWCwGWnKUY1oALXlzM/abw594bT lhQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state: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=rzpkyvo9TmmfZ9kIrB1+K2O6A+GqFeqK1PobpJKP2EM=; b=iJrzso+NQ9SPEM7AQX/zD+qaQjy+fPXjgST9lCZVqOP+/C6tfLliAp47ypweyWeueU vJ5Wbra4C6WMhfur37DlkqBmooqcmW4Z0HUoKI6JVeJyZfaB+IWcS4+Jf0xthBSiYCIq FudFD/0UG9/8+4DH6hNM7KqwPy9F9s735GKdq4avW57cHUpu2+f17O+5gzFlvBklAs6C Pv6NtmMMdA1bIE5emVBp2+ZwAmArPq9NiXPcZll41q7Ad3m6cY8/piT62yMwQjIg344E +KTYvXabX2K90JFTzh2f2KBddhnWtbR2lK9MpiUVLF6cLGlVnW5YIsC5IoVAv2AiCtC1 +lcA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532qdz0G9ETJkDme0u7lh4xWNnCj7Z5PH39+3bh9Us7ZzHT5wGcg NMicT34HKwpwkVp0lkFZp9I= X-Google-Smtp-Source: ABdhPJy69+4H5ep/0DNX/98OopuhRkOyy/FIu4rdFW4Csv1Yfn6JZKkYEuVzFEkstanDaYHC8Dfmsw== X-Received: by 2002:a2e:8110:: with SMTP id d16mr10423451ljg.280.1607929890585; Sun, 13 Dec 2020 23:11:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:c886:: with SMTP id y128ls420283lff.0.gmail; Sun, 13 Dec 2020 23:11:29 -0800 (PST) X-Received: by 2002:a19:8116:: with SMTP id c22mr9341129lfd.211.1607929889500; Sun, 13 Dec 2020 23:11:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607929889; cv=none; d=google.com; s=arc-20160816; b=VN+xUTHY5vxOjXlQSqQs9OQsvwNX9TCIaXhToXe9pskj7sJV+NUV8sNcoyb48Fzc9d ZttAqJQbm0UT2B7XGZSezfQVTTVebv3ixOfRt2q03oSDdN5cunK2dhQxq8PI4jRIh/e5 leTKmLRlwfJREKu5IV9OFxrf/xQcKRhCk+C5yBTUbpvWUM9JCwmwEOgsuUZokAjriXG7 xbqk3BHh9u3j3pDX1Kd2cRTIgHbv2pF0rw5SKXCzLcK3YbxM1HXxpJs02KwhAtzx3og3 WzpeLdjuhgZjEH2+uJxTgQ1UsPgzcREzuFPvOf7YQY7VE+28Cd945YypmVO3Ov7pb/NJ pxxg== 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=FVZZ5sG/D4918jBTmx+FPdHWB/7YRsp8q+8p8t9P5Tk=; b=NcA3qX3FClyZYJh5Lj6GJUNkvXaL7JW9U7Q/2K4/RcNmpohBWfeFZD1rCUSwOQwO6E Ikmzh7qLX0Em/gxzV8NvTNTsTLno3maBkTCF3sBHV7XTFty0Tvo+OAsIKr1f3e6nL91N ug2FtpnbBNPx0AtcPokO8/u1cpa7yxggm19tSLeFh0s6OIQGcnnWf2Vf/kvC3kB66wSy gDk7Dv2vH3xjmyS1NIEOq0yeqcVetlyAjy5SCSzTj7tbJWw5pjLRB5av7pKTpFb05mVI 3/56iaqJKKVAKAD/2bvq3DeeBwh62qMYxI6eOVtUwewP9xDB27/7RcOd5UgLlbAsSS3Y WIAA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id c15si11283ljn.0.2020.12.13.23.11.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Dec 2020 23:11:29 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 0BE7BSQx006592 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Dec 2020 08:11:28 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.38.225]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0BE7BRXb030825; Mon, 14 Dec 2020 08:11:28 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 4/6] meta: cache_deb_src: Account for the case that resolv.conf is a non-existent link Date: Mon, 14 Dec 2020 08:11:25 +0100 Message-Id: <4b141fb9b093959f1e20cb315eece734480b5963.1607929886.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.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?1686036693346406788?= X-GMAIL-MSGID: =?utf-8?q?1686036693346406788?= From: Jan Kiszka This is true if systemd-resolve is used, like on Ubuntu. Signed-off-by: Jan Kiszka --- meta/classes/rootfs.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index efed0f65..f9151c5b 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -186,7 +186,8 @@ python do_rootfs_install() { addtask rootfs_install before do_rootfs_postprocess after do_unpack cache_deb_src() { - if [ -e "${ROOTFSDIR}"/etc/resolv.conf ]; then + if [ -e "${ROOTFSDIR}"/etc/resolv.conf ] || + [ -h "${ROOTFSDIR}"/etc/resolv.conf ]; then sudo mv "${ROOTFSDIR}"/etc/resolv.conf "${ROOTFSDIR}"/etc/resolv.conf.isar fi rootfs_install_resolvconf @@ -199,7 +200,8 @@ cache_deb_src() { debsrc_download ${ROOTFSDIR} ${ROOTFS_DISTRO} sudo rm -f "${ROOTFSDIR}"/etc/resolv.conf - if [ -e "${ROOTFSDIR}"/etc/resolv.conf.isar ]; then + if [ -e "${ROOTFSDIR}"/etc/resolv.conf.isar ] || + [ -h "${ROOTFSDIR}"/etc/resolv.conf.isar ]; then sudo mv "${ROOTFSDIR}"/etc/resolv.conf.isar "${ROOTFSDIR}"/etc/resolv.conf fi }