From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6473366578589073408 X-Received: by 10.28.15.72 with SMTP id 69mr239444wmp.3.1508426674782; Thu, 19 Oct 2017 08:24:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.45.4 with SMTP id t4ls1472933wmt.7.canary-gmail; Thu, 19 Oct 2017 08:24:34 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Q5AGuij4gw9dW7KyPi5okCnXyy7Z3S/XsZzvDZwhxc2DxTPoPZ2MMYEULSb+bvkya6ht4H X-Received: by 10.223.163.215 with SMTP id m23mr227692wrb.25.1508426674134; Thu, 19 Oct 2017 08:24:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508426674; cv=none; d=google.com; s=arc-20160816; b=fNvWvLtMssX5ifFqmaprqm9OSTWXzp8WHC9hJ2jXtoWLImM/14QPcH39mfNjMho/2K /5M9F5ZCKarw9hteELwELaaauSa0LYpnIfHERNeFqynj1zh7Eyq5swMBA4r+JbLk+gFv 8LZEpycyMrxMpyoRKz4apH87dmadwU+QvrgOhAbRdtwqrnuisxmuQDie3WhkfGeRkLKE 7938eeNng1XRg10988UOsduW9RjImn1IVP1tZdjW90GeurRIrTuHWVec/Pf9bdj3J0H9 S93jILrZjB/yUqKbaXVLkDN9KbyljBEfsQ3GDjuoy+60lXsIfYB0PYbshBP0bHy6jNSU WNFQ== 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=YM5LiUxK2uwgYh9pyoZetbZKCzmAw3AHpLlaHXonOv0=; b=jeBJESGW5hFKeq16j9DwuhM3az91NUy4ozw4c+H1luLrBqcylVaw2pqO/rXgzGTYcV lKsYuzY6Hk9oo1mRjsy2Xxo920iBYqiJvlu4W1GKItZtRXi7YQg+lM6JJRsF3Gv2gKn2 ccrjYmCg9PjfaWEm7joUlPLGhrdjSnTWrpYH36S4Cs5q4DWyAMGKID7kR7R0RDFS+gCj Zzw3m7+N5Vh3oWs+FL4IlnhtuNJin1OGUriycW4IZKsbU6IxLUu8MvJDAL76a98XLnRL vLJILmqMHlLxpPqVFa0Z5ZICrFutPgLVdsDFgk2ft/UTElAbG8GSG3l1uer5YZzn6Jt3 UiZw== 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 m62si342912wmi.1.2017.10.19.08.24.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Oct 2017 08:24:34 -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 v9JFOJo2026009 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 19 Oct 2017 17:24:24 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH 4/4 v6] apt: Install packages via multistrap Date: Thu, 19 Oct 2017 18:24:12 +0300 Message-Id: <20171019152412.13929-1-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20171005100807.3369-5-asmirnov@ilbers.de> References: <20171005100807.3369-5-asmirnov@ilbers.de> X-TUID: GYwLdGrb0Djt 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 | 13 ++----------- 4 files changed, 15 insertions(+), 14 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..491e5a2 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_APT## +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..c9e504e 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_APT##|copy:///${DEPLOY_DIR_APT}/${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 4d3e0a6..82877f4 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -61,7 +61,7 @@ addtask cache_config before do_fetch do_populate[stamp-extra-info] = "${DISTRO}-${MACHINE}" -# Install Debian packages, that were built from sources +# Populate Isar apt repository by newly built packages do_populate() { if [ -n "${IMAGE_INSTALL}" ]; then for p in ${IMAGE_INSTALL}; do @@ -71,17 +71,8 @@ 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 } -addtask populate before do_build +addtask populate before do_build after do_unpack do_populate[deptask] = "do_deploy_deb" -- 2.1.4