From patchwork Fri Nov 29 11:21:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3968 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 29 Nov 2024 12:21:31 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f62.google.com (mail-ed1-f62.google.com [209.85.208.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4ATBLUlH024517 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 29 Nov 2024 12:21:30 +0100 Received: by mail-ed1-f62.google.com with SMTP id 4fb4d7f45d1cf-5cfae4d1f2csf1162493a12.1 for ; Fri, 29 Nov 2024 03:21:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1732879284; cv=pass; d=google.com; s=arc-20240605; b=MYyVt/u8r+C4vLqjJHXoEigg/9d2moCPzJsOyoVjPJyFBKQZpqHfshXLVWZZ84+4z9 sjS7nGkH4q2X7Jcap3+bnK9uAWDOSvMfAhkga61WgDVqJmVe+sckpGhVOmZJ7kp919bq QqFKRtg5QDY9i4JFFklKPFn7eF6I6dkBDnV1WWfw/gLzbjkMW9yvqYoWSeni7aQJSzPN fw8HdqHz0GZ8vuFyQ33m6TGMniI6iwKpfrTSkIpLbN/OWOW9bp0SvtTFKeqjmQj/S8gL 3OJUX34ZI2MzQk7QvgKuGwikXnUmDET76EkhHq1D7zeiM9rzUPknEIgDlsxhh1ZpKeZH BAsg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=Es5iX1c3Zw9C7slkeaDgeyJkMwPQ3wWZMPY6hXpC0aI=; fh=3AO5rpl3U4kNu12AUmPs6jrIlgRfK4KNK5AqgJ3enrs=; b=QmazBroFbticB0Lg5Wv/XLt2PvQ59ruNr/9PNyuiPLNh5ZHqGfcCQEUVL/M6O5iAYF eDqhz8hnLRPLBBFZOIAPl4N6+e466uh39EhOVo2YvKQUW2Tpl/b8n7U3thZ8Kx4j5RAl dJxrMZlXno4BQ74aY8fE3s3itlRBOS53KfI+GOtS+NZEYpTRSL0LTEJErrKAblbK/+B5 fPnVdeSPj1bXJOWyH1lGmyWYZsML7JwD7NwDv+IOF5+KTdg5+V6cBIEaYMVsvqTcCVO9 mLGh0UgmcM6SVdI6Y3sTWsTK1YDDxAybBUbfRB5c4AIo/ZHFwd4jFmW+pwepv5igFdSy n6yA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1732879284; x=1733484084; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=Es5iX1c3Zw9C7slkeaDgeyJkMwPQ3wWZMPY6hXpC0aI=; b=daybkXnpnoJl1NhdZPvRqfe5wqgnMlhfe7UM0KTAFmmsemn5DHp9ptbMrPeJzAd074 uVtiLi/j4Sz4KbT5hCBXYBbBaHl3REwMSikc+q7TxSKNj9+Q+JpagrRUPuU6b/lTZhlk cfFoAIpXRia0g85UON6PyISPad8FFiUIlrFyFHwapGiAX/prAZbasLqcHy5bjbJCsdgy 7mLcE0pyRanRZh0Uw1nXZbkjlcYXlq0pmoMkDg1FP+wqoviCz5LQpmo2+Zd2Py+bjNs+ v8obq2/C9YQNIfDwqXSfut4NmmO2ZcAkjTi9rb4U6VwZm2iGEi83HgHAN/xJ6GLdzICQ IX4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732879284; x=1733484084; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=Es5iX1c3Zw9C7slkeaDgeyJkMwPQ3wWZMPY6hXpC0aI=; b=TOWVIk7FkeafZYAocLPaUiFH7N0rwS3FyJJCmUteO5C56wxerCv7CDDe3Dy42aaFsf rffLtNZciyXOyWiETzhgpYnoK3Xw/R0a9c5TPDmthXDDrVgLxja5WPdD2J1ICwOLzxea SL/ArIcFmNGQve2JCnS3QhsboZvXFu5cudlUXBDjta8BzQ4JPPQm/q8b5q/LTvLwafVp P9EAJX0h+pGnRT3F0rBXiHZgQvBAqPEVWJ40OKeUZsmAoTQ/DHXihxGafa5wK1woGqG7 wi+2j2PKB4foZ5omQ2St10JlQ1+SEALVbenXuRQDUaLftx6vIv07WU9bZ01jzVMDTIPu LGXA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUmsmyHIQij4XegREUMam44Ki9Wi4rvcIGzk/TR+o+++vh32gi5jWRm4+k90eBEY01la6UBWpM=@isar-build.org X-Gm-Message-State: AOJu0YwYzHFCKjvOHjj+L0XY72LcyduRlan7EsJCaSexOTQXWXcFRDA/ P6EZXHED4LxItlVQpPf8mfdhN/m2c1mqtzpRaBGPY8+c8nqQoodd X-Google-Smtp-Source: AGHT+IGT2gR0/hGTPea/8h/wrRE+v+c6a7IWqT8iZJA0FI9dzoM50zkmH/iJs89XDfTHUqrlfTXJyA== X-Received: by 2002:a05:6402:3899:b0:5cf:c0f5:db6d with SMTP id 4fb4d7f45d1cf-5d080cb0208mr8112020a12.34.1732879283572; Fri, 29 Nov 2024 03:21:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:c995:0:b0:5d0:bf73:1c41 with SMTP id 4fb4d7f45d1cf-5d0bf732479ls25983a12.2.-pod-prod-02-eu; Fri, 29 Nov 2024 03:21:21 -0800 (PST) X-Received: by 2002:a05:6402:4581:b0:5d0:aaba:e4b6 with SMTP id 4fb4d7f45d1cf-5d0aabbb3d4mr3041836a12.25.1732879281213; Fri, 29 Nov 2024 03:21:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1732879281; cv=none; d=google.com; s=arc-20240605; b=dLi71bgVfvOuDoWESg4I66Upq2o6JWPOMdtVOPZzcCNIXvV8oVlfhiSRIJCGoHwjzZ fcY74TMouasfA7GBIWjYDXb3yNc0VtU2zmJTfXIAXyxP1GgJUc+knKxnAUjVtZf4uFNZ zRStRXDVGuZFhCSMX7ak7h4ntxUq6AbDdEP50fWjEjtP5CXDjf9Rr4DiBPP7TvprKF9c E/EuGvfSIoO/pNrTbQaIjN/vdzMISDmnN+RMjH2vu/VAKpE8jtvpZF7+QLV6n7WgzzK1 7UA9nzdlaNd8Kh1BQjK4gS7nyH67s0wq3blL29o0Cpz5VMd+x/r0egdd2PU9eni+Ta7a wi4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=9zwK83hlnVjdNWrVndl4xvM2y7JgjWsy9IY4rnGC1Ng=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=GIAqilgzhQbarGMm5iA2v0RNrwn8hqyk+UVAticFcwm89Iuenpbk+IOxWwNAsmSVKp P+Nk7X9TDJDf9WP037Vv0WQG+K5nvGp9e/hNox6XOHsiEm3gicqIlUakSn16NLjQoDmD ZjwLAP1TU/CpRjdetueHJ+GeaGsZ6JAqFb/o99oc7peZBvTG3VHA7C/1rnTMeOVgHp8n 21hy7QvE0Lz0Ig1ByB7DhtPXHjLVTxK+4AxvEIcvqoEe0So/FyjnASLqNI1kl1P/oUMg 9MZXgKaBmg/BrXndIgRl046mxDy578eh0+YezzfCNBCJKRFNEgqKcuCCb0lZZNxBCeHv ph+A==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-5d097d9d4d5si113591a12.1.2024.11.29.03.21.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Nov 2024 03:21:21 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.114]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 4ATBLKVE024502 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 29 Nov 2024 12:21:20 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2] meta: Enable cross-compilation by default Date: Fri, 29 Nov 2024 13:21:12 +0200 Message-Id: <20241129112112.2108215-1-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS 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-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Make cross-compilation to be default mode if no ISAR_CROSS_COMPILE value was set or local.conf.sample from meta-isar was used. This will speedup the build with default settings. Also fix CI and kas logic to address those changes. Signed-off-by: Anton Mikanovich --- Changes since v1: - Fix testsuite cross compile setting logic. - Fix kas cross compile setting logic. - Update source headers. RECIPE-API-CHANGELOG.md | 9 +++++++++ kas/opt/Kconfig | 10 +++++++++- kas/opt/nocrosscompile.yaml | 11 +++++++++++ meta-isar/conf/local.conf.sample | 4 ++-- meta/classes/crossvars.bbclass | 2 +- testsuite/cibuilder.py | 10 +++++++++- 6 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 kas/opt/nocrosscompile.yaml diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index deb1c4e1..f310553a 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -693,3 +693,12 @@ Previous implementation still can be selected by setting in local.conf: PREFERRED_PROVIDER_bootstrap-host ?= "isar-bootstrap-host" PREFERRED_PROVIDER_bootstrap-target ?= "isar-bootstrap-target" + +### Cross-compilation is enabled by default + +Default ISAR_CROSS_COMPILE value was changed to "1". +There is no more need to set global ISAR_CROSS_COMPILE = "1" in local.conf to +enable cross-compilation. Otherwize ISAR_CROSS_COMPILE = "0" now should be set +in local.conf to disable cross-compilation for all the recipes. +Sample local.conf from meta-isar used by isar-init-build-env is also changed +to enable cross-compilation by default. diff --git a/kas/opt/Kconfig b/kas/opt/Kconfig index b1b1ff16..3ae921bd 100644 --- a/kas/opt/Kconfig +++ b/kas/opt/Kconfig @@ -1,8 +1,11 @@ # This software is a part of ISAR. -# Copyright (C) 2023 ilbers GmbH +# Copyright (C) 2023-2024 ilbers GmbH +# Copyright (C) 2024 Siemens AG # # Authors: # Uladzimir Bely +# +# SPDX-License-Identifier: MIT menu "Mirror selection" depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID || UBUNTU_FOCAL || UBUNTU_JAMMY @@ -154,6 +157,11 @@ config KAS_INCLUDE_ISAR_CROSS_COMPILE default "kas/opt/crosscompile.yaml" depends on ISAR_CROSS_COMPILE +config KAS_INCLUDE_NO_ISAR_CROSS_COMPILE + string + default "kas/opt/nocrosscompile.yaml" + depends on !ISAR_CROSS_COMPILE + config USE_CCACHE bool "Use ccache during build" diff --git a/kas/opt/nocrosscompile.yaml b/kas/opt/nocrosscompile.yaml new file mode 100644 index 00000000..99713e1e --- /dev/null +++ b/kas/opt/nocrosscompile.yaml @@ -0,0 +1,11 @@ +# This software is a part of ISAR. +# Copyright (C) 2024 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +header: + version: 14 + +local_conf_header: + nocrosscompile: | + ISAR_CROSS_COMPILE = "0" diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 14cac313..fffe5e6a 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -157,8 +157,8 @@ IMAGE_INSTALL:remove:qemuamd64-sb = "example-module-${KERNEL_NAME}" IMAGE_INSTALL:append:qemuamd64-sb = " example-module-signed-${KERNEL_NAME}" # -# Enable cross-compilation support -ISAR_CROSS_COMPILE ?= "0" +# Uncomment this to disable cross-compilation support +#ISAR_CROSS_COMPILE ?= "0" # # Uncomment to enable 32-bit compat architecture support diff --git a/meta/classes/crossvars.bbclass b/meta/classes/crossvars.bbclass index 00326c9a..7bd7ab94 100644 --- a/meta/classes/crossvars.bbclass +++ b/meta/classes/crossvars.bbclass @@ -1,7 +1,7 @@ # This software is a part of ISAR. # Copyright (C) 2022 ilbers GmbH -ISAR_CROSS_COMPILE ??= "0" +ISAR_CROSS_COMPILE ??= "1" inherit compat diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 9fa3d86c..b5b6a093 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -1,4 +1,10 @@ #!/usr/bin/env python3 +# +# This software is a part of ISAR. +# Copyright (C) 2022-2024 ilbers GmbH +# Copyright (C) 2022-2024 Siemens AG +# +# SPDX-License-Identifier: MIT import logging import os @@ -168,7 +174,9 @@ class CIBuilder(Test): f.write('ISAR_ENABLE_COMPAT_ARCH:arm64 = "1"\n') f.write('IMAGE_INSTALL:remove:arm64 = "hello-isar"\n') f.write('IMAGE_INSTALL:append:arm64 = " hello-isar-compat"\n') - if cross: + if not cross: + f.write('ISAR_CROSS_COMPILE = "0"\n') + else: f.write('ISAR_CROSS_COMPILE = "1"\n') f.write( 'IMAGE_INSTALL:append:hikey = '