From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6635832943372664832 X-Received: by 2002:a2e:9119:: with SMTP id m25-v6mr633910ljg.22.1545204425045; Tue, 18 Dec 2018 23:27:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9d8e:: with SMTP id c14-v6ls2348145ljj.10.gmail; Tue, 18 Dec 2018 23:27:04 -0800 (PST) X-Google-Smtp-Source: AFSGD/XpYTIIGvDgM52QAMOskS/kOKFPXP1RKXyR2aZ2eUROD6S9EXXVDNxa3da04Qs51Gl/nUiN X-Received: by 2002:a2e:2bd3:: with SMTP id r80-v6mr1650513ljr.16.1545204424357; Tue, 18 Dec 2018 23:27:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545204424; cv=none; d=google.com; s=arc-20160816; b=xc5ZtGTUDLARNvM831n4Ndgv9jy7AzxH5IMgupkE6xDe4rApU403FVpP18jsaYFKs0 2WBhjUXM6ebsEirigchPKPvFMD4EhhV3h7+Cr/wzC+aZzzlV3C3ylyeZr6Fv9mayhKcC +t+b7JdieYDiLrsjNy8SD4o+Rmm7pdH5vwixr3o8qkJKVkMut8deri5Nk5ofxyS877Qi z5VDJ8tWHoI9WZ5jhyxOv0zbBpiT0GGo5ndr+aZ3q8hSuUq8Z1heaINSRiKMJ8RCRRqd K7Q+EPF/ivKLgvwzy78jSZ6eKy3vngb+8KYZVIID4TWC/ilrzfcM7YR6Ra2r3I1YEmFj HGkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=0E5HyQB5CkPOZfeaSKHjDbggxPeAF7TTKjXr4+fN9pU=; b=STomV7tru3B5OZDDYPuduLYCClEvEIdp42q96L+T5CGLunXbjGz4A7zTMypKrnxLxq wQCnDRci0bx1CNrbo+1sl+FSp4f3To9eW7OAfXmcUtxXtMy8Dnfn+okKd+YM8VNqbfg3 L8T1C6ErqIz14NQ6XjRxTuUSS1cdvL+LJg/Nupkkf9ojUFBb9Ub5r1t3f9BG/0KQBJZP qY8U//ZQfdjNWngXpYh3PivgZygK9m3vJftvKqQV4HObAlGjsshplAQuDZ69PUBO5fdh UfJakTHl9sYlACENMKQOYIlsJEuUHEXuec+huMltde8z3riwaxP4wRxmRfS7BWTCZauN X5bg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id e17-v6si721752ljg.5.2018.12.18.23.27.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Dec 2018 23:27:04 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id wBJ7R3FN007354 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 19 Dec 2018 08:27:03 +0100 Received: from [167.87.7.53] ([167.87.7.53]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wBJ7R2TW001197; Wed, 19 Dec 2018 08:27:03 +0100 Subject: Re: [PATCH v2] classes/isar-image: Replace the apt sources file with the original To: "Maxim Yu. Osipov" , isar-users@googlegroups.com References: <20181218170313.23977-1-mosipov@ilbers.de> From: Jan Kiszka Message-ID: <2facc13b-a280-06f6-4d34-982a31868e27@siemens.com> Date: Wed, 19 Dec 2018 08:27:02 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20181218170313.23977-1-mosipov@ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: qityhMyK6oPg 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. Jan > } > > do_rootfs() { > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux