From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6741632142759952384 X-Received: by 2002:a5d:4944:: with SMTP id r4mr3964177wrs.283.1569658551194; Sat, 28 Sep 2019 01:15:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4c42:: with SMTP id n2ls1415774wrt.8.gmail; Sat, 28 Sep 2019 01:15:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqwX3We4lHV0a+hv7+f0uhhSe6YR9dc2yKHgQS+/Zc1Fjtkmk31kt1wI0ndn43rToPhp0va5 X-Received: by 2002:a5d:5643:: with SMTP id j3mr6230520wrw.357.1569658550774; Sat, 28 Sep 2019 01:15:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569658550; cv=none; d=google.com; s=arc-20160816; b=VdTxPRyrZmDctElyTwhSb/zTqqLioJuXJgOQjsAEOrjG7wFMdgMxzwajDqLiERzNOm BweyunBgucb1HFZ7rqD5Fnflvc0U0Hf9rQd+Zw9IpwbBqwDsmO5XdQIgwyirOE0OFDgL lZC/54KgN5nmrVGL5BT8CoBgDGN4n5keLqsbSR3dy1wMKvpYOCFYiV/e4jFXJCBADzTA kwHy0aCnEpAgdp631toNh8Hz9P3lb8L1TMo67p39/07djGwc6OArJqMg8Lmr8wpHfKiY ZLNmEh96rTzPZcCYCZbAieoyELffenk0I7CT0LBetAC6WhR5sgZnbvapBPM52Z5yvpEJ 4mcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:to:subject:from:dkim-signature; bh=RpyHP/ny0uiywmfRzNebdjjUJuVSk4yldyJECA4ygdo=; b=WxIgzeRlK8B0D6o1XYAgPEkImGY+NLDbBPNAPpWPwc+tmNUEdVSvWNKXNGSkNS4NfB Ud2TuD1SYLou1LdyhKDrOtq94uho26bItRv4L1dO868z1F3F5FXN/8qpj5nyKeSLe5ju An4nxPVpLGB3+kZygBXBOZkvT/juAIMRpSeGOJjlIJrTbuC2j9891n+T1cEvS7arJ7ns G/snKYTV1RceL6Hteik7w+V7ISd7D8kIDZxQBgX3HjQoS4mExO5d2q29V8C3XE++rsbp Z2H+kEEQy+NqD4siPDKnkF53bxyHGcFhxiTFOqBGhtVHZJnqFKx4AVvp5nj4SgDGgv/C XJGQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@web.de header.s=dbaedf251592 header.b=JZ4PuXrs; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.4 as permitted sender) smtp.mailfrom=jan.kiszka@web.de Return-Path: Received: from mout.web.de (mout.web.de. [212.227.15.4]) by gmr-mx.google.com with ESMTPS id i7si304291wrs.1.2019.09.28.01.15.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Sep 2019 01:15:50 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.4 as permitted sender) client-ip=212.227.15.4; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@web.de header.s=dbaedf251592 header.b=JZ4PuXrs; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.4 as permitted sender) smtp.mailfrom=jan.kiszka@web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1569658550; bh=mMYNrleMDhCGanYJc/QyMb+6tRVEES0N25rFV6enezI=; h=X-UI-Sender-Class:From:Subject:To:Date; b=JZ4PuXrsxZu1tjte7pFZV8ZinlQSHCkY/bgUTVKodDUCebPj91TLeHWfZasJVSAoU sulMOIDqKM1rJ1YpC/BOlsMluT8+wqb9kx+2WTENNz/du7e7GrgBg96LlcQ34P7Q2e doYJfT6SWiPYq0KluarkUY6qbivxvLgN7H+qiu4s= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.1.10] ([95.157.55.156]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LuqfJ-1i5IEp1DmL-01075i for ; Sat, 28 Sep 2019 10:15:50 +0200 From: Jan Kiszka Subject: [PATCH] isar-bootstrap: Fix PREMIRRORS setting for cached build To: isar-users Message-ID: <58eb987c-914f-d47b-6187-595dba4ff94f@web.de> Date: Sat, 28 Sep 2019 10:15:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:T22/O8E9FEM+CwBXo1m2WJAHVJ59ntUgKkdsM0EvjXOjEjUhBth vgCCnW0FjsO9g8FvSuiIetWB5Pej0eqH1P+TsncCLNtuWHc08HyoaLzjcxj7re7IBo9jFFQ /hPJWAAmg/PGxQQkeIiwe4E2N0fzzfZsd5oAXJJ6zvjATHCB/31kk1TilyJXAINN2erzANo Ms/CaiVQmqIy4hR5TqasA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:tqpJrxIEo5U=:Ed/IsPK6HBBNbCKA5RREJo Eyn2zAV9YbFOe8tUlPwub8FLCnmVOaygj9PtQH0ESJhIjIaP8IDF5MgtgblZvmV2D++2x1Kl3 X2Z+mhiM134BKi1yR9kZQBPRMjEx71ZuABM4qQwb2orPE7FRtpNEkEZ6W1k7h0c2MAHCgTK6C W5wjc7S+JJt3HH2r7j1hCHB6bSI5PLnlinPBBkf2XsoJW/HAltKzPS3v19NC3iXE4He7adhKN bAYvF0W4Eh1JhAlyrUSsJ/bG12gZ54kp62hvyAEKpsyl9FCaZ+IVkTrqskJFl759iSkRJY0pX hPgFtVksU+XrQU017bHKDpTm8tyt5vOUw3u1DWdkA5VvhGf4KxbE+Pxfqi7YMCOK+Ho6LY/9v t3aI2BoJQaYpOfnybZxqDwJ8obQFTl3VL2e+VPHvfRxqSFG5cSryLj7XuId9OkT+VdMV85tuf f3zXEnGAmcjuQgilIJov54IIU0vHJsCt8EQ9jIZH2ZtrbMwLLp/lP8s5r/Bi/MCLUtS/fRUgh mBt4hN1pN7ozSqXK5niJoq8MTvbiN2VCkkeJDGa3uhWAtWMVGjfmaMvabOcVGKaj5tMI1sAAP ny8H3rX6FXtmGc2xvwXTBzifOe9x2Tw2tD8YlPdbBf5MIOf0GdBvGH2Cw4x9nDPPeL1I2TcMu xIB7GSWrXPDDkMnXD7R6cuyE0aNcRtpNHx7VMlppaQKAYLBLtm+UmGQ234NjtHjIca3iB8t1I YH/fXSWT7DE+y9detapRTVIKsGoAg+qLLcRE34rJ/fVJhKYOoqwfqI96DlqiEbpDeGWMlj0kg fy+n1UCuoBohZScWkm3OMYHTK/gcIi2cGhW/Q5KX0KYq3j+mAaIBLmOVf1GSXjdUDTrSh0OCh VKpYIlwRCnPcziR7o46b0OBtgsTscWSw8Za2kMl4URf3+yxc9ktjXJszOevep1ZwceDLe6pm6 4WCqVaDf91hR1/ep4TyGmyR2VOrM04pJubbTC1lfTh0P6/KLzVkFvYJXDuloVKz4isC7N2XQI l3fsEIK8s5Dy1/rmLa3NWahfiGU1POQfERaRJA8Mv806H12w1l8Umgeeh6m2Njb5FkrUsskXh AYC8cG8D1NbIbGx7jtcU2RilJ8MS8oR/XcPgNyUFbkC7L1/4DyT4fBes6WwZGGhKKl7t1D96/ ubOz0gqc6itb/g/l5WgYobzR8Izde97i3zXZ/95VjJZOgJRtUcj0lcysRI9ZkCeqKPDHbWBO3 xd0Lu6zjX6qvVxXAKrZc9Jpp+u52Gydw0FBuJzC7MVrsLT7gSfJzUyK0vU3s= X-TUID: V5cHQs+OoSiX From: Jan Kiszka First, there is no reason to match that closely on the repos used for downloading Debian. That only breaks when using a different distro or source. Second, we must enforce the usage of base-apt in case of cached build. Using a weak assignment will fail if the user specified DISTRO_APT_PREMIRRORS for online build. Signed-off-by: Jan Kiszka =2D-- This should go in before the deb.debian.org change. meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/re= cipes-core/isar-bootstrap/isar-bootstrap.inc index 3cf784d..1a58471 100644 =2D-- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -30,8 +30,6 @@ DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg =3D ",gnupg" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support =3D ",apt-transport-h= ttps,ca-certificates" HOST_DISTRO_APT_SOURCES +=3D "conf/distro/${HOST_DISTRO}.list" -DISTRO_APT_PREMIRRORS ?=3D "${@ "http://ftp\.(\S+\.)?debian.org/\S* file:= ///${REPO_BASE_DIR}/${BASE_DISTRO} \n" if bb.utils.to_boolean(d.getVar('IS= AR_USE_CACHED_BASE_REPO')) else "" }" - python () { distro_bootstrap_keys =3D (d.getVar("DISTRO_BOOTSTRAP_KEYS") or "").s= plit() @@ -98,7 +96,10 @@ def parse_aptsources_list_line(source_list_line): def get_apt_source_mirror(d, aptsources_entry_list): import re - premirrors =3D d.getVar('DISTRO_APT_PREMIRRORS', True) or "" + if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): + premirrors =3D "\S* file://${REPO_BASE_DIR}/${BASE_DISTRO}\n" + else: + premirrors =3D d.getVar('DISTRO_APT_PREMIRRORS', True) or "" mirror_list =3D [entry.split() for entry in premirrors.split('\\n') if any(entry)] =2D- 2.16.4