From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6635832943372664832 X-Received: by 2002:a5d:50c6:: with SMTP id f6mr1900583wrt.10.1545211808760; Wed, 19 Dec 2018 01:30:08 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:88c5:: with SMTP id k188ls363511wmd.4.canary-gmail; Wed, 19 Dec 2018 01:30:08 -0800 (PST) X-Google-Smtp-Source: AFSGD/X6cTz1/HmrbJPaNj6lk/6z7XPoPQPwT/5/Zz6DUkNI5oX3dTOp56OvCm2OJ9vcE1pbFJzd X-Received: by 2002:a7b:c002:: with SMTP id c2mr677750wmb.0.1545211808357; Wed, 19 Dec 2018 01:30:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545211808; cv=none; d=google.com; s=arc-20160816; b=Kux5wWu+GqA9rRELcXak1Ev7AYwJ6wdVJk2k7ViyED45eDCciPhXPaGn/OiYluaWig V8Bs3iF3s0ccamSodXQVF/BazkdoDXtqZGwsccQnADujyZ1Ii4G52VuNGYXOfnxAIalA brqlFmuNcD+DWAs8mWRxa18omD/twJAoMaDv2tzaScTaB6RNxJcSbojgjoiMUA55qfKu 1nbxWs3ZzY79hQAmhUap8Q4gBoxeIbPNOpEi3MdSN9oxJ6/IjhAeYxBKP1QOBwrDboKh E0ZiBZk58u7I5QiZ+SaaJ7dxVi34fXFx6EfhfN4NV/G8lLzIPcGfZOfqghndTAOYEiAw 1CwA== 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:subject:cc:to:from:date; bh=6MAQateyUz+x20Hww2gl5AJXjO6QuGykvYra5S8K7uU=; b=Ajvw/uvfJHoaT69EHU5UusorTI0TA6Mln7lHofh8oo9m84mj0jr2BSR+yuytylr6G9 ZEhmFJ+oHcqN6vwpmDqPKlsRKDpJnqHPEWS6HrdPm0x0rdpfZCy99SP1mVAnbSzkfz/k Lx9CSasWFEIUUlGo/cBDvtYRxzOS1DRg2pgWPkrsDSkqQ9EwoCZo81sgm9TYRMd/fSb2 C5rhariKLz19iVagufZe75dJN5xhDNVf1E4xyMguKX3Svycbjh+S3PsnDM86Jk7OJXFe As6efzvs3LFCnPXGbY7NGMCBRoSk27s3XMVVz+6taJ6VNMGPKFEA7Yp8X/yueDz5YpQE Khrg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id p19si251505wmc.0.2018.12.19.01.30.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 01:30:08 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id wBJ9U7fW010678 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 19 Dec 2018 10:30:07 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.6]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id wBJ9U7Pn003596; Wed, 19 Dec 2018 10:30:07 +0100 Date: Wed, 19 Dec 2018 10:30:07 +0100 From: Henning Schild To: "[ext] Jan Kiszka" Cc: "Maxim Yu. Osipov" , Subject: Re: [PATCH v2] classes/isar-image: Replace the apt sources file with the original Message-ID: <20181219103007.62cf5cc4@md1za8fc.ad001.siemens.net> In-Reply-To: <2facc13b-a280-06f6-4d34-982a31868e27@siemens.com> References: <20181218170313.23977-1-mosipov@ilbers.de> <2facc13b-a280-06f6-4d34-982a31868e27@siemens.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: pg1hs73temqW Am Wed, 19 Dec 2018 08:27:02 +0100 schrieb "[ext] Jan Kiszka" : > On 18.12.18 18:03, Maxim Yu. Osipov wrote: > > At the final stage of image generation replace the local apt sources > > file used for bootstrapping with the original APT sources list > > defined via DISTRO_APT_SOURCES variable. > > > > Signed-off-by: Maxim Yu. Osipov > > --- > > meta/classes/isar-image.bbclass | 6 ++++++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/meta/classes/isar-image.bbclass > > b/meta/classes/isar-image.bbclass index 81738ff..4992800 100644 > > --- a/meta/classes/isar-image.bbclass > > +++ b/meta/classes/isar-image.bbclass > > @@ -66,7 +66,13 @@ isar_image_cleanup() { > > if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then > > sudo umount -l ${IMAGE_ROOTFS}/base-apt > > sudo rmdir ${IMAGE_ROOTFS}/base-apt > > + # Replace the local apt we bootstrapped with the > > + # APT sources initially defined in DISTRO_APT_SOURCES > > + sudo rm -f > > "${IMAGE_ROOTFS}/etc/apt/sources.list.d/base-apt.list" > > + sudo mv "${IMAGE_ROOTFS}/etc/apt/sources-list" \ > > + > > "${IMAGE_ROOTFS}/etc/apt/sources.list.d/bootstrap.list" fi > > + sudo rm -f "${IMAGE_ROOTFS}/etc/apt/sources-list" > > As I'm counting 3 further sudos here, and actually every other > command in isar_image_cleanup has that prefix as well: Why not just do > > sudo sh -c ' \ > cmd1 > cmd2 > ... > ' > > like elsewhere? > > This case would actually need > > sudo isar_image_cleanup() { > ... > } > > if bitbake had that. prefuncs/postfuncs As soon as sudo is involved cleandirs will not work anymore, which should probably be the default way to go. Henning > Jan > > > } > > > > do_rootfs() { > > >