From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6520131612833742848 X-Received: by 10.28.192.26 with SMTP id q26mr67465wmf.29.1518086457879; Thu, 08 Feb 2018 02:40:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.129.228 with SMTP id 91ls1267452wra.6.gmail; Thu, 08 Feb 2018 02:40:57 -0800 (PST) X-Google-Smtp-Source: AH8x224DaquKImsdqestK29RT/8dgqN/zBxx9OsBrMTtFoD6PSrbC5GOIffB/eSHtfx1rwLBSEki X-Received: by 10.223.164.28 with SMTP id d28mr26655wra.8.1518086457257; Thu, 08 Feb 2018 02:40:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518086457; cv=none; d=google.com; s=arc-20160816; b=kjCmzqwZhCDJ2OSrm52Z6Tn1r26W3UrKUYew96F1aGzY8nLiygQSY5VrKnW75cfgii ofQdjaCyuLygGnak5hV/MABlcktoW6IxQq09NBc0Wh3jPDypXgnXJ1ESIUP6xrZzxKP5 iERtcCJXaAevMgP+h92qzr7if/e1sM7T8ab288zfS85shZUwPSOl743s1afBtTWnWSHi Kyh9+x3C02Nkyh1tq0r9Ab/Cq2+skUL+r4x8rH6+cklvYH2z1HW9G+3EZmQWThokW0yQ G8e+Rrf7L3LVJ5W8DfZwHoz1O+SvVX5B3J4ToEvM2sVgLetWPoqLpNhF1TZsMGI7CgvM XX5Q== 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=C0D13rA5nB2HX/iY7EmgQqBYiC87cQ7GBI7d2T9sTac=; b=Ttkkcp0SNAdASO+6OD7HB9XkGp7cDb5szMgn71SQanbHQpER1GDFF4HFULWEKcaXB8 omkNzhpu4bWt2JRFuclXT4gyY5hcD+z+9zJGfmuI9rCRtD8mxHP2MDMCAZJMKGP3cxfs inuk8BGNWAq8prlpk6nrfHW5l/+7qC6wMvK00hrzdgZQO6tGfgPlgVHKDMzWNpXXPjD8 xZ6ao8N2xyIATi+DuH8zUBr0FFO7sp9T9zx3mq+fYiQiMMzDdLpLfTkS3FklWKLQvmPa jeD+lCovG4jdOTTKQLN8REPXpVQrJHQKaS+AZv1pcQ8fTLaHrXgyaxM324dFnIhAMi0Y ha9w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@googlemail.com header.s=20161025 header.b=BqeUe86L; spf=pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c0c::22c 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-x22c.google.com (mail-wr0-x22c.google.com. [2a00:1450:400c:c0c::22c]) by gmr-mx.google.com with ESMTPS id v8si203202wrg.2.2018.02.08.02.40.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 02:40:57 -0800 (PST) Received-SPF: pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c0c::22c as permitted sender) client-ip=2a00:1450:400c:c0c::22c; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@googlemail.com header.s=20161025 header.b=BqeUe86L; spf=pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c0c::22c as permitted sender) smtp.mailfrom=benbrenson89@googlemail.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: by mail-wr0-x22c.google.com with SMTP id 111so1277554wrb.13 for ; Thu, 08 Feb 2018 02:40:57 -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=C0D13rA5nB2HX/iY7EmgQqBYiC87cQ7GBI7d2T9sTac=; b=BqeUe86L9tRYe4hBK/tysY7QvVmVtQtD2zHZX5nqyyy1Z7dKBCiQI/JM48AoO2rE/h uoif8RNx5Ozotc9QVMpQSLoJsfdrUD7NZ7FXRZXXU9d7Iy7Wm6aPeRb4szqmShPRCKY4 fHxikn500J4ULqMdMoshv+pweyQgoQmZFlFo12ca3SIR1oScPjz6juqF7l7pMjEH1W1f Oprm8ShSPVR5G5v9gWH4SdJ/1DVTO9e6/DXkiglNlHEh0l345xZZKUb1oIL05vRXUZ4s BllsJtuxPSO5K23lwgiBwdUSm9DZ9NEY5MTKE1vP6hPo4jv3Mz88uGlbz3bYsvk5xhiL YJ3A== 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=C0D13rA5nB2HX/iY7EmgQqBYiC87cQ7GBI7d2T9sTac=; b=Wtj3Mu1N+v7CXnit87gqoh4vJewRshdivE+dns6TSwPpj8vzg3Csmhjyl8DHfzBlE+ 4hSA1BgXD4DVZF4/Hl1+lDuIF1GwHjWq7yiO1D16tQYKVHeWwX0vO0/M3cCfTfhHQ0HP PCwdEticLtS08MTQ3Pr124qt52997CIxpxZtxQIQuB+dErhA3h8UqI4RV0yETeZgU+cK BMFgNl50W0HI5uHs2TMwK9tF2wQuLfqWhQCB6fIujU524qDfdJj54YAxfni7yyThAb3J muvFQFAXbgp1lSEvS272GwMkQS5Ib6SYagod2ZE/0Sk6kNcN0uBuo2A5GZH+gQW1qLAK RsPQ== X-Gm-Message-State: APf1xPC9ZaW42dSPEovqiK8Dm2gVqk9nbVkdiW/pHi+K8z4GoYR4ox1T hejv8FvQexa7tGgxP02OGqLeuA== X-Received: by 10.223.168.49 with SMTP id l46mr297535wrc.29.1518086456780; Thu, 08 Feb 2018 02:40:56 -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.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Feb 2018 02:40:56 -0800 (PST) From: Benedikt Niedermayr X-Google-Original-From: Benedikt Niedermayr To: isar-users@googlegroups.com Cc: Benedikt Niedermayr Subject: [PATCH v2 5/7] Added do_finalize_image task. Date: Thu, 8 Feb 2018 11:40:10 +0100 Message-Id: <1518086412-12567-6-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: A18B5SxUyxlx This taks does two things: - Create a snapshot for the current Isar repository after build has finished. - Add remote repositories to apt source files. Those files where not created, since multistrap only pulls packages from local mirrors. Todos: - multistrap-*.list files are hardcoded. This should be fixed in future, since different distributions refer to different repositories. Signed-off-by: Benedikt Niedermayr --- meta/classes/image.bbclass | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index cbd74b3..e1c7dd5 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -4,6 +4,7 @@ IMAGE_INSTALL ?= "" IMAGE_TYPE ?= "ext4-img" IMAGE_ROOTFS = "${WORKDIR}/rootfs" +CACHE_STAGING_DIR = "${DEPLOY_DIR_APT}/${DISTRO}/staging" def get_image_name(d, name_link): S = d.getVar("IMAGE_ROOTFS", True) @@ -16,7 +17,7 @@ def get_image_name(d, name_link): KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')}" INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')}" -inherit ${IMAGE_TYPE} +inherit ${IMAGE_TYPE} apt-cache do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" @@ -42,3 +43,23 @@ do_copy_boot_files() { addtask copy_boot_files before do_build after do_rootfs do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" do_copy_boot_files[stamp-extra-info] = "${DISTRO}-${MACHINE}" + + +do_finalize_image() { + sudo rm -f ${IMAGE_ROOTFS}/etc/apt/sources.list.d/multistrap-*.list + + sudo sh -c 'echo "deb ${DISTRO_APT_SOURCE} ${DISTRO_SUITE} ${DISTRO_COMPONENTS}" > \ + ${IMAGE_ROOTFS}/etc/apt/sources.list.d/multistrap-base.list' + sudo sh -c 'echo "deb ${DISTRO_APT_SOURCE} ${DISTRO_SUITE}-updates ${DISTRO_COMPONENTS}" > \ + ${IMAGE_ROOTFS}/etc/apt/sources.list.d/multistrap-updates.list' + sudo sh -c 'echo "deb ${DISTRO_APT_SOURCE_SEC} ${DISTRO_SUITE}/updates ${DISTRO_COMPONENTS}" > \ + ${IMAGE_ROOTFS}/etc/apt/sources.list.d/multistrap-security.list' + + cache_create_repo_snapshot + + if [ ! -e "${ISAR_FIRST_BUILD_DONE}" ]; then + touch ${ISAR_FIRST_BUILD_DONE} + fi +} +addtask do_finalize_image before do_build after do_copy_boot_files +do_finalize_image[dirs] += "${DEPLOY_DIR_APT}/${DISTRO}/staging" -- 2.7.4