From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057909071463055360 X-Received: by 2002:a2e:b74c:: with SMTP id k12mr11667830ljo.312.1643732202207; Tue, 01 Feb 2022 08:16:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:178d:: with SMTP id bn13ls3330143ljb.8.gmail; Tue, 01 Feb 2022 08:16:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxhHviUfL9rxTQ6gzjEJej/lvUpIXR4CfFlkUDBBESKMFtwuNRGCoAPjJ8vZI/ftkhVfIdF X-Received: by 2002:a2e:8415:: with SMTP id z21mr17286958ljg.134.1643732201185; Tue, 01 Feb 2022 08:16:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1643732201; cv=pass; d=google.com; s=arc-20160816; b=aXHf7ZwRwBDe8C6sK6x7w0d5EP5SpClFpr5WTi6+tNp+wKu6KeRgulnZFKOt0XOfy8 ROvhjaG6zC3OdVVBCpKJLE0bA8bGGI18tFJav7Ji/xnsacRrhEyj0tBB/6OmBXHbHETC +o16+DhVw264Rx3SZkwAM47coLADvqkirlmzhwbCW4xEsWuY4bhcUIiXtyt7vCxrkZ37 ywOXeHUSKchRNDGDzpBQG/B/Ho0M8zSJwoWKNH3gsBS2vkCVIxXXCD7WPwgmQKqyuV18 RYY/GdWkMvq5R7UNRu0ocjxGJ+Isnv80PUtcnj4mc4T6oAJ4n1nlZNXegomcUGKPc66Q 4Qpg== 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=Qcw1ImAS7fD/za0ED4nE+OGchYbBhyIfJ1h7Q1GLebQ=; b=04bsP1IoQ4YKA1ZsKv5yqe2uEy/eUNliozzoTIm4wRGUJdu4JydZmvSxrYP2kCOAcn TV+0X/vV55M8RregIg4O4S7FqUYrnxNLZvX5NrVNpPmjx1ofjlf44y8QZzF56j5NWIpo RRrc1DPPO2zUmxpcb0jmff7kYXa8KWL4Uv+iVxkYt9DswVbAYEUf2KWK3GM1M+hqDgsO ah8SykKLUIebxYb5boKBtAoJG0h7Y09qB1waPr+YN9X6BbN9iod6ff87jhME0L/IwGu5 kQK4SAbiGSW5NPqPk79TQ+E63481edsPDETHoXgaLITSP0AIlrv1RVLWu7g30PHBEl+r p+Aw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=JZNEOSG4; 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 2a01:111:f400:fe05::617 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 EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on0617.outbound.protection.outlook.com. [2a01:111:f400:fe05::617]) by gmr-mx.google.com with ESMTPS id q5si674298lfg.3.2022.02.01.08.16.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Feb 2022 08:16:40 -0800 (PST) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe05::617 as permitted sender) client-ip=2a01:111:f400:fe05::617; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=JZNEOSG4; 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 2a01:111:f400:fe05::617 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=KVND3wSXMxdl+eELmoYmK7p4GpN+qji9kAFIdT8mOiYGZ38/UpVcSMzMfKyhQSvQb2lauIiuaBaIB0Nji3XyZ19ww520Z6ro79W5NdU3HOLW7LpUuUfGxIJylw+E+d3IDWPfnYQjU0E7rxXumC/bOSO/l4NupuXLmFx2gTkudNWiGwMTFWqLb30TIMvrFkIijC+9CZxmI/kPceRV8cnIuquyAS2854UWN12rG0v6WjX7+TPQPv2ApNUCf+30OOHfOOtACI5cYV0PFJTWg998Q+FxyzR9WNH4HpZpRN2/AGX+jXl0k6n4CWOGc0WmBjUUqUIy84AJFAR73aV2SP7LXg== 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=Qcw1ImAS7fD/za0ED4nE+OGchYbBhyIfJ1h7Q1GLebQ=; b=ZPiiS3yIzCEAxyV1hYdk364/Eaeg9aHWTYIBuSZOljLXnAdycBmFdUhMJdwKdLK0jzIEMkErqGh6y0AgFFWWSqAdpkvdF8e6DnANlXBWmxmyN2nbBPVpdLg7ZyOOzHWMdLjDVJpw7lM95SDXjM+0wE4OBkIleS+dEdWwDSdyVa0zZrPPu7SkNRNkuD2SCwH7t1Npjtzhg8Wb2qYuLe4xZJKosKZd7WzLa78vGO3sUohNKWI3W3fiCslZ4C6AeMHhR8/PSUE8fmV5yepnbaklEBdfBOyrewl8BqO+Q37yvbJBi/pz4h9EJrj7QTsquOh9L/Mh0n0UcFaQxaSsFNjkrw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) 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=Qcw1ImAS7fD/za0ED4nE+OGchYbBhyIfJ1h7Q1GLebQ=; b=JZNEOSG4igMe0Oes6TRyG/GNhA5+d87IJTFnJ7xV/R8sAVAiuX8s9UL38GrC9jncp5pAzciwrt/BBUWb5o/1cl4B26B9bk0kIBANGynsk8oLM/SGmB9crEUdSgdXc/ofMN+CZNWP7/Ny1lvucDTjwD9fkaQijGiSTKPHLI9lvxPdyWiZZOVgOwn91u/c4bxpXQNrNSy1MOEWN7uwZaK/Ehbg1aFeHYjVPozXokbRnpsY6VjEejvyeR+0V1cQkEttQQSE1yo2pylVDUDEuxxK4IOpF7O6oqkodmQuJ0e/6fn6Daq5mksrImSBobfUAUuRI5UGnSRqvJHkF+4ANG5zew== Received: from AM5PR0601CA0029.eurprd06.prod.outlook.com (2603:10a6:203:68::15) by AM9PR10MB4338.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:26f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.11; Tue, 1 Feb 2022 16:16:38 +0000 Received: from VE1EUR01FT053.eop-EUR01.prod.protection.outlook.com (2603:10a6:203:68:cafe::72) by AM5PR0601CA0029.outlook.office365.com (2603:10a6:203:68::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20 via Frontend Transport; Tue, 1 Feb 2022 16:16:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) 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.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.71) by VE1EUR01FT053.mail.protection.outlook.com (10.152.3.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4930.15 via Frontend Transport; Tue, 1 Feb 2022 16:16:38 +0000 Received: from DEMCHDC89YA.ad011.siemens.net (139.25.226.104) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 1 Feb 2022 17:16:37 +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, 1 Feb 2022 17:16:37 +0100 From: Felix Moessbauer To: CC: , , "Felix Moessbauer" Subject: [PATCH v7 1/1] add support for debian build profiles and options Date: Tue, 1 Feb 2022 17:16:19 +0100 Message-ID: <20220201161619.726934-2-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201161619.726934-1-felix.moessbauer@siemens.com> References: <20220201161619.726934-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: DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) To DEMCHDC89YA.ad011.siemens.net (139.25.226.104) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--16.287600-8.000000 X-TMASE-MatchedRID: i+fXnFov1O14FTWzKCjc1RJDErdDEki6Jz3M6ziC1Qh0+657dxGJGNhQ O8CvZj/X0k76xiWF9KgY8dfj5o9RIsB2vcKIE7eOJhAxV/XBBBc3YZfOPpsLwvbta0OAYFzyRDI ePNhxjQpQlqsd8gjNem9QU5AyX6nlvEyiFaMC8iHwInV0qiEvC3GK+1y854QaA9lly13c/gEBDy a2JbH/+gaYevV4zG3ZGNgrKd8BnjBYxgGURqSTGiaNPvkMKAC/94K/U9yoT968coKUcaOOvf415 9kh1Jlcp04odrdPZG3btR9+Xg5A9UUWuNOlf2MMGlzBIhy9tN9oDvOMa6enniYRREGYqtmUs8ty Hh9yzU76upRQmBhZ9FVxc/d4wt8XLYfO3d0m6h1LCcnN2jUq8RgNCf3m6cHziuSat/QiCL8SfW9 4/2ln5VbDmwy31ULEhzsNpTq9I+43Opzody2+qiudgPSw6RX/LBkITZ1S2Vg37vkU5XIl4F0yAJ IUk3/nU72YOAMDJjieAiCmPx4NwBnUJ0Ek6yhjxEHRux+uk8gVQUmbYHof0Q== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--16.287600-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: DB7B48237A3B5DC534D8CC96FB22FC046357A87808F92D66428E803C7C0F6EBF2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 372de35e-540f-49e2-d540-08d9e59e3983 X-MS-TrafficTypeDiagnostic: AM9PR10MB4338:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XoiuUuJLKQeEP5aI2mPbJfWicIjUQW5cdJhgWyxw6iU5jFBch1QDT2GH2ik/ucCu8jrnmGH7PFfWGoPNUq7WZ5dDWWeDER10gfG8ZohbTskv10CZBK56bVmYFisSFCsmtWQRCVIbQJ/5eQc3PkQewPdtzX0kXz3rHfZmkwxOfiSy+oo80yM2uYXBS7wAwTHF56FvjwIvPcHSU4WfTM5kdY5SyxkZqqnJxrYQ5KMud9Iz2q2vh3FmK158u32vkuMZFiuxoD3kV6DTdVijt6tgOAZ3iK0Mx4NjdnMMlQDJ9Bo3JKfBpKcWE9PVf3CmRwzc2TxNLj8KARiEDkPRNtHi38La41ZO5UGK3hFfcoSeupitBlNS5qWmv16H4U3PpgP+nRGd4EZi11r6ugHfDSqB+7UEuSBQXfCzRX4KMeg5qHz3JDv3OW5MC9Z5OX/37RQ8fb03st4w8PkxU75QS5P/xu0qIkZl+0NfEm2nCyrlaRMLB2+IB3A1hFvNb7bPwtaCCjnZTrRsgF+4lIOQ8MZ/LIvIZKuPUiTX2jVhN8kqOSC9zv9ExEkGiRoyoTgkcib9g3JH5Yw8HsguElm8NcEzuyd+xh++W2V2uEqHIqHINeVz+uYNvxZ1uQk8JlQBG5zE3E50sLnC7qn0kzTaWjTY/v3kwZQqvmrAehf+oOBcM0hhVBm59TZ/5JiDN6RHR8lfgL8rP8ZTuCC0RdYBZ/8w/Q== X-Forefront-Antispam-Report: CIP:194.138.21.71;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(82960400001)(356005)(83380400001)(26005)(16526019)(1076003)(316002)(36756003)(81166007)(186003)(6916009)(54906003)(82310400004)(6666004)(107886003)(8936002)(5660300002)(2616005)(8676002)(4326008)(70586007)(44832011)(70206006)(2906002)(956004)(47076005)(40460700003)(508600001)(336012)(36860700001)(86362001)(36900700001)(20210929001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 16:16:38.1545 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 372de35e-540f-49e2-d540-08d9e59e3983 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.71];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT053.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB4338 X-TUID: n7CCPnnfaOWE This patch adds the bitbake variables DEB_BUILD_PROFILES and DEB_BUILD_OPTIONS. These are used to define the respective environment variables. When cross-compiling, "cross" is added to the DEB_BUILD_PROFILES environment variable. As this introduces a breaking change, we update the ISAR example recipes as well: - refactor linux-custom.inc to use ISAR's DEB_BUILD_PROFILES support - Use DEB_BUILD_OPTIONS bb variable in hello.bb example Signed-off-by: Felix Moessbauer --- RECIPE-API-CHANGELOG.md | 8 ++++++++ meta-isar/recipes-app/hello/hello.bb | 8 ++------ meta/classes/dpkg-base.bbclass | 19 +++++++++++++++++++ meta/classes/dpkg.bbclass | 7 ++++++- .../libubootenv/libubootenv_0.3-3.bb | 5 +---- meta/recipes-kernel/linux/linux-custom.inc | 13 ++++++++----- 6 files changed, 44 insertions(+), 16 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index ce0a6dab..cad15a8c 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -335,3 +335,11 @@ names for kernel/headers. Changes in next --------------- +### Introduce debian build profiles + +All recipes that inherit from dpkg and dpkg-base can utilize the variables `DEB_BUILD_PROFILES` and `DEB_BUILD_OPTIONS`. +The bitbake variable defines the respective environment variable which is available in `do_install_builddeps` and `do_dpkg_build`. +When cross compiling, `cross` is added to the `DEB_BUILD_PROFILES` environment variable. +Please note, that manually exported versions of the variables are overwritten. + +For a list of well-known Debian build profiles and common practices, we refer to Debian's BuildProfileSpec. \ No newline at end of file diff --git a/meta-isar/recipes-app/hello/hello.bb b/meta-isar/recipes-app/hello/hello.bb index d6bdf9bb..53d28e8f 100644 --- a/meta-isar/recipes-app/hello/hello.bb +++ b/meta-isar/recipes-app/hello/hello.bb @@ -15,6 +15,8 @@ SRC_URI = "apt://${PN}" MAINTAINER = "isar-users " CHANGELOG_V = "+isar" +DEB_BUILD_OPTIONS += "${@ 'nocheck' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' else '' }" + do_prepare_build() { deb_add_changelog # this seems to be a build dep missing in the upstream control file @@ -22,9 +24,3 @@ do_prepare_build() { sed -i -e 's/Build-Depends:/Build-Depends: texinfo,/g' ${S}/debian/control fi } - -dpkg_runbuild_prepend() { - if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then - export DEB_BUILD_OPTIONS="nocheck" - fi -} diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 2add0b22..550bedfc 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_OPTIONS ?= "" python do_adjust_git() { import subprocess @@ -201,6 +203,22 @@ dpkg_runbuild() { die "This should never be called, overwrite it in your derived class" } +def isar_deb_build_profiles(d): + deb_build_profiles = d.getVar('DEB_BUILD_PROFILES', True) + if d.getVar('ISAR_CROSS_COMPILE', True) == "1": + deb_build_profiles += ' cross' + return deb_build_profiles.strip() + +def isar_deb_build_options(d): + deb_build_options = d.getVar('DEB_BUILD_OPTIONS', True) + return deb_build_options.strip() + +# use with caution: might contaminate multiple tasks +def isar_export_build_settings(d): + import os + os.environ['DEB_BUILD_OPTIONS'] = isar_deb_build_options(d) + os.environ['DEB_BUILD_PROFILES'] = isar_deb_build_profiles(d) + python do_dpkg_build() { lock = bb.utils.lockfile(d.getVar("REPO_ISAR_DIR") + "/isar.lock", shared=True) @@ -281,6 +299,7 @@ python do_devshell() { isar_export_proxies(d) isar_export_ccache(d) + isar_export_build_settings(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..320102ba 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -9,10 +9,13 @@ PACKAGE_ARCH ?= "${DISTRO_ARCH}" do_install_builddeps() { dpkg_do_mounts E="${@ isar_export_proxies(d)}" + export DEB_BUILD_OPTIONS="${@ isar_deb_build_options(d)}" + export DEB_BUILD_PROFILES="${@ isar_deb_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 @@ -33,6 +36,8 @@ addtask devshell after do_install_builddeps dpkg_runbuild() { E="${@ isar_export_proxies(d)}" E="${@ isar_export_ccache(d)}" + export DEB_BUILD_OPTIONS="${@ isar_deb_build_options(d)}" + export DEB_BUILD_PROFILES="${@ isar_deb_build_profiles(d)}" export PARALLEL_MAKE="${PARALLEL_MAKE}" sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ /isar/build.sh ${PP}/${PPS} ${PACKAGE_ARCH} diff --git a/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb b/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb index 68a55003..9af01aa7 100644 --- a/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb +++ b/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb @@ -19,7 +19,4 @@ SRCREV = "a1a3504e5cda1883928a8747a0bedc56afff6910" S = "${WORKDIR}/git" - -dpkg_runbuild_prepend() { - export DEB_BUILD_OPTIONS="nocheck" -} +DEB_BUILD_OPTIONS += "nocheck" diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index ed89aa09..59d42c84 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -117,6 +117,14 @@ def config_fragments(d): fragments.append(local) return fragments +def get_additional_build_profiles(d): + profiles = d.getVar('BASE_DISTRO', True) + if d.getVar('KERNEL_LIBC_DEV_DEPLOY', True) != '1': + profiles += ' nolibcdev' + return profiles + +DEB_BUILD_PROFILES += "${@get_additional_build_profiles(d)}" + do_prepare_build_prepend() { # copy meta-data over to source tree rm -rf ${S}/debian @@ -176,10 +184,5 @@ dpkg_configure_kernel() { } dpkg_runbuild_prepend() { - profiles="${BASE_DISTRO}" - if [ "${KERNEL_LIBC_DEV_DEPLOY}" != "1" ]; then - profiles="${profiles} nolibcdev" - fi - export DEB_BUILD_PROFILES="${profiles}" dpkg_configure_kernel } -- 2.30.2