From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7163980406052618240 X-Received: by 2002:a2e:3305:0:b0:2b9:c4f6:fdd with SMTP id d5-20020a2e3305000000b002b9c4f60fddmr1250935ljc.14.1692188088823; Wed, 16 Aug 2023 05:14:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:2125:b0:2b9:5ebc:4afe with SMTP id a37-20020a05651c212500b002b95ebc4afels187644ljq.0.-pod-prod-09-eu; Wed, 16 Aug 2023 05:14:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHM6+xH255JKMSM6gkkB1gYiqUO6zfYzP6P1owq13oTTqn4cvQMExevBW7SEFurvMy69RQQ X-Received: by 2002:a2e:6a04:0:b0:2b9:b6e7:bd7 with SMTP id f4-20020a2e6a04000000b002b9b6e70bd7mr1347339ljc.29.1692188087075; Wed, 16 Aug 2023 05:14:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1692188087; cv=pass; d=google.com; s=arc-20160816; b=FsttAUZmfRgev3kbExMH2Vfp2LQz8/TclJnRhsSrNiqyrcXYG/aQGcJzWMcZwjiWxZ lcBShZmAKh3F3v6zfietYk57jqOLZL24KWnv6s2z+T7OCM9mQNKCs1Khc/kqeaJt6oZS xlAS/WoFfpb7riSgED21Z41yJ57oPXphYun2e/PgTqHbS6otqmiP7LpzY6FGpC1MpC7K SrItBgmcugXiwZ+IlJez/+O0wGyv7ytSbIphhFAcuPw4mIZUK3qVhaHf4SKbKAoO2DWD 4V8mGKsnbMdp7U/Px2qHGQX9eCtAJBwZwfBOq8rH5mTtdI2R8IANbnS/V7kVy/6e+1AQ 5pgg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature; bh=E9+lM7R1JowhlYBX+VmfruAfddHjDzzYN7qz0ZfVnco=; fh=P0iuKgidmAaYvPfY6P+WWv+5AQ1KAqwDcu5amwfnCeI=; b=WMcZmTxT64Z+WEMd9lhvqGUrzQY4ztHy5fXXnM/Yor7o2NFLX4BeGVFsZZIxxiJMWp 6GGCSSIReW5/i0ozvbt3IeY0GlRGTweHQx232H1QO7TP0/WOleKWkF5c1kaOYy2enaLD 2sYR8FWSJ9gunbGYIU4cT5yb8XzwBnLJs8FAHNgGrnbcqjm0hz35axwEW6HmjFoMy1qC odI8gzpwGxz8h9UKh0Y4BYEQ17fe3gpe7LHThHV3KdAuPsJbMAZbh9ls+xWlo/+MyDyu wEOvtwZud7UaEaEn6BmozSnSvzMm7fJ9/natcPm8Dda+SruVm/9BTB5eY0C3BKrZkPQ7 1OxQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Ss66Tgdz; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of stefan-koch@siemens.com designates 2a01:111:f400:fe0e::625 as permitted sender) smtp.mailfrom=stefan-koch@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0625.outbound.protection.outlook.com. [2a01:111:f400:fe0e::625]) by gmr-mx.google.com with ESMTPS id b6-20020a05651c0b0600b002b6f8d5f93csi1162631ljr.2.2023.08.16.05.14.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2023 05:14:46 -0700 (PDT) Received-SPF: pass (google.com: domain of stefan-koch@siemens.com designates 2a01:111:f400:fe0e::625 as permitted sender) client-ip=2a01:111:f400:fe0e::625; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Ss66Tgdz; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of stefan-koch@siemens.com designates 2a01:111:f400:fe0e::625 as permitted sender) smtp.mailfrom=stefan-koch@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kBkS+pcyuZe0qgRwj07IPZOaIytNLBLkmvyO9dwclhNxK2xJDYbGyHHRbgvlLvUL23jUJBf+JJGcAAdPuG8xzYujd1A0Dch0lmTPnTTRWC+yc+OLDN0Anwro5mP0JzAlpzY4NjQLbKuklUivg00RvfQLkG5QbEWiplVk5pSUTcMxIEBa9X+3vsK1qwmVQJd0Eck5fj7WlXI9ZxSUnWnD8fmuavElXJw6BhEkjFgRHqhNRoqRpPHANZaAZXZy0fIH1P1TJxxA3yBdG0J9Qovd52OU1t33q2EYashNq0w0XbahTCeoPpb+4VZQxtKysBW0zh60rbf53Ra559ObkGpASw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=E9+lM7R1JowhlYBX+VmfruAfddHjDzzYN7qz0ZfVnco=; b=LYYNYcG6UwrA9ezpc6KimFEqmSIjkB0Wb1hC+EvMIY+AEWd1fjVbpfBFcIa6dc3iwN6DzApCK7gMam8f1ErMSDE6PqtN3f0gEKL1JxgBbb35dfxezB3kuagr1Kww/qQtUR8XA+pkHGBnStj0Ui8SD+AimGuG9A+Nqeg2DpmZHfVrHvz1MpOZwYJ7Ryhk6MHUIiMO86uqEWnLFkkZJBIb/1GLW9Q9MBMEjiDmXdfsNwSay/0Q/w8X04goDYrSzFqmTGKu0UFxT529oFGmBH17wZNxpH7q5/l6NmLR6tu6oJK7H4twWfpi8xvEUb0Luq0qYuConVO572E9kh/fH5nXfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=E9+lM7R1JowhlYBX+VmfruAfddHjDzzYN7qz0ZfVnco=; b=Ss66TgdzSzXDI1gtmA0cyfyHH/hwZDnKgsNTk7s2sy0GzapW0UtPy47PYaScxwKmZH2x5lQ8dQQs+qAeG3z0QnG1IgVhrNL/U+UKCx5rRRwJxGv91XW8v5qs6w9rm5UX5wAp5495oaBpm4n85Oo/lEHLo3+LsBhb3CVXH2leJlfZLkTHvjSde5A5ts4Zhw1t15b6f51ayzN6v0gDQD7jBB0HiSku9LHieTNrR72272nAb3gSK5meCNRlTAzaESWxG6scpM9T6P7yju2pQyb259KpG9oJnnKUrpQy4XWmkFeFPe1My/rYu0ZSNzlA14wj9Qr2W/YNRJ6jsghLCebOOw== Received: from AM9PR10MB4959.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:41e::11) by AM7PR10MB3480.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:132::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.29; Wed, 16 Aug 2023 12:14:45 +0000 Received: from AM9PR10MB4959.EURPRD10.PROD.OUTLOOK.COM ([fe80::c9da:178c:455b:211e]) by AM9PR10MB4959.EURPRD10.PROD.OUTLOOK.COM ([fe80::c9da:178c:455b:211e%4]) with mapi id 15.20.6678.029; Wed, 16 Aug 2023 12:14:45 +0000 From: "Koch, Stefan" To: "isar-users@googlegroups.com" CC: "Koch, Stefan" , "Kiszka, Jan" , "Storm, Christian" , "Adler, Michael" , "Sudler, Simon" , "cedric.hombourger@siemens.com" , "Schmidt, Adriaan" , "MOESSBAUER, FELIX JONATHAN" , "ubely@ilbers.de" Subject: [PATCH v3 3/5] dpkg: Allow overriding build and host parameters for sbuild and schroot Thread-Topic: [PATCH v3 3/5] dpkg: Allow overriding build and host parameters for sbuild and schroot Thread-Index: AQHZ0Ds+7ItWwtrO3ESU0qUqQzwFSw== Date: Wed, 16 Aug 2023 12:14:45 +0000 Message-ID: <20230816121423.3956608-4-stefan-koch@siemens.com> References: <20230816121423.3956608-1-stefan-koch@siemens.com> In-Reply-To: <20230816121423.3956608-1-stefan-koch@siemens.com> Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.39.2 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: AM9PR10MB4959:EE_|AM7PR10MB3480:EE_ x-ms-office365-filtering-correlation-id: 76b77c22-3ce8-4ec4-473d-08db9e5260ea x-ld-processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: r+p799ODFDfRkqXpd7CEsFs5KFU0bM+jIS1l3u1IBg4nws23XKcTz6ZpFB68FISs/AEYXKB341OJNwfsnXTPMi5ZrTCiYQpdj0nNKkxUJgs4y1JOedSW72mRogHvVrUspN6zt44ZAngH6ytEI3dWW2PC4zK0E6vlgfpnOAz2yAvSFPHQFXDdECSfjSGEs0houEq5+MyW68xLdigCnmxyZNz2bZaCBke6Iy2tktpljZcTdPUNs3HlTQTJzfmDdNUQgblprfZeY0FEXVqIAIwX6XrZmJu+E21ncnkWqVl9N0tORbCaj0AhEOI+Hr/XJoBw6i6c1Sh1y60HnR85vSQ/8D7zY0bX/KIfisS5V+sSixJU4TlDalnX+rs0U/evE/uCjSfKrvihC7mOSiNu2IBQrX4tUbaLFm5kL/MvgxmdtJRIk60xzTi8lU2T7ZJ5qL1kAA3aKnb4KwuGRB8Q/1gbtcoFz5kT/QVXP2r1QmmcxXaK77gEERK8AySSfrsBfNVHMJtjIQ+lJb8B1XprNMiapiSCYFHXTb9yNbt+/OaOJdMD85pwYy0FUaVn5/xxApDEjublkqn2BZ2rE3I7LE4XPbHuqeYldnz6Jwl1OYiUF4CLGvEfSIbTsjDBQoyHgLFl x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR10MB4959.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(396003)(136003)(366004)(346002)(376002)(1800799009)(451199024)(186009)(316002)(54906003)(76116006)(6916009)(66946007)(91956017)(64756008)(66446008)(66476007)(66556008)(122000001)(41300700001)(5660300002)(38070700005)(38100700002)(8676002)(4326008)(8936002)(82960400001)(2906002)(83380400001)(26005)(478600001)(86362001)(6512007)(6506007)(36756003)(71200400001)(1076003)(2616005)(6486002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?sU0kapQAsD1gpJBRLAxNOqNOgd++QvkAu7iiecu3qcnMXs1vLWUpB53o5f?= =?iso-8859-1?Q?GvTgSNgKh4Hy7pHgbW/d/r7PH2Vpvslg0cvVsDvEXuZASF+wZAmTdV8DWA?= =?iso-8859-1?Q?oRLZjNo/w9XeSRG5/4PYB8NAXYFA1GOhAOxAF+a3E07qv9cYDIntdKlGTb?= =?iso-8859-1?Q?8waEPFVcxocjhAiygCSb7lD9iDPOhzKqxwW7GbwhZTS6jtKGsnhMHvcofO?= =?iso-8859-1?Q?lFH4l/mzynNPY7PijOD2VQnCxi23aGEiesfsm+OSmxRtcPxu4xTbDRk0uk?= =?iso-8859-1?Q?gtmvbthfp816yoiz0+DAM/0a0QlLMfiwXV5oZWl6PYINMFBDWlWoJapQDc?= =?iso-8859-1?Q?EUUOUozlmTkFRKa48VRnrrwhcWkJ5/TXoHNmDLFaOWjXw4wxbN1xZQp6MH?= =?iso-8859-1?Q?fBMrHlKfSg0ZAjZhC/PbCC53qROxiQRO6jbWCENArUwipKlHHt55Gr0Uym?= =?iso-8859-1?Q?2CJ2tKMjJYf0+O5qHKECGT8UNECWk7WxwZ0vGMeXdyEz8Q/ktN+n2prsFO?= =?iso-8859-1?Q?CX+N9MHXKiU+pDbaJfymu3WG7KNq0g0LAiiVkS+FMJgTeCOSwy9V9x+1gc?= =?iso-8859-1?Q?dx72cWRP2uPODBghoak3djAffkBpRhlhFwG2Os0LojVf8LdBJb+S0B97dp?= =?iso-8859-1?Q?3OtpOZRFR2MJFt42QFW2B2ATlCwE419u27jRKS1ydbg0pwguZWwTr36FWo?= =?iso-8859-1?Q?KLBZ2cUiL/E49tn671JrFGhy3x2thv7Mgn9AsKdjw9g69YwHjlw1pDfN3d?= =?iso-8859-1?Q?Kk+K9P+pJpId+JJ2j6KilWM+Jbse6ixgevrUeOP2ytr7Z2LIqQ0/QvNys1?= =?iso-8859-1?Q?FU+ZJ3ReIKVv7gmf+GsfSzeTzJXDnGaR3YtHJg8W4i2tiNFBmcymExVUlO?= =?iso-8859-1?Q?4x2e4F5jpLqUltzP/6qygB2JttGFqTkXK6x8YM8jucJCjI+HwRp2hGV8xj?= =?iso-8859-1?Q?s2iUct3YYrLUbZLvr+EiLPI1STPiZ8RZtSowSsd6tOCrZ+4t1e6kVmfRnB?= =?iso-8859-1?Q?CRUOGtXvqN8+gjUCtRNEI+7Z4bjTGKHyySHj1/Bmu/096KJaOwhnQhSikG?= =?iso-8859-1?Q?GD8QONRo7Tj8Y+OCdXJKLU5U51roesHOvc6ah6UjYatYRiuS/F5EpH/eua?= =?iso-8859-1?Q?DbfsIE6PUIe7jZGkwzEFYPQbYbn3pFrqLJzu9zNX94DBnX75Pkpo1/Ucko?= =?iso-8859-1?Q?NDI4fxdwdh1GRN2kR9PWuaVpHlwx37zO9JgbsoKcsM2raHtb++eLG1bBJt?= =?iso-8859-1?Q?0HleVRm5aNxTB7EPuMNX9ndtyYahD9Fr0rU3iMkqhDoyKr+zsF3WWBaAk2?= =?iso-8859-1?Q?c4PXzCnLGi1cT6Uv1c0sclmxLCxUO+jwpRIrvS5XWn0C1tBKdKweJZb9KA?= =?iso-8859-1?Q?yPhpW5AFU4fEdVuLboEwHhLw+N5I7JILN8gva7cY5LHJ0N+t0poP5QN9Su?= =?iso-8859-1?Q?AzuQe5C1wk6LmEHmCzsr4T4by9+q5b3GAli9/HS2gNFoQaxQ+CVJcTh8rp?= =?iso-8859-1?Q?Gg+DAbqKjvLPUFxhKtNsuFoJ3zEu9R/e2urtzR9Twdj0R66ToXyc7dZ+gT?= =?iso-8859-1?Q?h9UTF0ShNOYSu9lWsFE0DVPXsvO/pAfWUsUt0gV3aph32riINLnHM4QrYe?= =?iso-8859-1?Q?mkBYpr2H3eJYKTBKtLfmgFVXmdh0lN8UBX3bodnYudzevayDwJb1LAlQ?= =?iso-8859-1?Q?=3D=3D?= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM9PR10MB4959.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 76b77c22-3ce8-4ec4-473d-08db9e5260ea X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Aug 2023 12:14:45.3282 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: BGZ9/b+1vpp//2ECLew1ksbybembpoyI2fm2o68oYJ0w6ghYOh3hSGU0PIPw4cVU6NPypO2V78PoYs0869bLSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3480 X-TUID: apFVWB1DMiGH This functionality is initially used for custom linux builds using the "-compat" and "-native" multiarch bitbake targets to run additional target or host specific builds for kbuild scripts and tools. Signed-off-by: Stefan Koch --- meta/classes/dpkg-base.bbclass | 19 ++++++++++++++++++- meta/classes/dpkg.bbclass | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclas= s index 7b02f378..eaeb0e8b 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -208,7 +208,7 @@ dpkg_runbuild() { =20 def isar_deb_build_profiles(d): deb_build_profiles =3D d.getVar('DEB_BUILD_PROFILES') - if d.getVar('ISAR_CROSS_COMPILE') =3D=3D "1": + if d.getVar('ISAR_CROSS_COMPILE') =3D=3D "1" and d.getVar('ISAR_SKIP_C= ROSS_PROFILE') !=3D "1": deb_build_profiles +=3D ' cross' return deb_build_profiles.strip() =20 @@ -223,6 +223,23 @@ def isar_export_build_settings(d): os.environ['DEB_BUILD_PROFILES'] =3D isar_deb_build_profiles(d) =20 python do_dpkg_build() { + schroot_dir_override =3D d.getVar('SCHROOT_DIR_OVERRIDE', True) + sbuild_build_override =3D d.getVar('SBUILD_BUILD_OVERRIDE', True) + sbuild_host_override =3D d.getVar('SBUILD_HOST_OVERRIDE', True) + + if schroot_dir_override: + d.setVar('SCHROOT_DIR', schroot_dir_override) + + if sbuild_build_override: + d.setVar('SBUILD_BUILD', sbuild_build_override) + else: + d.setVar('SBUILD_BUILD', d.getVar('BUILD_HOST_ARCH', True)) + + if sbuild_host_override: + d.setVar('SBUILD_HOST', sbuild_host_override) + else: + d.setVar('SBUILD_HOST', d.getVar('PACKAGE_ARCH', True)) + bb.build.exec_func('schroot_create_configs', d) try: bb.build.exec_func("dpkg_runbuild", d) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index c596adbf..7d659741 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -102,7 +102,7 @@ dpkg_runbuild() { DSC_FILE=3D$(find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -print) =20 sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository=3D"${ISAR_APT_REPO= }" \ - --host=3D${PACKAGE_ARCH} --build=3D${BUILD_HOST_ARCH} ${profiles} = \ + --host=3D${SBUILD_HOST} --build=3D${SBUILD_BUILD} ${profiles} \ --no-run-lintian --no-run-piuparts --no-run-autopkgtest --resolve-= alternatives \ --bd-uninstallable-explainer=3Dapt \ --no-apt-update \ --=20 2.39.2