From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6607733288662466560 X-Received: by 2002:a2e:9006:: with SMTP id h6-v6mr1075112ljg.22.1541158861376; Fri, 02 Nov 2018 04:41:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:d201:: with SMTP id j1-v6ls1439437lfg.18.gmail; Fri, 02 Nov 2018 04:41:00 -0700 (PDT) X-Google-Smtp-Source: AJdET5c2m607esvalyKj8bXqTWkZjDUwXm4YNQnHzJDIx/QkkAW+wb7KwGbhqtFf9fts2wokTG1F X-Received: by 2002:a19:1aca:: with SMTP id a193mr963144lfa.6.1541158860857; Fri, 02 Nov 2018 04:41:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541158860; cv=none; d=google.com; s=arc-20160816; b=gxQIRdJogoan61vM50RT7xJ9UFxruHtocXHl+MrApkG/uDP3UUofzEYnookI9+3c63 luDC0lKlJoVBNfWSigJZrEnivZCFeO4TijjMXjUThNmRFLJe6R4rM6JCz3LDyypBPvp3 qDSjND8paSQkiO85fb+m2TzH8Mzu0DQABK5YMOJFdx+sPvJ+beF6ppZl+zdCIhxsAHqo n66G8/wQ28EjLOy4vdZA1yCSTwEz1Dh/05Poj6pQ3KMpY3dkCgciZCYhWnj6Bbxuezm9 AwIxPuBQ1HuLzId1rCtXvixDAE6mNKDBwgDQBWtvpiSRJHcqU2SUSdH9c4zByY6K1DE0 5TbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=IwCZ/suvUvAnmqH4IwvK1jJLD/pzy1q0GDDPHPgPUd8=; b=tLiK8My+hHb6MG/4Knm5T0MTohYgrJp3SmPNyk4lYMyoL2A2+derw1BszGGzsTXtIW 8diq7t3NtfBlmL+YSZbB0zL2T81rW9fqsxa5Q4ThgQb+UsS+hmQ96qfitJZL+bPFJVyQ 52Q50rjlJ/fLW9t5vXePmwDDldlN45bbt9Vy8zOlxclH0Qto19K55OllCwQ7L8v26/qO ZSyxm7GorXIKw2UaYdM8qmaFtxkmBUxPuacvM56GAggBc2Lm9pASA7xvpATCJVYujsr7 t9kznbeXmEEz8czY5+F54t9sBIPdO9ke+obptnBXMTasUXumK0cmulRGIx0UDK9HalE9 pkjQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id 73-v6si874720ljc.5.2018.11.02.04.41.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 04:41:00 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id wA2BexGi001828 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 2 Nov 2018 12:40:59 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.68.199]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wA2Bexb1030266; Fri, 2 Nov 2018 12:40:59 +0100 Date: Fri, 2 Nov 2018 12:40:59 +0100 From: Henning Schild To: "Maxim Yu. Osipov" Cc: Subject: Re: [PATCH 5/9] isar-bootstrap: Make possible to reuse the cache Message-ID: <20181102124059.6be60d26@md1za8fc.ad001.siemens.net> In-Reply-To: <20181002121907.18476-6-mosipov@ilbers.de> References: <20181002121907.18476-1-mosipov@ilbers.de> <20181002121907.18476-6-mosipov@ilbers.de> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: HI/97tc14pG0 Am Tue, 2 Oct 2018 14:19:03 +0200 schrieb "Maxim Yu. Osipov" : > From: Alexander Smirnov > > Signed-off-by: Alexander Smirnov > Signed-off-by: Maxim Yu. Osipov > --- > .../isar-bootstrap/files/base-apt-sources | 1 + > .../recipes-core/isar-bootstrap/isar-bootstrap.inc | 32 > ++++++++++++++++------ 2 files changed, 24 insertions(+), 9 > deletions(-) create mode 100644 > meta/recipes-core/isar-bootstrap/files/base-apt-sources > > diff --git a/meta/recipes-core/isar-bootstrap/files/base-apt-sources > b/meta/recipes-core/isar-bootstrap/files/base-apt-sources new file > mode 100644 index 0000000..594db56 > --- /dev/null > +++ b/meta/recipes-core/isar-bootstrap/files/base-apt-sources > @@ -0,0 +1 @@ > +deb file:///base-apt/debian {DISTRO} main > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index > cfad136..9b5a894 100644 --- > a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ > b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -12,18 > +12,24 @@ SRC_URI = " \ file://isar-apt.conf \ > file://isar-apt-fallback.conf \ > file://locale \ > - file://chroot-setup.sh" > + file://chroot-setup.sh \ > + file://base-apt-sources" > PV = "1.0" > > DEBOOTSTRAP ?= "qemu-debootstrap" > ROOTFSDIR = "${WORKDIR}/rootfs" > APTPREFS = "${WORKDIR}/apt-preferences" > APTSRCS = "${WORKDIR}/apt-sources" > +BASEAPTSRCS = "${WORKDIR}/base-apt-sources" > APTKEYFILES = "" > APTKEYRING = "${WORKDIR}/apt-keyring.gpg" > DEBOOTSTRAP_KEYRING = "" > DEPLOY_ISAR_BOOTSTRAP ?= "" > > +DISTRO_APT_PREMIRRORS ?= "${@ "http://ftp\.(\S+\.)?debian.org > file:///${BASE_APT_DIR} \n" if > bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) else "" }" > + +inherit base-apt-helper + > python () { > from urllib.parse import urlparse > distro_apt_keys = d.getVar("DISTRO_APT_KEYS", False) > @@ -171,6 +177,10 @@ isar_bootstrap() { > esac > shift > done > + debootstrap_args="--verbose --variant=minbase --include=locales " > + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then > + debootstrap_args="$debootstrap_args --no-check-gpg" Can this be removed now that the one problematic repo is marked trusted? Say someone has more upstream repos and uses offline just for debian, they probably still want gpg verification. Henning > + fi > E="${@bb.utils.export_proxies(d)}" > sudo -E flock "${ISAR_BOOTSTRAP_LOCK}" -c "\ > set -e > @@ -181,9 +191,7 @@ isar_bootstrap() { > rm -rf "${ROOTFSDIR}" > fi > if [ ${IS_HOST} ]; then > - ${DEBOOTSTRAP} --verbose \ > - --variant=minbase \ > - --include=locales \ > + ${DEBOOTSTRAP} $debootstrap_args \ > ${@get_distro_components_argument(d, > True)} \ ${DEBOOTSTRAP_KEYRING} \ > "${@get_distro_suite(d, True)}" \ > @@ -191,10 +199,8 @@ isar_bootstrap() { > "${@get_distro_source(d, True)}" > > else > - "${DEBOOTSTRAP}" --verbose \ > - --variant=minbase \ > + "${DEBOOTSTRAP}" $debootstrap_args \ > --arch="${DISTRO_ARCH}" \ > - --include=locales \ > ${@get_distro_components_argument(d, > False)} \ ${DEBOOTSTRAP_KEYRING} \ > "${@get_distro_suite(d, False)}" \ > @@ -207,8 +213,16 @@ isar_bootstrap() { > install -v -m644 "${APTPREFS}" \ > "${ROOTFSDIR}/etc/apt/preferences.d/bootstrap" > mkdir -p "${ROOTFSDIR}/etc/apt/sources.list.d" > - install -v -m644 "${APTSRCS}" \ > - > "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" > + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then > + sed -i -e "s#{DISTRO}#"${DISTRO_SUITE}"#g" > ${BASEAPTSRCS} > + mkdir -p ${ROOTFSDIR}/base-apt > + sudo mount --bind ${BASE_APT_DIR} > ${ROOTFSDIR}/base-apt > + install -v -m644 "${BASEAPTSRCS}" \ > + > "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" > + else > + install -v -m644 "${APTSRCS}" \ > + > "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" > + fi > rm -f "${ROOTFSDIR}/etc/apt/sources.list" > mkdir -p "${ROOTFSDIR}/etc/apt/apt.conf.d" > install -v -m644 "${WORKDIR}/isar-apt.conf" \