From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6635832943372664832 X-Received: by 2002:a7b:c188:: with SMTP id y8mr1449261wmi.19.1545025255825; Sun, 16 Dec 2018 21:40:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:5846:: with SMTP id m67ls2533930wmb.8.canary-gmail; Sun, 16 Dec 2018 21:40:55 -0800 (PST) X-Google-Smtp-Source: AFSGD/Wr8VM+dsAh0cGq9lQVk6Ic8DdEIZUJhuq+qkK01xir+7Vym+LWu+majqTk2L+ceOoiFLx5 X-Received: by 2002:a1c:208c:: with SMTP id g134mr1341153wmg.23.1545025255328; Sun, 16 Dec 2018 21:40:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545025255; cv=none; d=google.com; s=arc-20160816; b=goZTq4M5X4O5VBUFnA95OI3+K+v4JbGKEnsrbhpsYvVKXyJa/HSIROoMMBNc7dfIVP OuvR7z7KeEYbKay58WukVaVGUfXaKF/vqDIPqwlHWqO6gQMS/r12oyxaFridhPremOJH nFCTLhG7XBsa8So0DcJyf0cqUsH0TWCWsfz5gmsRdouRMPaPZjUKJy2e9NpSjWZ5c1jP RV+n3Dr7AwRTR5HACyZbhvjwU90bUuz6oeval+hM0CbhRKBUU4hoRQIXhQ7o0Z+Vyg0f wAD4k7/I3l8Dih7YQZGzzm6hLZONJSAP1IBdcKvjb3eWlJOJgShaxx124tEff2M1BKnj DnHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from; bh=8vAHrs3epRNJ4NvmmXnJDy6GQRLytgAVvmPPUzcm5Hc=; b=adCdInl5juH/ophvKcPFa+HcsV9fcQjyuwMI8zr4N+GmGszu13H9xcgyPm0Yixjxhn E0uXbomWnXXHeumKfw4tvi6ujNufBTjzpPu1h3RGSggLN96dEsNhJWY6ILg+WooujWtu khbR1YYxnCWnHbmKSpo6N7RR24+qyIK417UaESchvsr7qCET8vzFy0Zy2B7H9+9HlG15 ++5Vl9gdsDov04zym/xlWD0A+ApWtwftjNcHLP+ACmLmCv2Tpze20RhztOpq24KgfOLE /81rWmUjqAUQ89GSRbYY0+20NtYtuh7kPO7lqrlJV5X9tZGbjvifo+SjOYar5k9jZnJ6 Lsjg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id x188si822975wmb.3.2018.12.16.21.40.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Dec 2018 21:40:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mosipov@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 mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id wBH5eZWd003315 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Mon, 17 Dec 2018 06:40:54 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 1/2] isar-bootstrap: Keep the initial APT sources list Date: Mon, 17 Dec 2018 06:40:33 +0100 Message-Id: <20181217054034.12236-1-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 X-TUID: OKBE3d9JAAem Keep the initial copy of APT sources list passed via DISTRO_APT_SOURCES as the contents of APTSRCS get modified during isar-bootstrap. Signed-off-by: Maxim Yu. Osipov --- meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb | 2 ++ meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb | 2 ++ meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 3 +++ 3 files changed, 7 insertions(+) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb index 19b60dc..7b83f80 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb @@ -34,8 +34,10 @@ python do_apt_config_prepare() { aggregate_files(d, apt_preferences_list, apt_preferences_out) apt_sources_out = d.getVar("APTSRCS", True) + apt_sources_init_out = d.getVar("APTSRCS_INIT", True) apt_sources_list = (d.getVar("HOST_DISTRO_APT_SOURCES", True) or "").split() + aggregate_files(d, apt_sources_list, apt_sources_init_out) aggregate_aptsources_list(d, apt_sources_list, apt_sources_out) } addtask apt_config_prepare before do_bootstrap after do_unpack diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb index 3631506..c264123 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb @@ -33,8 +33,10 @@ python do_apt_config_prepare() { aggregate_files(d, apt_preferences_list, apt_preferences_out) apt_sources_out = d.getVar("APTSRCS", True) + apt_sources_init_out = d.getVar("APTSRCS_INIT", True) apt_sources_list = (d.getVar("DISTRO_APT_SOURCES", True) or "").split() + aggregate_files(d, apt_sources_list, apt_sources_init_out) aggregate_aptsources_list(d, apt_sources_list, apt_sources_out) } addtask apt_config_prepare before do_bootstrap after do_unpack diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 811d50e..f411ad1 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -20,6 +20,7 @@ DEBOOTSTRAP ?= "qemu-debootstrap" ROOTFSDIR = "${WORKDIR}/rootfs" APTPREFS = "${WORKDIR}/apt-preferences" APTSRCS = "${WORKDIR}/apt-sources" +APTSRCS_INIT = "${WORKDIR}/apt-sources-init" BASEAPTSRCS = "${WORKDIR}/base-apt-sources" APTKEYFILES = "" APTKEYRING = "${WORKDIR}/apt-keyring.gpg" @@ -222,6 +223,8 @@ isar_bootstrap() { install -v -m644 "${APTSRCS}" \ "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" fi + install -v -m644 "${APTSRCS_INIT}" \ + "${ROOTFSDIR}/etc/apt/sources-list" rm -f "${ROOTFSDIR}/etc/apt/sources.list" mkdir -p "${ROOTFSDIR}/etc/apt/apt.conf.d" install -v -m644 "${WORKDIR}/isar-apt.conf" \ -- 2.11.0