From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6467463440282681344 X-Received: by 10.223.133.244 with SMTP id 49mr1624168wru.22.1506959158391; Mon, 02 Oct 2017 08:45:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.93.130 with SMTP id r124ls2112040wmb.12.gmail; Mon, 02 Oct 2017 08:45:57 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDDQ7vFk3kqpwCxkMb3KcN+JKfZO3hgUCPDcn+AUKApk4JceGSYr6jRJgQVkaiBRtsxT4ai X-Received: by 10.28.31.148 with SMTP id f142mr580886wmf.4.1506959157924; Mon, 02 Oct 2017 08:45:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506959157; cv=none; d=google.com; s=arc-20160816; b=G+qZfn+rqTOh4He7wKpu4uQKL/puIROKMqn83HJaTa1Rtf2MuM6UzvETcxrIq0E0Po 5ZMacz9Nb8K1vDZLlHv/k7Ym0AwK9EctPvO+GC48AV+KuXTsThXq51VaHT5Z0VHPrAfW 2/p21nYCYM6JGNWG+L/CdfAH1iUmwFpoqg4Iq/6Ocz73u8yR9G9C4GFIr5rHs3Z+5dZt EnPDaHt4NPTGaR5i0uY9GhBfBvGz5Qa+g6gnSR3iPcOTBMIusym6MsYqkis0iCoJicug Y3ejgpGz1uTi2EuFNcBQ60VdYblczjts9lj7fwb2+EVQRwbcNnu4z01QZBH0ezuwZzVF Lj0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=PELT9ID84lMXP+9T4L/hWFb7ipMreKtXLFpZmKGYZtw=; b=Ka784CAvuA98PsKKnnz/Lor2hxxij47HPvX2pkm69gnEvr+spsP39kDWeV6DtHaOH3 M74g8UWcWy/I9LLdmxdGDtGeEG1BbAgFMYFSqGwoZVIZsgY9V4wuA/i3rQPiG0EOKohl BC/4Htkm9BDopvIKXEzaa209m9XBGoGnapgdvZyqbJMQS4XzLNKvTq6ZbL8hTinfEPq0 v4Vu2J7RDj31wrQ9Iv4Zv0rRnBwPy3N0Jq1OQduQrUXNNhMDg8U1vx8zQbAyEWPlvzSR hAN574HFW0lpqBKw/J11WyD4v0QbfsFTTJTdmmONndPlnTaoy3+WmZTOexac+LlXSDYI SKSg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id d82si1099418wmd.1.2017.10.02.08.45.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Oct 2017 08:45:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from localhost.localdomain ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id v92Fjc8D020957 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 2 Oct 2017 17:45:47 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH 4/4] meta-isar-bin: Install packages via multistrap Date: Mon, 2 Oct 2017 18:45:31 +0300 Message-Id: <20171002154531.4930-5-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20171002154531.4930-1-asmirnov@ilbers.de> References: <20171002154531.4930-1-asmirnov@ilbers.de> X-TUID: QDJY8SvhRaJq 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 fi } -- 2.1.4