From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7353323043876241408 X-Received: by 2002:a25:bcd0:0:b0:dd9:4a30:8d5b with SMTP id l16-20020a25bcd0000000b00dd94a308d5bmr190030ybm.57.1712078940106; Tue, 02 Apr 2024 10:29:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:6907:0:b0:dcb:b370:7d0c with SMTP id e7-20020a256907000000b00dcbb3707d0cls54998ybc.1.-pod-prod-02-us; Tue, 02 Apr 2024 10:28:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFJlmsu7y1+X33pT7nVYD19lIHCGZbvpc0bNHHS4ab3TJEVfSQ3QF9aw4AAFgnpO5reXjTd X-Received: by 2002:a25:a527:0:b0:dcd:4e54:9420 with SMTP id h36-20020a25a527000000b00dcd4e549420mr264390ybi.5.1712078938994; Tue, 02 Apr 2024 10:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712078938; cv=none; d=google.com; s=arc-20160816; b=vlO95WWhZ9iu8CqEwNoU4G1RN4P9Sypmuvyp2US9SL7t4HtAEWbR/HjLb4GgW0pANf +GxtvG1POweokYaGrgbCvTNdtN2YYF5mgXnM4BUyqMbKeDOYK1kOBh6Gyt5ZlSYGve37 lbpY/pBSk9h3kHtSRpTzgso2hTjB1NISPJFkA22msdTnu5Oo6mJ7mFjn2i7Iwg7ah7Xq 5IStLWiFL83lgWSMaRSmVXs1Do564v38SFJ/qSU4W9PO0rlBYZmnD9lPyxk+RGdO+EWq lKevbH2nop49Izwxba/F7sVZN/b/MJFVDr0Pz9opOkyd9Aytshef4wCHIz8qfVnwFK35 E9JA== 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:cc:to:from:dkim-signature; bh=ow62Wg0ahpKaQs4u9mNehenl79oACOFGAHG6dEm4EBI=; fh=oQsVBfLFKOCDpQI4v78XDUCp+c0vYPEMW+xCOFIgP4c=; b=Xsds3XFcVig1lqGSE02DB2FnIGdN4G3U9GCJMJGksj6NDGB/ppmcL8o3Xj6Jidgpz1 Qjnp35pd4gFRl3n7dgVreLvTuP0VVO8EZhooO6GHTXsrxzf15Jd/fkxbY4OyEoG4GhBp MIgPBspXNZsb37HyeOapH1hejEzG1ocTiGJqS6+JsXzkqVuVnrobHQBwhManNfKmCnuz oi6BZn3DLsVsDYPKsRJKfwLo+/Gii25K/HnqsCbClUEsO/8FRBM1814YxnvyAE5jdMG9 5bCI2tYX/GM5jiXqDjhYrHOC2xSahsD282LMsjp67qbbN24rZVZ2UVptBoRksHamx0hA EeCw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hD73dKSp; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::432 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com. [2607:f8b0:4864:20::432]) by gmr-mx.google.com with ESMTPS id w77-20020a25df50000000b00dc619c1f82fsi942062ybg.4.2024.04.02.10.28.58 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Apr 2024 10:28:58 -0700 (PDT) Received-SPF: pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::432 as permitted sender) client-ip=2607:f8b0:4864:20::432; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hD73dKSp; spf=pass (google.com: domain of kergoth@gmail.com designates 2607:f8b0:4864:20::432 as permitted sender) smtp.mailfrom=kergoth@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-6eafbcc5392so2506613b3a.1 for ; Tue, 02 Apr 2024 10:28:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712078938; x=1712683738; dara=google.com; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ow62Wg0ahpKaQs4u9mNehenl79oACOFGAHG6dEm4EBI=; b=hD73dKSpg1LWBUDrDSqS44zDP+xwh1qM+zCQrAEKv+Hwb5jbBIrL2kw4XK9dcfBQv0 C+/vGkDVrh4jkQKgkOaxjs5OpNWjGWqdh+zZ1/BZo67k3qeiRwUk8pjHsJlKwTlw+IGO 6mGKQTLWazs7VipEweHncvRrS2Sww+bW+b/q3oz8YGECoK8VMpX9/j+3dPxwZgabDOzw 6OqFFCgeWwR3DrewKqEwGaPjKTegyF/B7BciTd7UdHwbV5eRbbyKC51tr8eeY2WBbmBY dc90TEPU+6vfXNPNXOQ4P28ZiQUk/HZive/oPfcWNpuVT/Ql2B/dCD6xLbA0Q7vl2VSx VTTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712078938; x=1712683738; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ow62Wg0ahpKaQs4u9mNehenl79oACOFGAHG6dEm4EBI=; b=xDmb2Cc1Bud1/IBdzzk3zADZ7ZUlLNnZo/makADb7z6eZWnOK/aOSIDocifBwrP78k I54N02tMV6FrImE0IzOpFSrC0qW2qKPpKoHur6rtMc09Gzp+IycR9VvyvCdEgWBxpiN8 uIBZOwfH/Yvpx311xhuNSd+YjlOM1t4CgYQt6ckaIn7J1IVGnMaIm7FUx17RE79G4Uuj de3N1JdDZtdePR9jss+VtJZWKfCziLz4mAdHceb4O978cTW/pX4iG56JSTHsP6q7JV6K wVSoNapPHk9/5nnvQLAbDdX7pgu69TKbTAn4uTt+dtiaa9mdaqUMlqWYxqoadWLoaDzZ HCQw== X-Gm-Message-State: AOJu0YwQE7LcjJpBqcSUoB0xZMR7tH2cuxLzsLhhhuX3odKPaYpT7sZf SfJUY3UiCo+whYVvDpbml3embon8tCS2MvmudKBgPrfWXs5qRshds/941tOD5HA= X-Received: by 2002:a05:6a20:728a:b0:1a7:1c9:8c7c with SMTP id o10-20020a056a20728a00b001a701c98c7cmr599735pzk.43.1712078938069; Tue, 02 Apr 2024 10:28:58 -0700 (PDT) Return-Path: Received: from dc4670097af0.alm.mentorg.com (nat-mam.mentorg.com. [139.181.8.34]) by smtp.googlemail.com with ESMTPSA id bt19-20020a17090af01300b002a2313f62dcsm66705pjb.0.2024.04.02.10.28.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 10:28:57 -0700 (PDT) From: kergoth@gmail.com X-Google-Original-From: chris.larson@siemens.com To: isar-users@googlegroups.com Cc: Christopher Larson , Christopher Larson Subject: [PATCH 2/9] isar-ci-ssh-setup: avoid abs path in signatures Date: Tue, 2 Apr 2024 17:28:06 +0000 Message-Id: <20240402172813.418770-3-chris.larson@siemens.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240402172813.418770-1-chris.larson@siemens.com> References: <20240402172813.418770-1-chris.larson@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: NLHigXrPea5Q From: Christopher Larson TESTSUITEDIR is a full absolute path to the testsuite directory in isar, as set in the environment by the build setup scripts. This is referenced in the install task, which prevents shared state reuse for this package. While this is predominently used in CI, it's still a good idea to avoid absolute paths in signatures, so we can reuse shared state for this package in other contexts. Rather than excluding the TESTSUITEDIR from signatures entirely with vardepsexclude, we can retain some information about the path by using os.path.relpath to make it relative to the top directory of the build. This is the same approach used by isar-bootstrap for the keys, and the vardepvalue approach is also used elsewhere for layer paths. Signed-off-by: Christopher Larson --- .../recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-test/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb b/meta-test/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb index 4693f647..89100444 100644 --- a/meta-test/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb +++ b/meta-test/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb @@ -13,6 +13,9 @@ DEBIAN_DEPENDS = "adduser, apt (>= 0.4.2), network-manager, sshd-regen-keys" inherit dpkg-raw +# Avoid absolute paths in signatures which prevent shared state reuse +TESTSUITEDIR[vardepvalue] = "${@os.path.relpath('${TESTSUITEDIR}', '${TOPDIR}')}" + do_install() { # Install authorized SSH keys install -v -d ${D}/var/lib/isar-ci/.ssh/ -- 2.39.2