From patchwork Thu Sep 12 08:27:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cedric Hombourger X-Patchwork-Id: 3817 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 12 Sep 2024 10:28:20 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f188.google.com (mail-qt1-f188.google.com [209.85.160.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 48C8SJ8m011850 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 12 Sep 2024 10:28:19 +0200 Received: by mail-qt1-f188.google.com with SMTP id d75a77b69052e-45687583c67sf9028991cf.2 for ; Thu, 12 Sep 2024 01:28:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1726129693; cv=pass; d=google.com; s=arc-20240605; b=c8Ob7SxDney/+cL/SPyFzitOjcHE7EoyRFyS6M816WAsUyjBpW9W9wpsot16bjIPUm 9ebZ3ie3+yiJsOpSNGWQ+bmiO7zF3am6IIFnCtDRRksU4StdXvRwOTODrPaFofhyvw2T IfwhdSVu3kNJ6Sz4Ut6KTtj8YcJRniuqdfV1ztxxdBLMHuEXddjoIp4pX1WMNzMfmpmd 42MB0sMPFWMzDfr3yC/KeMICiuuNz3VaZlDHPDwBLG+IMw4hn7qhuOHlKIRQHotUkWdT Lz22SJwuRPgPpcb2Nra2LuSNt0COywV+v0syHygT4L9fSk5I3l4/ssnOsSi9hSy4rDk5 TLNQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=15tQRWipIx7YkU3hTz4CmSIAk9xp4JcFhqA71mDHp/Q=; fh=Qej7xqiko4GmOYeYgpFAo/kIcoPkLVvMcPgQRFJBr8I=; b=Lshy/O+hSIi8RA1xO1Ulbwe9/IplE2fdpmX0be238fgRbXQgvlsDtESxxYt5Ducohz hskI5IUHrtzp1HZ+Wx5sh+xwx7eReHp3wzTVoAmjiFTLi9aC9S1L+/vZQV3StjgrfKGm X3zNVE9tVUrYtKuWOGTNotp2Mc5CfCaizd4ptSKAY9QRf8TmW+cRYOWjHbUlbD+EuO7j Ts+bl6fgZ1A0MZ/4QjaS+eNgMXOdrsyOH6twg5aj0OsHN0+0xYAPcizxKW/ZKnYQoGFU 0CNv08kzW1auoMNEWje52ShieqGzITUcEIjLk+F21SnmIjO8I++KLuPLRKqGl339Iums 3TzQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=aDqG73zn; spf=pass (google.com: domain of fm-1212295-2024091208281061d51398e837b090c7-blsofi@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1212295-2024091208281061d51398e837b090c7-blsOfi@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1726129693; x=1726734493; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=15tQRWipIx7YkU3hTz4CmSIAk9xp4JcFhqA71mDHp/Q=; b=dSWR4yZX5wZI+tvderqcFMxmu+R3bCCYrZ4izENFsXVXWqra5SVh2DVyZZhVVxjFez tyNmwBf9sDLrRfSW1jnTjEaQmuqt3cww3FIqyJ6cRhKMKp3ijRC044DvwJdNA58ZQmi+ x7D7BAy3+vvVNpak0ULrt8bspIW/tb/8lC7WjaHa9ouyc79P1lPONiBh1jH8tBGFIwml 63F1Y5lkRQkEh3N4iDtWqd5OfrP6FcYvXfPXamTYyWYDrSBozvBak4RecsEfLcmQWmMN S3nB7ffPQiJQD0OB+VBdWNoXWLbGNqKn1WyOBzwZ09uQO07XZ8782kpV+349+aFBqF/Y miHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726129693; x=1726734493; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=15tQRWipIx7YkU3hTz4CmSIAk9xp4JcFhqA71mDHp/Q=; b=xEBss3xOHMpk5+Qj6vQrfMU8iZ5XramLZ0Mh7dAyn19jFlVU4FsWEOLBfc0srfAQKh vHKvg19KErmFOWCTaFjH3eWYfHQEUq4OC/SaAsXZvUfwqtByYeGHgj7+7nijpfWBMFbV SP7LzwTz3di+tdeoRf9GrfIAJmaORinnr1Rnxag55cnAW4rOQOdzDJEpy3ILk1vqQGK0 Npj1bb9M89AZz/WpUhEFMqr3nrGw6SBciEZvo824ELsmH70wknGur3kPajViTWtauyio uocafQxRm4JWVkBbfPfXWuRYGBZRyZDXGP/6t/Chi+4fALaGm6hji5LKQsyM9rnCufs6 N9oQ== X-Forwarded-Encrypted: i=2; AJvYcCW+y10Zopvg+rcB/zEJyCIxa/YnJ2PmSNuL32oGZdCifeoE6wHjB4cWqfSq8C7x/oD+IRmF3ek=@isar-build.org X-Gm-Message-State: AOJu0YzgQR36lGNgH3WKVGjx7QK5VZ2t/cqV3AQWxoDnIbJ3mFNyV4bG 4lRclAJ3mQ5WL7T+HM0hNAK86d0Ysbhol8OTuT2g4dbErcWC3UYq X-Google-Smtp-Source: AGHT+IFXPxO5/gIj6v/x5Oa1JcOCBrG9adPEFnQ9iYGOwT2H6ARqYzViemrYfNyFE55W6NjmLKDJ+A== X-Received: by 2002:a05:6214:2b97:b0:6c5:516a:8ce8 with SMTP id 6a1803df08f44-6c573510567mr28778136d6.10.1726129693185; Thu, 12 Sep 2024 01:28:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:4ea7:0:b0:6b7:9a07:4191 with SMTP id 6a1803df08f44-6c57350c396ls8606646d6.2.-pod-prod-01-us; Thu, 12 Sep 2024 01:28:12 -0700 (PDT) X-Received: by 2002:a05:620a:24c1:b0:7a2:c13:458d with SMTP id af79cd13be357-7a9e5f77286mr287079485a.42.1726129692505; Thu, 12 Sep 2024 01:28:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726129692; cv=none; d=google.com; s=arc-20240605; b=TDjnEggM/I974N0bcq5BIk6REDt+h+h4IkuAk5fU37qtHwT1l50lm6D2r0QGCkVYEq q42hBZK4WW1S9NJFJ1Tr2UiabKmBJsq/42QWw6s3PZgnbgRY5Uybp6gXGTjG/T8jzyFa 82gegzishALHZpml0dzjdoG85C0Q1ke3zOUiSO72qYLHrrhwXeRLhJexo4p4jutymjCn FGBXrjbZTmYRG8tCpPZpERX6Uxs9sq86lsly3v9QnU34/VCkqHdo1S1zzK3EgqRabIql VdzZNvBQI4dASrXHziN+BbY0SPqYgewZWucDwHs6YnsivGCIRAZMs0WC9gf5wxKttafK 2OAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=Ya2H2SgGdHVu6WmQC8Lyv9BKIqi370fBaq7B+0fcuWE=; fh=1z37pEVhqwMLlkT4FDzOga7XBsM6Rzv6sXOq0pipxqo=; b=jJfhj1ziD8haSg8SO9NzIdULrgkmUQggMY4CxwqCiASZFOYSJwWl+27rVWQnUR9RWn JphsDjo/qDBh7L52vuJhZlAA8zUDmpkBxQJrNePTfSN9hWAyGSkSmUPcafUBjKmxHpBz HyEKOfaFyqmiUx5NrE1YR6MAEt1Y8dtYtFg/bzrIkW+/kvSht4KDYFDHyP0ggnDcmVWW okdJ3A7BS1DB9Z7wnpfroF6q8YbhvF4SiMDAUdmXKBxI3GXq0IERGjLtluWx7eFRjwYY rNo7AONpl2rVeL7+6iJ6Wsf+kDenzqsbkbJaXjQzt+2ib86OdJFuKu6uBgClC4AAdqrx oG1Q==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=aDqG73zn; spf=pass (google.com: domain of fm-1212295-2024091208281061d51398e837b090c7-blsofi@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1212295-2024091208281061d51398e837b090c7-blsOfi@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id af79cd13be357-7a9a7947688si50131985a.1.2024.09.12.01.28.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Sep 2024 01:28:12 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1212295-2024091208281061d51398e837b090c7-blsofi@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 2024091208281061d51398e837b090c7 for ; Thu, 12 Sep 2024 10:28:11 +0200 X-Patchwork-Original-From: "'Cedric Hombourger' via isar-users" From: Cedric Hombourger To: isar-users@googlegroups.com Cc: Cedric Hombourger Subject: [PATCH 2/2] dpkg: use BPN instead of PN when defining PP Date: Thu, 12 Sep 2024 10:27:41 +0200 Message-Id: <20240912082741.354985-3-cedric.hombourger@siemens.com> In-Reply-To: <20240912082741.354985-1-cedric.hombourger@siemens.com> References: <20240912082741.354985-1-cedric.hombourger@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1212295:519-21489:flowmailer X-Original-Sender: cedric.hombourger@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=aDqG73zn; spf=pass (google.com: domain of fm-1212295-2024091208281061d51398e837b090c7-blsofi@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1212295-2024091208281061d51398e837b090c7-blsOfi@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Cedric Hombourger Reply-To: Cedric Hombourger Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-2.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_PSBL,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= With 2ca3a7e5, sources are built only once and re-used when building -native and -compat binary packages. The dpkg-raw class generates a debian/rules file with ${PP}/image expanded: this causes build of the -compat or -native variants to fail since /home/builder/${PN} does not exist in the sbuild environment of -compat/-native. Change the definition of PP to be /home/builder/${BPN} so that the expanded value remains the same for all variants. Having absolute paths in generated debian/rules files is obviously questionable. Signed-off-by: Cedric Hombourger --- meta/classes/dpkg-base.bbclass | 2 +- meta/classes/sbuild.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 95cc830d..c97ee651 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -189,7 +189,7 @@ def get_package_srcdir(d): # Each package should have its own unique build folder, so use # recipe name as identifier -PP = "/home/builder/${PN}" +PP = "/home/builder/${BPN}" PPS ?= "${@get_package_srcdir(d)}" # Empty do_prepare_build() implementation, to be overwritten if needed diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index 9c268281..f68e8735 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -43,7 +43,7 @@ EOF fstab_baseapt="${REPO_BASE_DIR} /base-apt none rw,bind,private 0 0" grep -qxF "${fstab_baseapt}" ${sbuild_fstab} || echo "${fstab_baseapt}" >> ${sbuild_fstab} - fstab_pkgdir="${WORKDIR} /home/builder/${PN} none rw,bind,private 0 0" + fstab_pkgdir="${WORKDIR} /home/builder/${BPN} none rw,bind,private 0 0" grep -qxF "${fstab_pkgdir}" ${sbuild_fstab} || echo "${fstab_pkgdir}" >> ${sbuild_fstab} if [ -d ${DL_DIR} ]; then