From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6607733288662466560 X-Received: by 2002:adf:f8cc:: with SMTP id f12-v6mr1214642wrq.2.1540312226171; Tue, 23 Oct 2018 09:30:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:afcd:: with SMTP id y196-v6ls642497wme.4.canary-gmail; Tue, 23 Oct 2018 09:30:25 -0700 (PDT) X-Google-Smtp-Source: ACcGV63RfC1SG+0xHj1LnzJaO9GtqcV7WS/Gaa/yQh19wx6YpUkdgtRvMmFnmdK5fpAlTwvKmjtr X-Received: by 2002:a1c:9902:: with SMTP id b2-v6mr2194884wme.4.1540312225720; Tue, 23 Oct 2018 09:30:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540312225; cv=none; d=google.com; s=arc-20160816; b=hcTQ7cCXoTdNtUT6joTi8B/+wjPxXRHQ9ffif2F4t4S4EkxUT+DInSkMn4yAb7U9th O8SWTkPWXTdOxuep+HAra0bNaMzymsXwA0rW2q6IKhBeqRnWYWrWJNHoxBOYK25/8pNy ofw+ocBkHWQS2++Hhc/FhTJu5rZ3Wnx4lL962PbqSBp/jX0+wWEegmbE7gII7QngF/5O 1bezA2fOJQJjZId6CFYmUGyIUlDnfDU9Z0op7mY2szPpu+XVOMpYpCsgJsGQ6Qz4NMON ul782hQecr0n4bYn/g/UICYxCT5YKqilAxURA8Ri9yDvQGZJAjWzDG7NfrHjN1VG+uuA uiBg== 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=zc8RP7Gxn8QTHyhcGLSFrnPbZrlE6TdWTtMcni9TYvs=; b=dIgfvbEyhmvnVNWmsxfHmKJNvH1FuzXO8/6kaopyHd/tYP4Bsv0H/h/t2EiylNNXzq fZqcHnKymu8nPgeODYJp620E6HZvO2NsbPM9HR7RFhEEURLhA0lGrAhYMD4Rfheb691S vdgdoAtE4rWKsL7yktKV89FeSEV7nd8efdSrsmXiajbFiYJgwv6jJwDd0oglFCZavryT lPu9HlflQ+cj+A5GVuwiMjjmCr05acVUT4Ft6NmmNbetqOBCUVflSqJSbo6YazV+nFFA eUXqo2vidjP6fxAgBLsOEVhZe7Kpu1L4+0PoDb9xaVFI5mqXSCthkqJeT0Bp3R7Tt69e rW+A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id u13-v6si47625wrn.3.2018.10.23.09.30.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Oct 2018 09:30:25 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id w9NGUPcC006993 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 23 Oct 2018 18:30:25 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTPS id w9NGULQj004954 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 23 Oct 2018 18:30:23 +0200 Date: Tue, 23 Oct 2018 18:30:20 +0200 From: Henning Schild To: "Maxim Yu. Osipov" Cc: Subject: Re: [PATCH v2 06/10] isar-bootstrap: Make possible to reuse the cache Message-ID: <20181023183020.343094fd@md1pvb1c.ad001.siemens.net> In-Reply-To: <20181011165305.1622-7-mosipov@ilbers.de> References: <20181011165305.1622-1-mosipov@ilbers.de> <20181011165305.1622-7-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: soOTC9ztYSrW Am Thu, 11 Oct 2018 18:53:01 +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 Try "[trusted=yes]" in here and drop the workaround patch if possible. Henning > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index > cfad136..cc1791c 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:///${REPO_BASE_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" > + 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 ${REPO_BASE_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" \