From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6520131612833742848 X-Received: by 10.80.144.177 with SMTP id c46mr237257eda.8.1518086456473; Thu, 08 Feb 2018 02:40:56 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.158.236 with SMTP id a99ls2122768edf.7.gmail; Thu, 08 Feb 2018 02:40:55 -0800 (PST) X-Google-Smtp-Source: AH8x226Pjl6+M1fs4L9m1YoY7vA4zpKE64Sib9jrH5vXjJ/yQQu0mfElzOitlSvy/Of+zsIYyWqa X-Received: by 10.80.202.11 with SMTP id d11mr233752edi.9.1518086455822; Thu, 08 Feb 2018 02:40:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518086455; cv=none; d=google.com; s=arc-20160816; b=ssW2kTYAaUp0fy2J5j+3I7053Yv1DFvvbr8vM98zcokCgSsaK1oAsR4CNKD/GNIhcO toq++As2a5NUlwWSJVIiYbfC9FF2HpxDddq3x6lY8DkSlqL5rspjL8lQUNQ2cAEdwCwf +f5kC5FpIx+wSWwasugQy+vlgynDyBLfx7D8CNeTBovV580kzQmyGT0wfdb09Er8jiAE gi17p5ZPkKAxsNOeJXMkyhqLAP3pb8gsDRuNk71t1TADGV2/UgUP6KuQ0RGJdp7dvug1 AQRZe6UjRpA4suGktterHIP6Su0ckH1cgqkQAF7EX4TfaCf96evq8GN9MIvSYXlvoS0e cOQQ== 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 :dkim-signature:arc-authentication-results; bh=zRqczGkhn6a3hKajk4WYNufYX4lZ3sYgmnbxLe+EMQE=; b=uEKpA0AhzQiDH929JNPAYOHuIwsuKQKrHI6R+0F+u3xP5rI4AQPaOb48jGiau3rEDn SM/9Ac+bNbtw4bXSW827t85MS4QgYMIWkfUNoRPSid6Nvemu7Ytq4+43Iy+FffRxOxbi clIHLYlBnQigQN6PnUovwHKMq3rUVgLhw8gTvcpo9EP3wfbR6Ym6VKergAO0HxervF4W K+WZGaWE0Yh8Vvacv5BEP5+1KF3+pngIoJ0tEl4HFXgUriQMTKO26bf1YW3GDDtIie8Q EdDlO9GenPIwK9fkFTwxCvhwOJbH6w98c2KnnPLDX6dpRlQ2+4/T11PP4NT36aWc3HOI SLuw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@googlemail.com header.s=20161025 header.b=AuQcokb/; spf=pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c0c::22e as permitted sender) smtp.mailfrom=benbrenson89@googlemail.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from mail-wr0-x22e.google.com (mail-wr0-x22e.google.com. [2a00:1450:400c:c0c::22e]) by gmr-mx.google.com with ESMTPS id m19si278424edd.4.2018.02.08.02.40.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 02:40:55 -0800 (PST) Received-SPF: pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c0c::22e as permitted sender) client-ip=2a00:1450:400c:c0c::22e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@googlemail.com header.s=20161025 header.b=AuQcokb/; spf=pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c0c::22e as permitted sender) smtp.mailfrom=benbrenson89@googlemail.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: by mail-wr0-x22e.google.com with SMTP id h9so4143037wre.12 for ; Thu, 08 Feb 2018 02:40:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zRqczGkhn6a3hKajk4WYNufYX4lZ3sYgmnbxLe+EMQE=; b=AuQcokb/cqMrK1Nff40dNsGDLA8AQ/AUIDv0OcX5kk7aBvcWrZkt0HsjvWhX2k33/R 3kP/Efufe0Rhzv858GZY8mFkDWv01s2peTRXM0WpCPjmkJawlIiTzMiOl7FK6bCvQU3P 7ybhPZEzo7W3PO4NXj6hHRNnwTyZCfU9T6jaDV8LJgE0NgxwNs//AymN/BwE0P0MZkbX +acwN65tZzYlsMyb5hpl4QU8Bmb3MpoRrxXzH+WbvwUKB5KCrN6/2a6Sh8r/q2Om4QLC 8pe9Zb9ypFleTFYjVUEVVz8402oDr4oROIzrquQtiHUEklubGpsBvXi2D/hQI3roA1Fu tzEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zRqczGkhn6a3hKajk4WYNufYX4lZ3sYgmnbxLe+EMQE=; b=AlBK9Qdr2zVP6g2gUMP3rb0qmklPrJXwwVhTR5JqH4yja/SMnANp4TVXNbzuQIJa7H RgHWSKAtJ67QDnzYw74qg+6KKsGZxZbB/CCPYd5QA/BnXeC4oQaIjQlwY9OC9YqJ0v+R 8eg6eMwcoXfAMPnm339P+q99JSG7wNvopr/9F7SHwa6oeh9Caor6Av28nAczQ8d2aU9i QV/aKAF/pbhoy4oV3LtrTSFqsdqaAtG3nDfUP+pWmNF9ffY3zO2oInQIlp1A7/yKxGsP fELDHGzkEm7mc7p/nnIsJWMKVniHGGp4D+Qq5nmGmZAhv9dPTbNAmAHvKvYpA2CaY4iA /mgg== X-Gm-Message-State: APf1xPDxp2gX2kziJC/HnCSrgbcEGtnU9TIIEsc+YNz73drjp9KFIhZ6 BEU50URu7wbbo0r98TbusmlsUw== X-Received: by 10.223.145.107 with SMTP id j98mr297361wrj.152.1518086455323; Thu, 08 Feb 2018 02:40:55 -0800 (PST) Return-Path: Received: from localhost.localdomain (ip-109-41-193-215.web.vodafone.de. [109.41.193.215]) by smtp.gmail.com with ESMTPSA id k74sm764689wrc.2.2018.02.08.02.40.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Feb 2018 02:40:54 -0800 (PST) From: Benedikt Niedermayr X-Google-Original-From: Benedikt Niedermayr To: isar-users@googlegroups.com Cc: Benedikt Niedermayr Subject: [PATCH v2 4/7] Added apt-cache functionality for image rootfs. Date: Thu, 8 Feb 2018 11:40:09 +0100 Message-Id: <1518086412-12567-5-git-send-email-Benedikt.Niedermayr@mixed-mode.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518086412-12567-1-git-send-email-Benedikt.Niedermayr@mixed-mode.de> References: <1518086412-12567-1-git-send-email-Benedikt.Niedermayr@mixed-mode.de> X-TUID: RQG0gRZNjFGT This patch does the same thing as the last patch does for buildchroot. Signed-off-by: Benedikt Niedermayr --- .../recipes-core/images/files/multistrap.conf.in | 8 +++---- meta-isar/recipes-core/images/isar-image-base.bb | 25 ++++++++++++++++++---- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/meta-isar/recipes-core/images/files/multistrap.conf.in b/meta-isar/recipes-core/images/files/multistrap.conf.in index 432b6af..4bbf2e9 100644 --- a/meta-isar/recipes-core/images/files/multistrap.conf.in +++ b/meta-isar/recipes-core/images/files/multistrap.conf.in @@ -6,7 +6,7 @@ noauth=true unpack=true ignorenativearch=true bootstrap=##DISTRO_MULTICONF_BOOTSTRAP## Isar -aptsources=##DISTRO_MULTICONF_APTSOURCES## +aptsources=##DISTRO_MULTICONF_APTSOURCES## Isar configscript=##CONFIG_SCRIPT## setupscript=##SETUP_SCRIPT## hookdir=##DIR_HOOKS## @@ -19,14 +19,14 @@ packages=##IMAGE_PREINSTALL## omitdebsrc=true [updates] -source=##DISTRO_APT_SOURCE## -suite=##DISTRO_SUITE##-updates +source=##DISTRO_APT_SOURCE##-updates +suite=##DISTRO_SUITE## components=##DISTRO_COMPONENTS## omitdebsrc=true [security] source=##DISTRO_APT_SOURCE_SEC## -suite=##DISTRO_SUITE##/updates +suite=##DISTRO_SUITE## components=##DISTRO_COMPONENTS## 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 e359ac3..b342018 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -16,7 +16,7 @@ SRC_URI = "file://multistrap.conf.in \ PV = "1.0" -inherit image +inherit image apt-cache DEPENDS += "${IMAGE_INSTALL}" @@ -39,27 +39,43 @@ do_rootfs() { cd ${TOPDIR} WORKDIR_REL=${@ os.path.relpath(d.getVar("WORKDIR", True))} + # 1. Replace directory of apt caches for using within chroots and + # 2. set the trusted=yes option for local unsigned cache repository. + # 3. Reduce components to main since mirror only offers that, + # see Multi-Component Publishing section of aptly doc for avoiding this fix. + cat<<-__EOF__ > $WORKDIR_REL/hooks_multistrap/completion_sources + for section in ${DISTRO_MULTICONF_APTSOURCES} isar; do + sed -i -e 's|${CACHE_DIR}|${CHROOT_CACHE_DIR}|g' \ + -e 's|\[|\[ trusted=yes |g' \ + -e 's|${DISTRO_COMPONENTS}|main|g' \ + ${IMAGE_ROOTFS}/etc/apt/sources.list.d/multistrap-\$section.list + done + __EOF__ + chmod 0755 $WORKDIR_REL/hooks_multistrap/completion_sources + # Adjust multistrap config sed -e 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|g' \ -e 's|##DISTRO_MULTICONF_BOOTSTRAP##|${DISTRO_MULTICONF_BOOTSTRAP}|g' \ -e 's|##DISTRO_MULTICONF_APTSOURCES##|${DISTRO_MULTICONF_APTSOURCES}|g' \ - -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \ - -e 's|##DISTRO_APT_SOURCE_SEC##|${DISTRO_APT_SOURCE_SEC}|g' \ + -e 's|##DISTRO_APT_SOURCE##|copy:///${CACHE_DIR}/${DISTRO}/public/${ISAR_MIRROR_PREFIX}|g' \ + -e 's|##DISTRO_APT_SOURCE_SEC##|copy:///${CACHE_DIR}/${DISTRO}/public/${ISAR_MIRROR_PREFIX}-security|g' \ -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \ -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \ -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|##DEPLOY_DIR_APT##|copy:///${CACHE_DIR}/${DISTRO}/public/isar|g' \ -e 's|##ISAR_DISTRO_SUITE##|${DEBDISTRONAME}|g' \ "${WORKDIR}/multistrap.conf.in" > "${WORKDIR}/multistrap.conf" [ ! -d ${IMAGE_ROOTFS}/proc ] && sudo install -d -o 0 -g 0 -m 555 ${IMAGE_ROOTFS}/proc sudo mount -t proc none ${IMAGE_ROOTFS}/proc + sudo mount --bind ${TOPDIR}/apt-cache ${IMAGE_ROOTFS}${CHROOT_CACHE_DIR} _do_rootfs_cleanup() { ret=$? sudo umount ${IMAGE_ROOTFS}/proc 2>/dev/null || true + sudo umount ${IMAGE_ROOTFS}${CHROOT_CACHE_DIR} 2>/dev/null || true (exit $ret) || bb_exit_handler } trap '_do_rootfs_cleanup' EXIT @@ -74,3 +90,4 @@ do_rootfs() { sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}" _do_rootfs_cleanup } +do_rootfs[dirs] += "${IMAGE_ROOTFS}${CHROOT_CACHE_DIR}" \ No newline at end of file -- 2.7.4