From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6519381492065370112 X-Received: by 10.28.54.200 with SMTP id y69mr163740wmh.14.1517911795897; Tue, 06 Feb 2018 02:09:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.187.9 with SMTP id r9ls1198171wrg.4.gmail; Tue, 06 Feb 2018 02:09:55 -0800 (PST) X-Google-Smtp-Source: AH8x225XX0lfetyQryNfWrSd34Fn/P4uTONv68Z7278x40+G+SnoZllhUKNrayUqYX7GYZGBw/0h X-Received: by 10.223.186.201 with SMTP id w9mr186185wrg.14.1517911795463; Tue, 06 Feb 2018 02:09:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517911795; cv=none; d=google.com; s=arc-20160816; b=sx3hrWKP64CutwurIxeN1UgiwlyE0bsoiBALOyye1jadnCGSNSLKp50QJrzuGnHEar voW88zLxIGjV2vocY7FGfGKzYv7YOCSDKQxacGAPxKLSoTSTLWWRtsWooYWJ3Rwl1Muq YiQHq3L9ZkUG+a9OlUoPWy25h2z5cJ0OLJELGf33xEevz2z+FnAu6z/mN/z4HyE6/JqG Pe3jpvNBsrEGidmXXOcrfRdA78wgZH5iOaUXX8Uvy/WmbfeAWtI59O6mmcmV2YRkZmaU YeG5LUEe/egYDEjhBCFzMI7nVBhR431aUTPMPt+4wPuvDIyS+t1ktuorS6IHfn+6QrbF qiGA== 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=PMJIec4cOgXDQHZiq3309IxuS9rIgLkMAxaRgG1P6gY=; b=c/oz4Mo6UPJtiz1Epiu8EVgOTx7LwiXioPvrdVvm1aeNqToW0/TEGhvO1ocgwoj3Oq 2E+fm/nHyBmzDbbLSPk3UDM98497VA2dGwPiyph6aiKv9csap6gNG7JJD46ChDZzjOld k+aQaF6Wl+iXaOftBqkYuNYOeTU5sXGXV+TDv0GGAV/Wc7aCCVbU0iNQolvDR6Rs4PmM dR5FGnmecluNpK77wFbYQ8xDLpRiWZloqZbw9grOfY5RkXibVE7QkZS4QD0jUd3ryGhp KbfQZZrjz5Zc1YgrWZLS71zrGYvgd2ixrZ0b/Izhd5EZyWlLqlobrGTgmSPaEXB1ZcP4 z7Ng== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@googlemail.com header.s=20161025 header.b=AtCQ3n7m; spf=pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c09::236 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-wm0-x236.google.com (mail-wm0-x236.google.com. [2a00:1450:400c:c09::236]) by gmr-mx.google.com with ESMTPS id g70si784828wmc.3.2018.02.06.02.09.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Feb 2018 02:09:55 -0800 (PST) Received-SPF: pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c09::236 as permitted sender) client-ip=2a00:1450:400c:c09::236; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@googlemail.com header.s=20161025 header.b=AtCQ3n7m; spf=pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c09::236 as permitted sender) smtp.mailfrom=benbrenson89@googlemail.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: by mail-wm0-x236.google.com with SMTP id v123so2654061wmd.5 for ; Tue, 06 Feb 2018 02:09: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=PMJIec4cOgXDQHZiq3309IxuS9rIgLkMAxaRgG1P6gY=; b=AtCQ3n7mc4Vvt3l03FHVkMhEgSq1seVn3aR9/V3CYPmLLxuDpqUpIzRfbdxHACg3T4 Yq9/r2J/qLw65zsJSzZZzhy3VoUhEkIaRjXzB0E96pI5d39SwTYTEIJ5HIJAMs4C9A+R y/+3yqwaoMK6i9cYJk4aeSnvAYKVjtaO0dtw4ebRsaHsVXU6hAIoGbOWstwyfUczgkWi o1AN+67I3lOLRsCLyI6F6kj7Ds+J3cR3u8ZFQVtkKjaTZgsDor6nw/xmWaSU3iA+9ll4 KF9IoWMC7CuRwHM05VvWXWJlyMeB2Qlx4cnYD0DDp7i+sqsS50hAeRR+diLej/W7Jl8J xXyQ== 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=PMJIec4cOgXDQHZiq3309IxuS9rIgLkMAxaRgG1P6gY=; b=OafsZ+s8KQvr9wpvYmN6VPrt/SHgS8DUkptedc+yesSta+nwlpX0yxLtTWf7k9a7Xw 1KZCCuTT3lBEj/2l+Xz2CgEj3WkCjOPDocW4j5SMJD/t0IV4xhAuWPeYrISgfcR3CCcX eG03UEJYfG6apRDjPH7hnfgP5APZIHyXbtjh/UKnFdjBOWn3/wOCvrgROzBwTIUXZ6X1 UKtX4VJMZECXz3kkLxeOO79OeMaVsxlarO68vGvTPuULvbhJc4CbaloaV3MmGMAP2jiz GhkPzE7QrNK9GsA+Q+5VHyf1zmPRV9f/hWC19/tSOS9AROge+A5sQRMiEjd0iTyqGlz8 kqmA== X-Gm-Message-State: APf1xPAPk1PB+ABK4buUePEmt4VG1I55wmErI9/eYIqFo43MrGhg3Jbs 9t/xb3/ljU0eKCWvDa9kxR1EDQ== X-Received: by 10.28.5.145 with SMTP id 139mr1235848wmf.89.1517911794839; Tue, 06 Feb 2018 02:09:54 -0800 (PST) Return-Path: Received: from localhost.localdomain (ip-109-41-195-133.web.vodafone.de. [109.41.195.133]) by smtp.gmail.com with ESMTPSA id r5sm13466342wmg.30.2018.02.06.02.09.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Feb 2018 02:09:54 -0800 (PST) From: Benedikt Niedermayr X-Google-Original-From: Benedikt Niedermayr To: isar-users@googlegroups.com Cc: Benedikt Niedermayr Subject: [PATCH 4/6] Added apt-cache functionality for image rootfs. Date: Tue, 6 Feb 2018 11:09:37 +0100 Message-Id: <1517911779-30507-5-git-send-email-Benedikt.Niedermayr@mixed-mode.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517911779-30507-1-git-send-email-Benedikt.Niedermayr@mixed-mode.de> References: <1517911779-30507-1-git-send-email-Benedikt.Niedermayr@mixed-mode.de> X-TUID: Mx72yFt1GG4g 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 | 22 ++++++++++++++++++---- 2 files changed, 22 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..bc90e95 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,40 @@ do_rootfs() { cd ${TOPDIR} WORKDIR_REL=${@ os.path.relpath(d.getVar("WORKDIR", True))} + # Replace directory of apt caches for using within chroots and + # set the trusted=yes option for local unsigned cache repository. + cat<<-__EOF__ > $WORKDIR_REL/hooks_multistrap/completion_sources + for section in ${DISTRO_MULTICONF_APTSOURCES} isar; do + sed -i -e 's|${TOPDIR}/apt-cache|${CHROOT_CACHE_DIR}|g' \ + -e 's|\[|\[ trusted=yes |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:///${TOPDIR}/apt-cache/${DISTRO}/public/${ISAR_MIRROR_PREFIX}|g' \ + -e 's|##DISTRO_APT_SOURCE_SEC##|copy:///${TOPDIR}/apt-cache/${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:///${TOPDIR}/apt-cache/${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 +87,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