From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6519381492065370112 X-Received: by 10.223.196.13 with SMTP id v13mr185480wrf.22.1517911797088; Tue, 06 Feb 2018 02:09:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.169.243 with SMTP id b106ls1859281wrd.13.gmail; Tue, 06 Feb 2018 02:09:56 -0800 (PST) X-Google-Smtp-Source: AH8x226wxpeBwZj1VhsVI+gk1Wic41NEZQpxjsaNmY+TGyWaOQAzk3aHr8emcZlqDWdRYULxrEnr X-Received: by 10.223.190.15 with SMTP id n15mr169439wrh.17.1517911796710; Tue, 06 Feb 2018 02:09:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517911796; cv=none; d=google.com; s=arc-20160816; b=gVv+cp7ERGyVsrTxkoBimBMKETkpnDa2z0pwZRzA1zgtq/D67ePMAZm+OrHZWLajzV sHokzhD2TfD9x1m+zAgY6/wWwAfQTajzzIDit1THMQMIGscv9UkSbVqdU/ixF7tyGGD4 zLJJYZybHUdREuClEIfgFbGJtxJ063DnPXTVkTNbpkj2UTMhxgZVyH7PFJYHGFZlaz35 Tv/BuGIN2g2WPPsuANI8pj7+htWxfJt7wr71mq57Jur/i844RESs07cGsHv69p4Ugojp 1BYUL5tegGRlJt8yNPVD439NBP1Jp4YSRshAN37twC3ViDjMOh1R2arjyBBsr3mwL2dZ NrKg== 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=k+ZZX4G0dVZ7NMxn4iSjWIzFfxiq7sl+GaliUxJ0dzoDVwaVqC3YmzNP8g/8WI8aiQ Fe1vtp6wnRbce8+fwFRZG5lphyN+yb6EkFBTs66USNofhfDl8aFW6UF0KyLr40D4YAlP +AIVqd2DPe6z+wIV+q5SJ4GbE/MsyRmgllRiaU/+DQtPT3VEFW8PyuCcuRAKF6+3VYv6 dTZpvgu658NycchWSexzS5TB5dGHGzlmO49AUH6DMmS3nXccxRJID3HU9XtgExGNpgFs lsI7K3zjqYHaEG7XGbttV7sdppWTz20gNTOTlESg6E4GfjOWaVmBIP+juZ6DjrSQZxlZ cZvg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@googlemail.com header.s=20161025 header.b=E29Okig7; 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 m23si96483wrb.4.2018.02.06.02.09.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Feb 2018 02:09:56 -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=E29Okig7; 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 w50so1260048wrc.2 for ; Tue, 06 Feb 2018 02:09:56 -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=E29Okig7+U5XG/czb57swu7Q/cOspEtLtIBhX89lAQM0RyELmz8M+O8W6Ye5CA4KPp 8DOLutCQXgyJORrn07E73QOmC6Ddpx+LV9zvQjafKwViR9akGj4+o+YQ5JlnWwj8vdCn JeHFvHyyKuK5aGdpXr/wsXilRlzVXbOexHQOSezhPq/Ce420D+H5bvKNV513l+OWVr/g ygSGuIYtM3zVcjPpRoHNBOgtY5kmRP0O14U/KtqsXWNPzV7kZZ3WRqLei5nhOPYJdUrB tyfbPsbpTUWfwjBkULcbhZt8ieeFZHH5VHWWcy87ZCgX8/uFWo6iNtx2IGo3Z1cBf0Hd E8cA== 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=mPxxvh+CKcFP+Oih8wpptea866UkBYGv0SuBOb0PdbVBUg8baza0qZcIwxgKcduK66 IYZIzAiTpwTdzKCsDZ3ANvYpLjRdhMLwhkLgVgzK2Ue0xTTICyTCIOOR+yIUnaEFC2S+ nENiAIfRfLge+C/YoZ8vdP/X6J8eQJz/TNY+UUWMiFKEQaXc/AzZ75dfods3o3RVHnFP 5V6vc/LAhjldBnjOzt74+cZ4AJNokjyqQcaIHpMzBh/o9MVWecKFqHlHmfwOW1Ost1TW 8rzynIfm5rQlEc440Qq9RL01r/94R6BGd9USmAEGZkVsTVAOccbTXwau2x7TxVoonQLh 5GTw== X-Gm-Message-State: APf1xPBHNlZYeyf9mOYLPK5/SVbMj7a6EYYEZqqacvNe+PsVgPry5g7l gIM7d74l9bjMe47xP1JrVxZxpQ== X-Received: by 10.223.177.193 with SMTP id r1mr1798592wra.232.1517911796282; Tue, 06 Feb 2018 02:09:56 -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.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Feb 2018 02:09:55 -0800 (PST) From: Benedikt Niedermayr X-Google-Original-From: Benedikt Niedermayr To: isar-users@googlegroups.com Cc: Benedikt Niedermayr Subject: [PATCH 5/6] Added do_finalize_image task. Date: Tue, 6 Feb 2018 11:09:38 +0100 Message-Id: <1517911779-30507-6-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: xy3k77bqWpUW 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