From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7044234567900725248 X-Received: by 2002:a2e:9697:: with SMTP id q23mr3572649lji.354.1640113668793; Tue, 21 Dec 2021 11:07:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bf18:: with SMTP id c24ls434190ljr.10.gmail; Tue, 21 Dec 2021 11:07:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJxdde4+7fcVGXkilPEkut2TntPRRR8AnTVI+zWlklHD607GyGD9K5FhLRezfKuWe1hRdLq0 X-Received: by 2002:a2e:8815:: with SMTP id x21mr789468ljh.442.1640113667653; Tue, 21 Dec 2021 11:07:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1640113667; cv=pass; d=google.com; s=arc-20160816; b=0B6kXedpDJiAXcQpS8WfMxaanrdPRqV0pxpPg0HKz4SD9w/sxPY0caWLStx8phrc+l JY+mIBKyr4/+iuhpaqnT5xERn0XbmQS0EIE/ST0su3yt5ZNlk8K5oHSCJ5pRd63aP/G+ /bz3epalRDubrVr/7U+qwvwL1wqhm8tlrDUYWPToLSyJM2WBUUC+CNaul+tj+RHuZit2 DxESF8Jb0vDadEA5qgEomfcBus37X0jEa3/XhPoEUXvrsuw1gjN+yi0l41s0uFWqt+oG RGp+2IDi0yCyofZRBreqp7pbq2Ybin31kObTdYg3mPQeLOOi/4P8CTUMCO4UW2qF8ICU Zr/Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=p2ocJe7RTij6O9ubV2VJtweY8gZPsPmTT8g8At1FlDM=; b=Srqx06k8TSSEjI/jFDqW4/YtkEde620/aJJ3QiQBF1tzpPXNWcA799aR/15jRWKn6r VzM55YY4IocnbcHelVckl3xG5rJHRCkuYcEDeB6xOPJbEkhATp/mehOFKEE8cSKE4jqT KGg40x4nVkUgfgM+RImX3rmVPpt6TuKSgT2clPgQ4nOynGrh0Bgxmgnd6N2PKnTzJEsN tmWkZrjeMahLy/mKxpEDR6EtLWZi/yrTtY2gSq5fgrn3W2cDQWNEuyyZlVbHS9Bi86NE uqR+ZbB/0lxL5MjwiQXb/PmvLPGK545JW17OQGC6dVHf36EDjZJOoDfdeuH79brB9u58 5xVA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=THnOtcm+; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 40.107.22.61 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2061.outbound.protection.outlook.com. [40.107.22.61]) by gmr-mx.google.com with ESMTPS id y7si993888ljp.7.2021.12.21.11.07.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Dec 2021 11:07:47 -0800 (PST) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 40.107.22.61 as permitted sender) client-ip=40.107.22.61; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=THnOtcm+; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 40.107.22.61 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JFWA4aNjb+vWQ4cfcc2YSaHdR86mMxZjoonvuo2B7zCB/BXxSdfUgIyhDEY8SuF2lzK/r8T4C2PSwV5QDVXNSrK5oDiWYfTDUnlCGsMehnBlflyICeF/PTpsZ51zqn7YJNDqtY24dakyT9nU1G6uRIxWVh6z7GKgU1DKVa5JrF/pS5cMmQr5j+Mgk9WHFE+nr+VLTVgxSqjhn7dE/rcdKTixcqS12FOYn8QCJLgbSasTUVxnV9iFTiJ5c+767tilYNVEOXQAhn1guu5HOaCW+PawJ7vLmVK5IP5Ldsd1aFVLu5pQJSqm6YkXrJhifcJHI7lQw+HoV0ue8lIIYiFDJA== 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=p2ocJe7RTij6O9ubV2VJtweY8gZPsPmTT8g8At1FlDM=; b=drflZTX/09hGr85HLokVKP4YLhjKj/PZX8gqMGmMn9lo4Ab/pb9AVhGl8T4F8WROv3vVIZ2LVtOcRej9ro70By3TxxEoWw2kT8tovdexzvpzaFnj1fHd9Evhby6BY+K39vOtIBwmjnM02fZYOADwRsL29Gy8B/7lmCkji5OTVtH6josu0sfsCFRF2ajbaCYAYX1caVAPU2m4UVg9FRtTzzvssrrCkKH4n5f7XIqIXI2/K2PN16awRazPg8Wy1uHwebOeO2+14kv0elow3yCyvLwKb4nEGLOOfqtxys+I3KRqnPYJ6TBJoVBB3eR0XxP/wvalvXhIPTAkju7lTOtSeg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); 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=p2ocJe7RTij6O9ubV2VJtweY8gZPsPmTT8g8At1FlDM=; b=THnOtcm+xFibystIGfS1v+0czPQy4Q8Z9elYBCyr8tbGWiPYUSRM5tKBqm9pm59fyIC8JVlbuQZmINWUmja8tixPj7BN63QB4zYg8G/IvnFelOwOJaVdXMRyh9zzFI3Jy5iAjeNaAleVVTxNLgCA8K6+SKn1ZKnp92QBTdxgdicUYwHhjbmyTqSEgAJwHxICCsn6j88wPkyZcWJNLrgQ4+Z2WvULQpX0mjpeegA99paeqy9VAiBTIjjAaYkWmUZJ+cJLjNfmYSTz7C41xAfl+jYiBb9nQMljvbfsqvrhfboiQRHO/rREkC2anoFnbtQPUmigdj1FPDdDck0gZFp1MQ== Received: from SV0P279CA0006.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:11::11) by AM7PR10MB3528.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:13a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.17; Tue, 21 Dec 2021 19:07:46 +0000 Received: from HE1EUR01FT010.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:11:cafe::52) by SV0P279CA0006.outlook.office365.com (2603:10a6:f10:11::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.16 via Frontend Transport; Tue, 21 Dec 2021 19:07:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by HE1EUR01FT010.mail.protection.outlook.com (10.152.0.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4823.18 via Frontend Transport; Tue, 21 Dec 2021 19:07:46 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 21 Dec 2021 20:07:45 +0100 Received: from MD1T0KAC-VM.ad001.siemens.net (139.25.68.224) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 21 Dec 2021 20:07:45 +0100 From: Felix Moessbauer To: CC: , Felix Moessbauer Subject: [PATCH 1/1] add support for debian build profiles Date: Tue, 21 Dec 2021 20:06:53 +0100 Message-ID: <20211221190653.1142246-1-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: felix.moessbauer@siemens.com X-Originating-IP: [139.25.68.224] X-ClientProxiedBy: DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26604.002 X-TM-AS-Result: No-10--14.007900-8.000000 X-TMASE-MatchedRID: byT+LbHB2p94FTWzKCjc1RJDErdDEki6Jz3M6ziC1QjvdQQaH57xxhsC rN0VHLG4EzBS/LIYH/e1jg3WdTw5hNZfk3R0CkuFXncnPcSgkahPOQHvrzcuc2wTEruL9ObTP6T ki+9nU38HZBaLwEXlKIpbwG9fIuITxgUPGeV/TQ+qodq8BI61FXSZ0dzoXbN+72Rb2bEJC+2uq1 db4CmA1kYx760ONDcWFwoS3xvVMr+2qiGT64iTp3Rug3/L7uZRBXQM4inN7el9ckTZtnkTLRNxI BdPjFbglaO5BvPDtzdMKDe9oUpiJbQOx9JC5e5IbJFNzuxzkj+jxYyRBa/qJcFwgTvxipFa9xS3 mVzWUuCgZHIBpyeFpkMgMfUgo2Z3rRA09cOhJ2ZSGJrdZEPxBvRTr60LMxEzftwZ3X11IV0= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--14.007900-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26604.002 X-TM-SNTS-SMTP: 6904E94979DB1EE97294A50D0F992E15E80886190F89BF3A3AF9289D236A2EE62000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1fe8ac26-1264-464d-ff4b-08d9c4b52c4b X-MS-TrafficTypeDiagnostic: AM7PR10MB3528:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KUub+G6klKKFED4hQP9m276vzq6eMuJqaPcFBPBY8iq/h/w3LxYe83wGSq8owkb8AMWU7h+Ztsrbtm4HikYWL7fVjp2QaZSHco0qMjv8yOcyB0ETNlPXJaiP6m9neKiGXGAjwC0e2A3DvPAE7T3GPnZQyKI2AkzzYDJkOMc7iZfxZE/goZ8LiIJBNSoBuAWwWy3GfOE9mbGm7PG8rYt8IHWxJ3j54cAQ2g+FdZp5Q/tCqZFR5WBDOHudUKgkto0cRIWLZvfPKwa0ouT4uILCVA44RAcKhReBv/6YCOkD1vG9Hmw3aOBQzQE+RfB8/Mke0DqH8Cbk99nAHkEuyG19XcWnYtrEJ9++jMi+Bv4fNMSOInqvWzVBf5VBFuOKkLObHSJ92vqtgblPC3w/iNtUUUe8iFuiM0JGuJDbSetuezEkiZ9zi63AgH/Eg7N1duhgxFYEVYjipqjUJt3r6LyiYa2nXMlMlqlG1km6Viio3G+FxAfwRhbSuo3yx8iezoiVpPfZF8fkqX3BfEnrWhej/3xY78xdZeewKKULZO8s0umT+UGu6AeJUUzZHR3duHK5j9I21pg01swhBLCfQHeVmTfupq41D48OwOi3OWJvoYqw5HIzfyRMsTs21x/I3wyQD+sN1vlOpOItErahUhI53CQxY110k2/j2sqEkDjeXXe1YrTayqv8PxhdWDaAUXgYB/Z93EWJ0jN783NKYZXdv6Tut+yuY3IWc/J1B21t0FWwHeneAcnCPKe4WcaOfMNAI+/IEZdsNyj3L6/Y3Tnxi3aBBQltFNQrnzqNcCsAg3c= X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700002)(8676002)(36756003)(54906003)(2906002)(8936002)(40460700001)(316002)(508600001)(36860700001)(26005)(956004)(5660300002)(16526019)(186003)(2616005)(47076005)(336012)(82310400004)(1076003)(6916009)(107886003)(70206006)(4326008)(6666004)(70586007)(83380400001)(82960400001)(86362001)(356005)(44832011)(81166007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2021 19:07:46.0157 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1fe8ac26-1264-464d-ff4b-08d9c4b52c4b X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT010.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3528 X-TUID: TGxRg2lq4Q5W This patch adds the bitbake variables DEB_BUILD_PROFILES and DEB_BUILD_PROFILES_CROSS. The values of these variables are used to define the DEB_BUILD_PROFILES environment variable. When cross-compiling, the DEB_BUILD_PROFILES_CROSS variable is defaulted to "cross", to be consistent with upstream debian. Signed-off-by: Felix Moessbauer --- RECIPE-API-CHANGELOG.md | 8 ++++++++ meta/classes/dpkg-base.bbclass | 12 ++++++++++++ meta/classes/dpkg.bbclass | 5 ++--- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 55836258..f95f7db5 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -306,3 +306,11 @@ When using the plugins it is advised to name the partition "/boot" and to exclud The variable is renamed to get closer to OE/Poky variables naming. The old naming will still also work, but with deprecation warning shown. + +### Introduce debian build profiles + +All recipes that inherit from dpkg and dpkg-base can utilize the variables DEB_BUILD_PROFILES and DEB_BUILD_PROFILES_CROSS. +These variables define the DEB_BUILD_PROFILES environment variable which is available in do_install_builddeps and do_dpkg_build. +The DEB_BUILD_PROFILES_CROSS bitbake variable is set to "cross" when cross compiling. + + diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 6704385b..c1588528 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -13,6 +13,8 @@ inherit deb-dl-dir DEPENDS ?= "" DEPENDS_append_riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" +DEB_BUILD_PROFILES ?= "" +DEB_BUILD_PROFILES_CROSS ?= "cross" python do_adjust_git() { import subprocess @@ -201,7 +203,16 @@ dpkg_runbuild() { die "This should never be called, overwrite it in your derived class" } +def isar_export_build_profiles(d): + import os + deb_build_profiles = os.environ['DEB_BUILD_PROFILES'] if 'DEB_BUILD_PROFILES' in os.environ else '' + deb_build_profiles += ' ' + d.getVar('DEB_BUILD_PROFILES', True) + if d.getVar("ISAR_CROSS_COMPILE") == "1": + deb_build_profiles += ' ' + d.getVar('DEB_BUILD_PROFILES_CROSS', True) + os.environ['DEB_BUILD_PROFILES'] = deb_build_profiles.strip() + python do_dpkg_build() { + isar_export_build_profiles(d) lock = bb.utils.lockfile(d.getVar("REPO_ISAR_DIR") + "/isar.lock", shared=True) bb.build.exec_func("dpkg_do_mounts", d) @@ -278,6 +289,7 @@ python do_devshell() { bb.build.exec_func('dpkg_do_mounts', d) isar_export_proxies(d) + isar_export_build_profiles(d) buildchroot = d.getVar('BUILDCHROOT_DIR') pp_pps = os.path.join(d.getVar('PP'), d.getVar('PPS')) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 7da73341..8e5626e8 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -9,10 +9,9 @@ PACKAGE_ARCH ?= "${DISTRO_ARCH}" do_install_builddeps() { dpkg_do_mounts E="${@ isar_export_proxies(d)}" + E="${@ isar_export_build_profiles(d)}" distro="${DISTRO}" - if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then - distro="${HOST_DISTRO}" - fi + deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ ${PP}/${PPS} ${PACKAGE_ARCH} --download-only -- 2.30.2