From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995249996219023360 X-Received: by 2002:a7b:c106:: with SMTP id w6mr11736327wmi.152.1628708560446; Wed, 11 Aug 2021 12:02:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:e5c5:: with SMTP id a5ls1973269wrn.0.gmail; Wed, 11 Aug 2021 12:02:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0Nd8cRSZ5XbKCT0ts8V4OctxWHiJBvi8ldBQCR1WoZg6/rtTWJ70F3HNyzrgNyFjUCxj9 X-Received: by 2002:a5d:6708:: with SMTP id o8mr38664891wru.304.1628708559390; Wed, 11 Aug 2021 12:02:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708559; cv=none; d=google.com; s=arc-20160816; b=vT190AaW4T7WDpIxpXxub3DpXTFoMOCx3yonMWl+yBOFllG7E3NIVzIKH0kRe/UWxm RrnPW/APB4kEW1PUpfp9D6t2552fjFkEocjFG0OokQRggrhSlSkHyCC523rkOZetbnhU 9sXJ6gRnyU+RpXgN0ZzNukUprYD4A5Cq2r6Ek1ig58r/UE610YsJfaPbyP4x/6GLTqPQ pH63ftMrL0CEsUPCUEWdlN2Q7INDRLTvchXY/NnecofcDNb4kriLaceN60NYQkRX22jC ahso+q72HtSOVCJ1a2+6ujpNvh+geilF0RWF4dFsoEzt1rkvX5uQ7LhCssoDKY13c/Pw qY+Q== 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:date:subject:to:from; bh=xjv16hjlKdAop6FrTLXQOErquq4w3OalIwCmDpjqlqQ=; b=iolCi+0Gn2gioLwGyY1ItcnSV/ezv9DxpMks1U3iCqVc8EiTJNLbqR0oE1ZNmnvMUa LpWbey1/VivHheZi+Sk1DhRC7KmNUDAdO7g4Q0F/zjlhsvNfEaW6gNqGEOOQV8LTC3kp qiFuUzdrkgl9hzTXnUo9Y8O4t9INCgxYvKOrJApgXbmRUEl/mpxkhucGatTGvnfa0VgP l6Dm8HZBOaBLkZi0niglH1jyYb6TXs/ko9Vt3A9SRqVm3EmNhuEDP4xz0JgtrQPHeldH nP1sMFz21J5P17M8IcebL59J2w6w0xDAtU84TrOpRX1Qdd/t1BNm6VpWda+7Yk6xyXkW kO7A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id 2si8191wrb.3.2021.08.11.12.02.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Aug 2021 12:02:39 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 17BJ2cxd011494 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 11 Aug 2021 21:02:39 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.241.87]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17BJ2bHF028609 for ; Wed, 11 Aug 2021 21:02:38 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v2 4/4] isar-bootstrap: Ensure rebuild on changes in DISTRO_APT_SOURCES/PREFERENCES files Date: Wed, 11 Aug 2021 21:02:37 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: wT+3x/dGGkY+ From: Jan Kiszka For that purpose, simply add them to SRC_URI because the content of files there affects the task hash. Signed-off-by: Jan Kiszka --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index f1299f9..c65f2cb 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -58,6 +58,14 @@ python () { fetcher = bb.fetch2.Fetch([key], d) filename = fetcher.localpath(key) d.appendVar("THIRD_PARTY_APT_KEYFILES", " %s" % filename) + + distro_apt_sources = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES", True) + for file in distro_apt_sources.split(): + d.appendVar("SRC_URI", " file://%s" % bb.parse.resolve_file(file, d)) + + distro_apt_preferences = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES", True) + for file in distro_apt_sources.split(): + d.appendVar("SRC_URI", " file://%s" % bb.parse.resolve_file(file, d)) } def aggregate_files(d, file_list, file_out): -- 2.31.1