From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6467463440282681344 X-Received: by 10.28.230.198 with SMTP id e67mr2361167wmi.24.1507107948842; Wed, 04 Oct 2017 02:05:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.11.143 with SMTP id 137ls3215699wml.0.canary-gmail; Wed, 04 Oct 2017 02:05:48 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDzMsgA3w3tmY+zhurawObPaM4M84HV4DASdFpmhRNJCQj9I3xvCWxg9TFoa/Qvxl2ACPwb X-Received: by 10.223.156.139 with SMTP id d11mr674789wre.17.1507107948600; Wed, 04 Oct 2017 02:05:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507107948; cv=none; d=google.com; s=arc-20160816; b=NExHo46GXqAZu353FFDnoLcwmdYpaA/YrJ7RNFYPgS4uxf/+TYFkn89Nvuk1Z1fDjZ 0sXdBE2cmhArNz5tXZ9uUOKiAHCai0jmdlYgQlhnOPs9tkN5tEc3ne2J8mMLvok13y62 DHjYWk6Vtx4UD0IeJDZXiM6XaPWM4Ccyyu6py7AHQjNVg/8TJjdvhBXCNMYCRVNWFGqb 1Fznu69F5ikEsIc4fcSZELSAfkM2Pi87gKDI4bdR3kkWFogR2C2bBV4DG4fYKQS5hl5T ewrBdbewrmeasIhyvyHE8Y4yr5O62cv06fk/NPragoALmogirJcmbLC1qeYlHzFFkh8m Nkhw== 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:arc-authentication-results; bh=erwbE0cuXQc1BO7vi+ujNotH7vb1ENFmfnSu7/a4PjA=; b=Ui/A52TrvYsrpi+THDNBrZhX5IaEjVjkcK6aSksG9RX+usL8v7+OYkZekT3MW9Wh2Q boa+7DBiNeqew9XjoHhRRkf8DcjNPWlUOS/6USBr1Zu3Wmi9mWfX04rl/owvBJseNtzK qFXNa9NV8ZL7csCUaKBn9NDbOz8iypFzq5avtYzUjOl7SGOaFU6U2RrHrfcBFJQKty9y M+lCzPcjZ3St3sWOVDjH7XBxgkRA/BZEiF8hyccnSWS/w97lqvtaGXGK1iri54CpVV2c is/0JZL9NSn3M+ltwG7JDiJZ/I2ZDZT4y5R0HRUMnYjgj/wCc9+8fjPF5qEsEk+NH7eI T6hg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id l133si1871336wmb.3.2017.10.04.02.05.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Oct 2017 02:05:48 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.2 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id v9495m2s005890 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 4 Oct 2017 11:05:48 +0200 Received: from md1em3qc ([139.22.133.127]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id v9495lM6020809; Wed, 4 Oct 2017 11:05:47 +0200 Date: Wed, 4 Oct 2017 11:05:46 +0200 From: Henning Schild To: Alexander Smirnov Cc: Subject: Re: [PATCH 4/4] meta-isar-bin: Install packages via multistrap Message-ID: <20171004110546.266a7a48@md1em3qc> In-Reply-To: <20171002154531.4930-5-asmirnov@ilbers.de> References: <20171002154531.4930-1-asmirnov@ilbers.de> <20171002154531.4930-5-asmirnov@ilbers.de> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: iu/Mwhf2lBo0 Am Mon, 2 Oct 2017 18:45:31 +0300 schrieb Alexander Smirnov : > Install custom packages to target image filesystem using multistrap. > > Signed-off-by: Alexander Smirnov > --- > meta-isar/recipes-core/images/files/multistrap.conf.in | 9 ++++++++- > meta-isar/recipes-core/images/isar-image-base.bb | 5 ++++- > meta/classes/ext4-img.bbclass | 2 +- > meta/classes/image.bbclass | 10 > ---------- 4 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/meta-isar/recipes-core/images/files/multistrap.conf.in > b/meta-isar/recipes-core/images/files/multistrap.conf.in index > 2d08c36..38d53cf 100644 --- > a/meta-isar/recipes-core/images/files/multistrap.conf.in +++ > b/meta-isar/recipes-core/images/files/multistrap.conf.in @@ -4,7 +4,7 > @@ [General] > noauth=true > unpack=true > -bootstrap=##DISTRO## > +bootstrap=##DISTRO## Isar > aptsources=##DISTRO## > configscript=##CONFIG_SCRIPT## > setupscript=##SETUP_SCRIPT## > @@ -16,3 +16,10 @@ suite=##DISTRO_SUITE## > components=##DISTRO_COMPONENTS## > packages=##IMAGE_PREINSTALL## > omitdebsrc=true > + > +[Isar] > +packages=##IMAGE_INSTALL## > +source=##DEPLOY_DIR_DEB## > +suite=##ISAR_DISTRO_SUITE## > +components=main > +omitdebsrc=true > diff --git a/meta-isar/recipes-core/images/isar-image-base.bb > b/meta-isar/recipes-core/images/isar-image-base.bb index > f4b0125..3b29a53 100644 --- > a/meta-isar/recipes-core/images/isar-image-base.bb +++ > b/meta-isar/recipes-core/images/isar-image-base.bb @@ -46,6 +46,9 @@ > do_rootfs() { -e > 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/${DISTRO_CONFIG_SCRIPT}|g' \ > -e 's|##SETUP_SCRIPT##|./'"$WORKDIR_REL"'/setup.sh|g' \ -e > 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \ > + -e 's|##IMAGE_INSTALL##|${IMAGE_INSTALL}|g' \ > + -e 's|##DEPLOY_DIR_DEB##|copy:///${DEBCACHEDIR}/${DISTRO}|g' > \ > + -e 's|##ISAR_DISTRO_SUITE##|${DEBDISTRONAME}|g' \ > "${WORKDIR}/multistrap.conf.in" > > "${WORKDIR}/multistrap.conf" > # Create root filesystem > @@ -57,4 +60,4 @@ do_rootfs() { > sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}" > } > > -addtask rootfs before do_populate after do_unpack > +addtask rootfs before do_build after do_populate > diff --git a/meta/classes/ext4-img.bbclass > b/meta/classes/ext4-img.bbclass index 3e3768b..9fa9aa5 100644 > --- a/meta/classes/ext4-img.bbclass > +++ b/meta/classes/ext4-img.bbclass > @@ -34,4 +34,4 @@ do_ext4_image() { > fi > } > > -addtask ext4_image before do_build after do_populate > +addtask ext4_image before do_build after do_rootfs > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index cf819e6..ff8a370 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -70,16 +70,6 @@ do_populate() { > includedeb ${DEBDISTRONAME} \ > ${DEPLOY_DIR_DEB}/${p}_*.deb > done > - > - sudo mkdir -p ${IMAGE_ROOTFS}/deb > - > - for p in ${IMAGE_INSTALL}; do > - sudo cp ${DEPLOY_DIR_DEB}/${p}_*.deb ${IMAGE_ROOTFS}/deb > - done > - > - sudo chroot ${IMAGE_ROOTFS} /usr/bin/dpkg -i -R /deb > - > - sudo rm -rf ${IMAGE_ROOTFS}/deb The comment of what do_populate does is wrong after that. Henning > fi > } >