From mboxrd@z Thu Jan 1 00:00:00 1970 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-f191.google.com (mail-qt1-f191.google.com [209.85.160.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 48C8SJPP011846 (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-f191.google.com with SMTP id d75a77b69052e-4581b5172a6sf10570761cf.3 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=jUyXPDfUW+C989wsaee2Q2XwdOlI3OSabmHkSnqDHkP7ojytrqBagxveXxid96XA5z YAKjbmU08Jm278uYOJUwIkUNIPh1oXnCGbDhMwGXtDz2qoRWG5wuSsAJ5YWH+Yns4uXR wDe6SbaHudzT0Dxwpeorsm2blcp1lULZ4scgoZpsTACK7u7bIzOG81Np8R6OFQCpZVTb Ltcq/p7emHtU38DCjv1NrH97HPIQz6FqVH5F8eYaDmEshv1PN4AkMBHleLxjWTzTgMK7 CcdlU0lBVEY4I1RXgS1Y+C1UeNgRsoVDuqguMpPcUaV6yWFsE5PZKjm4gwwj095qfH1Z XiSw== 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=+IKTyhnA5v/l2p2tKEqdzwlUzV4SS6YqBGNt3L5m7l0=; b=X0d3x+jLIwg33g6EmK8RplzXOTKU1eYnOjrnSFVFKC4DLyE48UJY4cyaQoA+Jnmgsd C6e+Ww4Pp9H16uoWsUf+894B2Et/95BWOg252rg9keW4obdgtiFhm2VUibKZJV+8c7Bs buJLEgRoFWXRSBYgT6Kt9GvdcuTjEVQYC8XOPwR88OFr3dL1MCgw1TRgwJmnxkB0XcWk /gAe0+fmRPUegV3pMtO+g6dT+eu5N6EjWVGOEUH38OMpqaDpdoXAonVMX/cDjckYgXKh 7BukouPwmYPEq3EhNKDPhttIyaeCfzOz9sdAgLzgy5n2j9JT/pUsB1fe5ZShZWwnM9t0 i6Dg==; darn=ilbers.de 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=ilbers.de; 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=ViRlEf7x6np6xL+dMmE8dkLQDd2vnigkgenbfVV2Mr5FF2YB/+QkTgvKw8NExCW/Gi jnZ3j6nqHW+DZBqvWAHS1+N0/0l1rME8FsVW0QqiXr486YIUTQGW5e0G6vDpt9PjyeDA hDXqqxJdUTvIFXfOl+jNMPK+paajiJ8n6iozyA70zcklaJG0XHm31kVQU6kInvNmq2D9 R4n1rPB+kGrfMi5h/65uZudf3QJ+641T8EBTh/Szz0sFAGlcDsC92DzmOGUaQ6vw1GN1 QBN14xFdeQ6fGQL2U58AQ6kDof1iPEArE1wOBPJorFRvs34q8fnjdR8AY9/ktv2JRZfP MeaQ== 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=t4P3luJfIPhZWFPy1c0PPeX8qaYLTehkT+lN64jZXrchLv2O2ODVs8fUD/YejJEg9D jYnOZowL+WqCaG2sNrlEcOqUg8OOtG0aQ4iUrQUt0GSAOwZN36jSnLJsm/9NEp15XLeB vrGP/NgBySzRl6gX6PE2ImOUPSXNDJbLN20IGwE7N/VcnWbLUS+Mf5Xq4zV49WmItGfB 39cO1rCbPujXmwdHcmuV+5T+HyTUD4tSQ5s5vUpDacfJ/407khX3yuENzAAP5bZf7F86 UBrp+VpZK2rYWdx5RuviwAbKq9M2aAt73u8DpzAAip8amHhG1m8XmW9BhSvi0NDIq3Ju ywCg== X-Forwarded-Encrypted: i=2; AJvYcCVGFGtwYHm9n9J9KywsbfpDK47eo4FTgwsD5W0MDu9Bu0SvxLr8QFQ4kfXKcKwmHH5cKtVZ@ilbers.de X-Gm-Message-State: AOJu0YyaWZXTpPO75wKJkdfGh9cUvlsW645j+3L0artG3C8tGqonhjh6 jy7aFOaZrEQDQUccosrqcDpKyZgRv2iuO7kaI2UZ0EE45tXVQqnt 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 From: "'Cedric Hombourger' via isar-users" 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 Content-Type: text/plain; charset="UTF-8" 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=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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-TUID: v/wLEGLkopo8 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 -- 2.39.2 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20240912082741.354985-3-cedric.hombourger%40siemens.com.