From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7068286980559208448 X-Received: by 2002:adf:fa90:0:b0:1e6:8bb4:3ad6 with SMTP id h16-20020adffa90000000b001e68bb43ad6mr2469076wrr.286.1645713807974; Thu, 24 Feb 2022 06:43:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d1e8:0:b0:1ed:e0b0:6d3c with SMTP id g8-20020adfd1e8000000b001ede0b06d3cls732832wrd.2.gmail; Thu, 24 Feb 2022 06:43:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZvMqvSZmdR1nrhYTV903gyfmgleuQn76dY5j01g7+sghf6byq7FqKCkr5RYJg9uSo6Ej6 X-Received: by 2002:adf:aadb:0:b0:1ed:bc42:ec02 with SMTP id i27-20020adfaadb000000b001edbc42ec02mr2436141wrc.611.1645713807027; Thu, 24 Feb 2022 06:43:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645713807; cv=none; d=google.com; s=arc-20160816; b=OroY8l7Wr4Gcl7jLROP4QE1ziaVzt/pCHvvqS17Qm9gNqYmnZw/rly/fdApVoyIj8e 2oYhBNSLoFsotaA6jPty8HlEa0p0qKA3tl34ihL4VW3xiHUqut0znAlKnsmlkPQnspgc lLhk9BAiIeEh1qTkaX8iX9CFK5KqQjb/foR7H/z8pxakBigVXS2Xlz4x3oaRI/s1CMIp MqG+5p93or9tlNafgyOLPldG30iMz0RaTzQExweUE0Ckk+VNOA613WoIZKqDjiuw745U 0lURNK9rDR0VPae54BOfkEzuCDpAttrV72GCOYgZ0rRJeOYEdgDlXJjDbeAne/kL2C8N XoMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=Tqzw3U2EkfQsDUyBhgibn6DQu47WcN4wKi+jHZobcY8=; b=xt/TBXjelrzRr8vbObArZikZZs8KPulzGfojwUFkR7fLGGERofaW2rLhOLGBrLYtOU o1uJdlBkkUonQP5heVW1q4d+QI/fGw+1zrUPKy0LRTda71TDydW+DgmCvqVGXVmWaEXh +GnIpzDV6W2wgqYH/hgTP17NCukIPtEbO0IPqJrdFwxJAIKJeeKkkBw0jy/sMyxL/0Vg U556Di17E7l7IsBzgqg4B+KlRmuDk5hxxdGKiswO0MaOMJQk84F87GbCbQY87nexVou7 4ewup/xQD1H8GeIZGziYQvyR6j/EE/WMewv+DlyOoy8porlMrVEOdZP823d4nsUafkaI bLXg== 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 w15-20020a1cf60f000000b003497ca2a0f8si122229wmc.1.2022.02.24.06.43.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Feb 2022 06:43:26 -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 21OEhPA2031083 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 24 Feb 2022 15:43:26 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] linux-custom: Set KERNEL_CONFIG_TARGET at build time Date: Thu, 24 Feb 2022 15:43:25 +0100 Message-Id: <20220224144325.12672-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 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: MwsCO7canLuy Expanding KERNEL_CONFIG_TARGET variable at parse time doesn't properly work while it may need some config file in workdir that is not created at this moment. This patch removes the variable from template vars and sets in in debian/isar/configure at build time Signed-off-by: Uladzimir Bely --- meta/recipes-kernel/linux/linux-custom.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index ea1abf76..8a5dbf82 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -72,7 +72,6 @@ TEMPLATE_VARS += " \ KERNEL_HEADERS_DEBIAN_DEPENDS \ LINUX_VERSION_EXTENSION \ KERNEL_NAME_PROVIDED \ - KERNEL_CONFIG_TARGET \ KERNEL_CONFIG_FRAGMENTS \ " @@ -165,8 +164,6 @@ def get_kernel_config_target(d): return config_target -KERNEL_CONFIG_TARGET = "${@get_kernel_config_target(d)}" - def get_kernel_config_fragments(d): src_frags = " ".join(config_fragments(d)) out_frags = " ".join(map(lambda frag: 'debian/fragments/' + frag, config_fragments(d))) @@ -180,6 +177,11 @@ def get_kernel_config_fragments(d): KERNEL_CONFIG_FRAGMENTS = "${@get_kernel_config_fragments(d)}" dpkg_configure_kernel() { + grep -q "KERNEL_CONFIG_TARGET=" ${S}/debian/isar/configure || + cat << EOF | sed -i '/^do_configure() {/ r /dev/stdin' ${S}/debian/isar/configure + KERNEL_CONFIG_TARGET="${@get_kernel_config_target(d)}" +EOF + rm -rf ${S}/${KERNEL_BUILD_DIR} && mkdir -p ${S}/${KERNEL_BUILD_DIR} if [ -n "${KERNEL_DEFCONFIG}" ]; then if [ -e "${WORKDIR}/${KERNEL_DEFCONFIG}" ]; then -- 2.20.1