From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7044234567900725248 X-Received: by 2002:a2e:9a91:: with SMTP id p17mr34833218lji.154.1641290589934; Tue, 04 Jan 2022 02:03:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d2a:: with SMTP id d42ls454221lfv.0.gmail; Tue, 04 Jan 2022 02:03:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJw2lJhbkflgC5wMXeF9icYFP9eo5FiTlN676mQ8Upulxh1/szVqbXouCLiT607Y5NkwS80B X-Received: by 2002:a05:6512:168f:: with SMTP id bu15mr1236963lfb.129.1641290587991; Tue, 04 Jan 2022 02:03:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1641290587; cv=pass; d=google.com; s=arc-20160816; b=gC6Ooysdt/aK+27XzG1p9No3YGGBArJ9ULDA4e7swZvqSwPSpQoNkbBFlJJz+M6lWa 4aD7yXb9UOmAqt+COGQjVwAw0N9EAHB9yy8+Ca+bjdaxf3SLmwEmbVSjHvcYvvtkUreY PU4CmZHiVPM/Ms/6rAV9Goip8pwAhZDdXYhGzkflOIhqlRsESiu0zXy8X8JQdhukhqqh aJ7QaVUADWLF4H8J1FxtqAXsaK9Z8aF2mTKyGNwe7V13IMXceOtUDe4BU3GC1J2UfOt1 Ja7Q606/9A2RlydgZZyw+bAaCca6GjrDcC8iXFBtLarIiV25N9SPtNeS5cKkODlx2P7M 2z3g== ARC-Message-Signature: i=2; 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=+zdVSBS8E7gnV1f7lat4ObhZ2WAtJLM58Un69OYlzWE=; b=oC7qocEYH20qAZ8PbuISblwNv0KMy6PxI7UQ+j0s7FsXS7U3z76ZCPDwq1iRa4Li9+ j9S45CXAk2tdA0vJ6q8WWiQjf1qhEQibszIeg9Dv8h8sk2TTB+V3PzuBmTNi9j68RAfR 9eT9+SX+TfqW/O6Zk+2c5A2ouAPDqiE1RlmdOzjcc4OsFc49tBxD9Gpn0fK+bQF6iGE3 kWD0yHhrOUkfP3gNWocxwb6VvCzH6QKFHoBnUE+EN4qFqsddO/JWv6Ujpz342gm9+k2C aHPUybFE+h4cqE2O0VOKbkNcWiKHiSNhgKNHmtJ99HMYU28nN7p632SeLD4L0y6k6U6n 1xGg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=mFnLWETc; 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.21.70 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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2070.outbound.protection.outlook.com. [40.107.21.70]) by gmr-mx.google.com with ESMTPS id e4si637133ljk.0.2022.01.04.02.03.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jan 2022 02:03:07 -0800 (PST) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 40.107.21.70 as permitted sender) client-ip=40.107.21.70; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=mFnLWETc; 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.21.70 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=MrdBFxWTfM/2do5aBLkJkqUTGFJFDY84vaDWG+bL60z7zjyUuz/lxvp0JjptrjUbzj383mjuN2SSYVOz1e3P0Jp6/SzoRIfftuLXsT0nBtDy4QXkvTSrG6G6otF2JS9bCPSeOKGwEmCLU82orvnpHWPlC2JP/J3WO2fm9RPz/CFEjejR1M5JxIeJZ066pdPg2Q0rofz/SMZ/JNt7MuXDeFZrLWiSizLXe7zgxgIDlxuQnqqHhrLJBwjpCgiMWgeGMPZApvELzJ0TSp/gxk7duYFSgU6nTtWny8gexKAnqPX8ywE3dGhoIUYqrWtyzMO9YBkj/LVTSCHtIwLnhaQUpQ== 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=+zdVSBS8E7gnV1f7lat4ObhZ2WAtJLM58Un69OYlzWE=; b=iKlyVIrzXALoR7oPwXzHXSnXQhc8qZyX8lmNMNusRME4b1kAxyddbjc8VydvqfLi9CaiBbZrEPjGfMI7CoU3gcUsq/7MJbWHKFULmoJsChXt6EsFmweglKiraxaHe20sBzp1GSrB1ajvdzU3z2pPv3gotOsHwn/bSM5nMeQQIBqn7ofvx9QwHgipWMw+MFx85B/qUdyaTBkYOPvJCFXKBuAmIRNnb21FdBQnNUc97T2znGvqm+7qv/rIyqE2aFr5/PJMCrVkz5SvPFAcGOi/lZy6iLpeApS5uSb92FLJJGCB5A1OMri3vdm0uGfq+IUuxobCn4xfcukfh83nBt3V0A== 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=+zdVSBS8E7gnV1f7lat4ObhZ2WAtJLM58Un69OYlzWE=; b=mFnLWETc/C2GLQ6/BFyYOGnIhtlpIme8HPso+tNvANLYEfKUeRNwvEQq+3aTCsKg8KHL6q8ov6ZwfRm0cOXgk9hbptiCL0eO2wtezDXD+dhvh4p6qgXbgEsQOHXhgOe5jXrBdd0OmGOr2B6wu109ZNMIXlrj7aj8IMODChGSB5WuQvONJhMQcKHdlf7XOO1CJnCuunn1MsG80fjPj8EH7rnOUKklyZgxhY0kpuctAgFDT8v4weLRM1+TdpKD1p+iQs79Y57zp2dLecZ6JZgZj1nZkXw01MbqoxcwtCMwUt1BtUULq/IbasVqNebA3BXdMXOXEPXxRejUZxzV6ctTEQ== Received: from DB7PR02CA0003.eurprd02.prod.outlook.com (2603:10a6:10:52::16) by VI1PR10MB3199.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:13b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Tue, 4 Jan 2022 10:03:06 +0000 Received: from DB5EUR01FT005.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:52:cafe::8a) by DB7PR02CA0003.outlook.office365.com (2603:10a6:10:52::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.14 via Frontend Transport; Tue, 4 Jan 2022 10:03:06 +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 DB5EUR01FT005.mail.protection.outlook.com (10.152.4.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4844.14 via Frontend Transport; Tue, 4 Jan 2022 10:03:06 +0000 Received: from DEMCHDC89YA.ad011.siemens.net (139.25.226.104) 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, 4 Jan 2022 11:03:05 +0100 Received: from MD1T0KAC-VM.ad001.siemens.net (139.25.68.224) by DEMCHDC89YA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 4 Jan 2022 11:03:05 +0100 From: Felix Moessbauer To: CC: , , "Felix Moessbauer" Subject: [PATCH v2 1/2] add support for debian build profiles Date: Tue, 4 Jan 2022 11:02:34 +0100 Message-ID: <20220104100235.719079-2-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220104100235.719079-1-felix.moessbauer@siemens.com> References: <20220104100235.719079-1-felix.moessbauer@siemens.com> 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: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89YA.ad011.siemens.net (139.25.226.104) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26632.007 X-TM-AS-Result: No-10--15.098600-8.000000 X-TMASE-MatchedRID: wMy3QTYoRiB4FTWzKCjc1RJDErdDEki6Jz3M6ziC1QjvdQQaH57xxhsC rN0VHLG4EzBS/LIYH/e1jg3WdTw5hNZfk3R0CkuFXncnPcSgkahPOQHvrzcuc2wTEruL9ObTP6T ki+9nU39YwVHjLI3nekAc6DyoS2rIj6kCfX0Edc4vUAtX6vsFXBm83hQoQdoOqSG7nd+vxDdCie YsjWBj6Zj0gKRuKXQnPlAWwfVA2w66pfmyQVW6MGzrVU0kk4G7z504cKwPtsaIf3m0sUfx5yUnL zk1+IxzFmHmGZdo33eXqrF0nhL4j98AZxXJ2Z3fl3rAawweR3d2Q34hT9bZ8pVIEKhlTKps64sV lliWKx8fE8yM4pjsDwtuKBGekqUpOlxBO2IcOBazdxYJ+PEyNKY4EG8F3/AdhC/2wy1nya6d11C PbxdcBCwTQkDW03Co X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--15.098600-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26632.007 X-TM-SNTS-SMTP: 5BEFF35E8D53ED4962DF6C21B49D7C8367A6B495214231965CC4D34968936D762000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a876a0d-c408-4f35-df76-08d9cf696767 X-MS-TrafficTypeDiagnostic: VI1PR10MB3199:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vg4QcQcZQGgwG5nmfHsHF4JfhM7ZsQ0GO1Z3Rded/K2DeOVucXQLX8nN4KpNZYVNF5XVHE3UbeurkINJzsMjK8lvHztqVt03hJTsUxzSeng8WeDPJQ/PuV23LLlfMeT10hfKZd//1Nlt0/NMV9XYBBpJDnT4WLrY6uL82VDwTCapsEY2oYfkgqEhzFotUN4sSiDyn564pyNbzBbNlh/ddDydtxfoM5CH0axEmsVdcUHeYZ/zXsSkcGpo7k0mwNCrDMrOWANfyqBL4+aAxFPFU9kTeNJSBTrG+6fRTQir4TGtd7diTRagFcHMab1phwOkZ0L36dc5A8aKOIWo+uA9zUFfJFJvnfaD3LKQyAgzNA3dOZlk3R2tkQs2f0MC9ELq+w9NkTpqow/JDAAgAaz0/l9xVA8zBJd4/ewDY88ZJe1B5VU7I/mX2bKR/sX5D0mhF/Y9WQ+cYOf8A9UcdOjpTclAHB6FQ6DOyFPLXE8KqYYW8oYHaiGCy1SCXOtgs321eGt6at8wBc5SpQnOqfCW/afcHbYEgr7438X8tOsC21++c7mIQ/G5Y3UG3/snWwcosviO8NsNnqsPuU3CeKrzZFZh3nCJAG8bv0RAmeRaci8IorkTQA2QMkvsc1uWlfzfVARQ68ObSCvSG6O0dcuwKpFyMvMibuLalZwWlorWEsGRX/2CRhrsglEN5ZIqgfD7ERyATg70T8qssXzIN8IMewEdNs1QKW2LAvOs+CEO6P7XualkPNR53Xxm+SlkJ5G3mlURsSU83P+cFo1BHjs3a+vATRC/Aabk5VnqBCrE/NQ= 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)(5660300002)(86362001)(1076003)(2616005)(82310400004)(6666004)(336012)(956004)(54906003)(40460700001)(44832011)(356005)(316002)(508600001)(4326008)(81166007)(82960400001)(8936002)(8676002)(26005)(107886003)(70586007)(70206006)(47076005)(186003)(83380400001)(16526019)(6916009)(36860700001)(36756003)(2906002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2022 10:03:06.2231 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a876a0d-c408-4f35-df76-08d9cf696767 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: DB5EUR01FT005.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3199 X-TUID: luiVzykI8pP3 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 | 9 +++++++++ meta/classes/dpkg-base.bbclass | 13 +++++++++++++ meta/classes/dpkg.bbclass | 4 +++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 3bbb42a9..1f3a19b4 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -314,3 +314,12 @@ The "NAME" used to be rather static and the TAG was always "latest", now the val ### Renamed variable CONTAINER_FORMATS to CONTAINER_IMAGE_FORMATS The meaning remains the same, just the name changed. +### 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. +When cross compiling, the values in DEB_BUILD_PROFILES_CROSS (default: "cross") are used to define the environment variable. + +For a list of well-known Debian build profiles and common practices, we refer to Debian's BuildProfileSpec. + + diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index cb5ce4a9..05c1cbd3 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,17 @@ 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 '' + if d.getVar("ISAR_CROSS_COMPILE") == "1": + deb_build_profiles += ' ' + d.getVar('DEB_BUILD_PROFILES_CROSS', True) + else: + deb_build_profiles += ' ' + d.getVar('DEB_BUILD_PROFILES', 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) @@ -279,6 +291,7 @@ python do_devshell() { isar_export_proxies(d) isar_export_ccache(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 27fe84f4..68f63f93 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -9,10 +9,12 @@ 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}" + 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