From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:a2e:9609:: with SMTP id v9mr14804605ljh.306.1643113944719; Tue, 25 Jan 2022 04:32:24 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:ac9:: with SMTP id n9ls2337401lfu.1.gmail; Tue, 25 Jan 2022 04:32:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJwI0Bg7vQCqrhRtP1XjwvILUSQ48aDc0D90gYf8S6E68mf3UDJFeBCbuVZ9IDLW9HDAPSDq X-Received: by 2002:ac2:4e49:: with SMTP id f9mr16065995lfr.357.1643113943605; Tue, 25 Jan 2022 04:32:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643113943; cv=none; d=google.com; s=arc-20160816; b=kM23ME6gBqXCAfbnlJGlggJpLkraed0cWZTnzBUS0Y13ciVizN9tQMaR6R9jwN57ak scpQ+mOqsVV2PmnqNh8EIKOFkhcAeF7z3Y19HOUKnCebBTJ05BN1kTWsFB/9ZGlVzn0D JfmtO2v9N9YAWu+SeR1Nj7bGzmlLxGRJTSaQPQn6E2aU1wwaMmLzjJdKpqCfH/gm5KNj CYm7KrZ82/4+aQvdpn/51DpIMSSi42y86RJP5hNlmGpqAplPne+UAEC/agq5XjqUPy+p +8Pr1ibGVyhsiusGBkw5idSYvmnaJ3C1rGcx65qXwyXSOsRQKbYGYxv57GKdjFpBBHZp oG0A== ARC-Message-Signature: i=1; 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:to:from; bh=y4bYBcl+ZHy3aRnWcMIBsXu2RVdYYFI/VleKssT37cg=; b=l1vT4APbUwxS49J7FcSb1LmJl9flQLZBIgtngsFVQyt7s9Se/FBgpkbU/j9pPJvNaY qH5mqhrug5AL02IpoZ4dWXMpUQhUxtRaxuocEzaDj3bz6wsLeX/AYuiCsJkEHYGS+sOa E0AWECd38Gq0nGnAkAWn+xibLK5vPg34w24zBImWtzsspnxXap3vIBBDhz7v5vzvRdU3 mB1D3EFNLLqqAvVMEjZOwg+Lw9yfUJHrv2geMFSoBbKnZOEVLqMOymx6gujDZir/94jW J1fhdykudQWI4GdhWUEmgvxF1CxAApzXpZwKH/Opxo5h6P3eJNV3xTMgnYMAgT0KqCr2 rjZA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id i4si468251lfg.6.2022.01.25.04.32.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jan 2022 04:32:23 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 20PCWJHv019024 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Jan 2022 13:32:22 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 9/9] linux-custom: Move cfg fragments applying to debian/rules Date: Tue, 25 Jan 2022 13:32:19 +0100 Message-Id: <20220125123219.32395-10-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220125123219.32395-1-ubely@ilbers.de> References: <20220125123219.32395-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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: twv5bucUFvmz Prepare linux fragments applying in Debian way. This allows to avoid pre-build chroot call used for merging kernel config file and custom config fragments. Signed-off-by: Uladzimir Bely --- .../linux/files/debian/isar/configure.tmpl | 19 +++++++++++++++++++ .../linux/files/debian/rules.tmpl | 3 +++ meta/recipes-kernel/linux/linux-custom.inc | 12 +++--------- 3 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 meta/recipes-kernel/linux/files/debian/isar/configure.tmpl diff --git a/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl b/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl new file mode 100644 index 00000000..83871baa --- /dev/null +++ b/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl @@ -0,0 +1,19 @@ +#!/bin/bash +# Copyright (c) Mentor Graphics, a Siemens business, 2019 +# SPDX-License-Identifier: MIT + +# Load common stuff +. ${S}/debian/isar/common || exit ${?} + +do_configure() { + + # Process kernel config target and fragments + ${MAKE} O=${KERNEL_BUILD_DIR} ${KERNEL_CONFIG_TARGET} || exit ${?} + ./scripts/kconfig/merge_config.sh -O ${KERNEL_BUILD_DIR}/ \ + ${KERNEL_BUILD_DIR}/.config ${KERNEL_CONFIG_FRAGMENTS} + + # Stop tracing + set +x +} + +main configure ${*} diff --git a/meta/recipes-kernel/linux/files/debian/rules.tmpl b/meta/recipes-kernel/linux/files/debian/rules.tmpl index 05a26fe2..a1166287 100755 --- a/meta/recipes-kernel/linux/files/debian/rules.tmpl +++ b/meta/recipes-kernel/linux/files/debian/rules.tmpl @@ -22,6 +22,9 @@ isar_env=$(strip \ override_dh_auto_clean: $(isar_env) && bash $(deb_top_dir)/isar/clean +override_dh_auto_configure: + $(isar_env) && bash $(deb_top_dir)/isar/configure + override_dh_auto_build: $(isar_env) && bash $(deb_top_dir)/isar/build diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 72706f23..eaaa2eef 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -52,6 +52,7 @@ TEMPLATE_FILES += " \ debian/isar/build.tmpl \ debian/isar/clean.tmpl \ debian/isar/common.tmpl \ + debian/isar/configure.tmpl \ debian/isar/install.tmpl \ debian/isar/version.cfg.tmpl \ debian/linux-image.postinst.tmpl \ @@ -164,15 +165,8 @@ dpkg_configure_kernel() { (cd ${WORKDIR} && cp ${src_frags} ${S}/debian/fragments/) fi - sudo -E chroot --userspec=$(id -u):$(id -g) ${BUILDCHROOT_DIR} sh -c " \ - export ARCH=${KERNEL_ARCH} && \ - cd ${PP}/${PPS} && \ - make O=${KERNEL_BUILD_DIR} ${config_target} && \ - ./scripts/kconfig/merge_config.sh \ - -O ${KERNEL_BUILD_DIR}/ \ - ${KERNEL_BUILD_DIR}/.config \ - ${out_frags} \ - " + dpkg_build_export KERNEL_CONFIG_TARGET ${config_target} + dpkg_build_export KERNEL_CONFIG_FRAGMENTS ${out_frags} } dpkg_runbuild_prepend() { -- 2.20.1