From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:a17:907:3ea9:: with SMTP id hs41mr22852166ejc.727.1643734414121; Tue, 01 Feb 2022 08:53:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:d0b:: with SMTP id eb11ls3475857edb.1.gmail; Tue, 01 Feb 2022 08:53:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJx7Di7hp700rXKlx0D1WnO9fPSeLhN8PwKO6Jq5kvP7up+ojgF1VYmL3PDL5Mr5FiAFEhSB X-Received: by 2002:a05:6402:1910:: with SMTP id e16mr26340946edz.11.1643734413197; Tue, 01 Feb 2022 08:53:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643734413; cv=none; d=google.com; s=arc-20160816; b=QHHy0uVYIavwCsFOayTzwtUNcWh+NqwyILroAMX9etnymM8JfZ0Bcb99PKTcY9q51u 8MuKMkvabWHJ8g86uQbAKI5PjwTsmOA7hLhhi3unuo5ObptVq4sMU4ASDQxHjORC5trv rbeA6DWrS5ynClqxen0U61Hk7UMn+/VPz+bCOyKej46JLvyNnm2+DMeHdjx/oH+uoT60 esX3M6FidVpN+TU0n9HV+I5Xv1uR4fksr2q9jxb6cN0esHAFyhAROLg4sRFDJYpb9qT9 GFfK6wf6dd7M3axOd0TKZBneAtA1mivlSBX8L/FuqguWeGgY8cEAO9usFmnTzjXyXElR 746Q== 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=Jd1E3ldCJjcLX0sfqbIel4ZT7p2qtiZu3pmah+CC8iE=; b=C5X3msJ8pmgXO1XabyEKE2T0czQiJ9f/cYsbfJZgTgGIlFbNTjryEHBA2mf//bx0fG rPkkWtlPd3OL3Vqwfie+U9AqmGb2j/c2imGFB0aJOPCoCRXSZeooSjeFXsQPxajDGEb9 FBOaQVIZKoHbEVsd+B6HjhJNpd3+Ij9RVC4ZKQuIBzyMDFe9cipJJpbKV8LXFybFReAu q+OndpvhqtkdZncd5tK79/42/44KqwmAEs9X8LVkFJ3+YfsJK/vKecqnei6DP+lPsXIj 3rTin94ebo1fapyVQI2bppcVantz3twpk9bneTx1t6v64mFJf6JAF2Y4/31DaKHDHYPJ HqkA== 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 s15si777713eji.1.2022.02.01.08.53.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Feb 2022 08:53:33 -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 211Gr4qn019494 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Feb 2022 17:53:24 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 8/8] linux-custom: Move cfg fragments applying to debian/rules Date: Tue, 1 Feb 2022 17:53:04 +0100 Message-Id: <20220201165304.21976-9-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220201165304.21976-1-ubely@ilbers.de> References: <20220201165304.21976-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: m8xRUb7O3Wws 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 ed89aa09..4fc3d65b 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} \ - " + export KERNEL_CONFIG_TARGET="${config_target}" + export KERNEL_CONFIG_FRAGMENTS="${out_frags}" } dpkg_runbuild_prepend() { -- 2.20.1