From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6467463440282681344 X-Received: by 10.28.16.8 with SMTP id 8mr95935wmq.31.1505823678544; Tue, 19 Sep 2017 05:21:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.134.79 with SMTP id i76ls1099791wmd.25.canary-gmail; Tue, 19 Sep 2017 05:21:18 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCzXB4jEQH3fY2KS6i7Ixec1t5nPuCvLGq1JyXLRk9N8vt6kXq6k0sZdNrWOYhAm0ka03dt X-Received: by 10.28.154.68 with SMTP id c65mr96380wme.5.1505823678284; Tue, 19 Sep 2017 05:21:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505823678; cv=none; d=google.com; s=arc-20160816; b=hy93O317amY/O886O5kBFNzeMTa6HhYe3mYnBQrbYvmbPRsiwFrF4qI7+ba4VPfoZE wY6x3Cgipvbt6RyXgBEO+nSUwbhvUGD2uNt9X4xUdPhBzG/m0yPEjKz0kEUY2YU9kwHg rzspC6StIDyGEKmTkUGaxFFKAa7+qT5/1AJ+NljZFC8USjdi2uTjakwKL1F5xbBi+REG njVyXDxL0C9soQpiD9to6l5q5G+DIhamF309D7yZ4tmBu82D3ZR6EsRVQmPLHDSDjqlr iFD75pBoUZL6xZN4ql5TQdD2T10tL3jukPftSJJvYAwMpbm0KL88KERmaPs241I1xR75 MPKQ== 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=T/AM29SWK/35tpBc5cO/yOWGIi4qcaTQF4pQngZIV6w=; b=FhkcnRJpfigAwe+RZJ6gsi0+JGtv1hXscSIM4Rzp83t/valH5ESANLNE15NIFgJuMk vx5Jt9ycIozs7wZczWy53meU//sTGSmNnMPxAZ/hrn9LGKBu+XPIFtyZeISfu2OdUMOr pXyZebReLhPX2QvjycdO+GEy6GGGex9nymVwBOFfK+41hXCpWKUnheM5lCgU/Owb/p17 Z4fFOeXPsenRLHsTah+KPyAp4aBBaxwJIqbjFeM8RQ1gk9GzpuZ/TaQgC1TtVE7feAe8 EvPtPhql6Nm8Ctg0SY+FOsBHA2MzQWOx7N8fYndsCub0sX1K9P4iO312id20QuidvDvE v7Dg== 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 l133si128810wmb.3.2017.09.19.05.21.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Sep 2017 05:21:18 -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 v8JCKxnI010376 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 19 Sep 2017 14:21:09 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH v2 4/4] meta-isar-bin: Install packages via multistrap Date: Tue, 19 Sep 2017 15:20:52 +0300 Message-Id: <20170919122052.28688-5-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170919122052.28688-1-asmirnov@ilbers.de> References: <20170919122052.28688-1-asmirnov@ilbers.de> X-TUID: SObrSNu9M5/y 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 5cb8b1c..092abb2 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -43,6 +43,9 @@ do_rootfs() { -e 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/configscript.sh|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 # Create root filesystem @@ -54,4 +57,4 @@ do_rootfs() { sudo rm ${IMAGE_ROOTFS}/configscript.sh } -addtask rootfs before do_populate +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 d59959b..410f30f 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -62,16 +62,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