From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 02 Dec 2024 16:30:20 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4B2FUJUZ010511 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 2 Dec 2024 16:30:19 +0100 Received: by mail-wm1-f63.google.com with SMTP id 5b1f17b1804b1-43498af79a6sf24695885e9.0 for ; Mon, 02 Dec 2024 07:30:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1733153414; cv=pass; d=google.com; s=arc-20240605; b=NxhHtzf/qOZTFbe9oSyIfc+5Mcip8xrkQ5LalNznOvdeFMFCcZrLbgAFZuMQARImpn 0PlBCbEqFokKazLyoSTTWws3JPB6lQlufUW7G1xW+yl6lIsb2oxPtEfrYX00i/XqX5vK veoKpobCCIxT+QstZm7oW7SLhu3huFIwCINloq3DgRcmCwlcoFsHh14oxTNvMIQRXbWg aEWvVIVY+YNnEZshF5hwglht3RmpEesI/IJ4yWq2pyzNgCeyVHedyvOH1egRWPXwZh6X NNvZQm0/ZPfcIc+kW/c6AHOS2C/ZFtiHgyXVmafUvOCUh+IkGMRJXb33opCvfpXrr3/B 3rpA== 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=S+88zfawZ/1catBTzLlnZ49boU/1pcKFY8QiffcLFjQ=; fh=+/L96OULZNAV6Iazv10Ocb4+rv0X9MXL3/NB9UZz5AM=; b=I7zT8l5o1f8PFEcUtHJVe7+sw4vOEMWRG5XWT0HVAUcySrziZ0hptus8m5y74Snhvl N5G7nHWSmMUI8RW9o8G2pfTzKB5F6pyflUr3/i0Voc/ratcQ4szpvY5+hFi8nM5h0B0e K8VzV5edshkqExgR0yLQlGBmeKlF/tFS5s2fdoHT/XBMASHl4DvC4YNMa2Yo78RR4Baw HfRHhHyELTY6aB40uQcS6Kb0XQCBh2JerNYp3vYvv7MMAO9C76eRo7bs5yH8Rr660ywm j42E7qsubTZGdZwAxs+/evptUqOzr3tEO6RIj/Z9vqxL6O3GpzdGjJ9f9hfS+dJbJIM4 j5lg==; darn=ilbers.de 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=1733153414; x=1733758214; darn=ilbers.de; 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=S+88zfawZ/1catBTzLlnZ49boU/1pcKFY8QiffcLFjQ=; b=YRdGTf3TBJFBcJHxvGn2epHVY2gIYWBisyAZgdA7fuFdqyzZuK5eAlHJFAkSysIURv igLKpjFICaktw+9w7mwqjRiByNJmYVC4hdHHL9hVor/6qRtusw48MSCJ8xNSaixZY5tm QacKopZlhXW9fs+e54pl1vgpHaOEnMzuj5hWsKOTacOtgzC+BrzO7OVKY42OF9LDng1c IHixx90vEme0Mn46l1V+TuP734cAwvHfsgvByad67ciUtUhLx0fbT0V2WDHcd6gVC3+L y2lLwYnRR6ItLTskglrC+EVHPfejH9E1uQu0l8ynKLkc3vOZ0fFzp8IzqhBMIX/t5+S2 HCKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733153414; x=1733758214; 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=S+88zfawZ/1catBTzLlnZ49boU/1pcKFY8QiffcLFjQ=; b=Th502oc8+EIWJjUsE5k6vRBa35+ZqUJUUCc0q2PhYJ7bCRiFbjmERLhE9WKhG7yc2w +EOao/o650CsIeUwFXpKlfs/85LXHtk+yoqeI6+6/9Oz2GDtgj2zKNWUC4MCPG0ACMjB zsAd/ZSKC1HJlZncDmgAsMBHQ8MGgy5E7WDYrwVleNhrERgm++tDlgkKVvThhEI62oWX BmeIgciQla0p5I6iMSVi+jDizUgH0o32VfHCp3PUazIAOq0IC/lbAYWrjc8T3RyNK/e4 JGCr7EnniaLqp3QJn7uevk6SvVACrQ0oQdqrujvDCT0lstW75LtR5Tkg2srB3Hd2vYDv uSqA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVl0DLXW4zWXUFGEqkEu/K5jJabzYTnwqmexKf1X5bPkwrWIQoXLnuHjsJ8vbNFy3a0PeRj@ilbers.de X-Gm-Message-State: AOJu0YwFDSGCMiCe13F8N7SHzHbhwdilbLq8siTct7b2tP0KnNEo9Wvs kiGdC5IMFGHGxBbmdzzqQf2IkjoNXAngJR0Prb/bsDue9fcbQDA+ X-Google-Smtp-Source: AGHT+IH5hXi4+aSsvdwdOVXuwlv4tnzLOvvF2cSMK7WnA5zXmuSsIVw0DUjLXSHPxp5i1S1ukt5ueg== X-Received: by 2002:a05:600c:600d:b0:434:9e73:51a1 with SMTP id 5b1f17b1804b1-434afc3bc79mr170457465e9.14.1733153412478; Mon, 02 Dec 2024 07:30:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4506:b0:434:a360:245d with SMTP id 5b1f17b1804b1-434a9fcc0acls21722255e9.2.-pod-prod-00-eu-canary; Mon, 02 Dec 2024 07:30:10 -0800 (PST) X-Received: by 2002:a5d:47a1:0:b0:382:484d:45da with SMTP id ffacd0b85a97d-385cbd5f378mr14313268f8f.6.1733153410183; Mon, 02 Dec 2024 07:30:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1733153410; cv=none; d=google.com; s=arc-20240605; b=N2+lyYbsmXgNIUgZ0DIndedtwyo2fqJxrEgogI0JduAbhJmryeyCSmTlyLp5EKolv5 +6LJj/1e9XbkJizlgB6asMnUNde9RojA/BurEbeFVMpaqkw3YekiwYZ6j4ds0TzXWG/w Sq3GkAe/Z76MILUD5UyyYHiC/u5TP0HaVMCgefp89/as/vt4adbT7y5IihO5ZXwH6PF1 /+kTjRjTN7SJO+MTuhLdC8Kg1b3c6flOX1Poqvh6Ird3bn5vCiIvbdHNbgfKTQnOo2nc w3Cy0VjByXZWF7XtzQf/JIKnkBpe0v/lnwEwHVqT7VzDwHl/XorTogrTIu4D1dmDFgk1 HKbA== 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=DwPq/Phe05anXkV5a8HK4HdzdLkTYk7ZPxF0l78jYDs=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=IwJ6dx21naf4tGJn2u2GAI8uggAIFzC92EOQRMt8N8mk8XQjHXZUgim0dPE1qVoWYW ex17RpIxNNEP1+a+XB/E5hqktGjwtbgfjtj/9Vu0+ur2CUHn4ue+0GjcGT32r4OYz74T KhLo70NWY34vLfXNR/nwnSut5175B/wPU79HWuCwX7a2YJjcDPnKpIyEXxYN75hrd1gx m7EbtVR1TZ6aWKMt6JH/BP9tGnc+f+eMQrL45BLFVZJI2o1QFE/JdMClGaBkIG24Vgtp DX0SvM09JP9jJhLFUBH2Gggz3/gc/IlHR9fIeD738fSkqabsYXEV4pv/sCGUjMdYX4WZ 4VQQ==; 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 5b1f17b1804b1-434b0d1102esi2022975e9.0.2024.12.02.07.30.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Dec 2024 07:30:10 -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 4B2FU86o010501 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 2 Dec 2024 16:30:08 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3] meta: Enable cross-compilation by default Date: Mon, 2 Dec 2024 17:30:01 +0200 Message-Id: <20241202153001.2212785-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 Content-Type: text/plain; charset="UTF-8" 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-TUID: fCDz3KGh2Ma+ 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 v2: - Simplify kas logic. - Update source headers. 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 | 11 +++++++++-- kas/opt/crosscompile.yaml | 6 ++++-- meta-isar/conf/local.conf.sample | 9 ++++++--- meta/classes/crossvars.bbclass | 7 +++++-- testsuite/cibuilder.py | 10 +++++++++- 6 files changed, 42 insertions(+), 10 deletions(-) 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..1ec4b112 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 @@ -149,10 +152,14 @@ config ISAR_CROSS_COMPILE bool "Enable cross compilation mode" default y +config KAS_ISAR_CROSS_COMPILE + string + default "1" if ISAR_CROSS_COMPILE + default "0" if !ISAR_CROSS_COMPILE + config KAS_INCLUDE_ISAR_CROSS_COMPILE string default "kas/opt/crosscompile.yaml" - depends on ISAR_CROSS_COMPILE config USE_CCACHE diff --git a/kas/opt/crosscompile.yaml b/kas/opt/crosscompile.yaml index 1b927ebd..4ec26d92 100644 --- a/kas/opt/crosscompile.yaml +++ b/kas/opt/crosscompile.yaml @@ -1,9 +1,11 @@ # This software is a part of ISAR. -# Copyright (C) 2023 ilbers GmbH +# Copyright (C) 2023-2024 ilbers GmbH +# +# SPDX-License-Identifier: MIT header: version: 14 local_conf_header: crosscompile: | - ISAR_CROSS_COMPILE = "1" + ISAR_CROSS_COMPILE = "${KAS_ISAR_CROSS_COMPILE}" diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 14cac313..b59f310b 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -1,5 +1,8 @@ # This software is a part of ISAR. -# Copyright (C) 2023 ilbers GmbH +# Copyright (C) 2016-2024 ilbers GmbH +# Copyright (C) 2017-2024 Siemens AG +# +# SPDX-License-Identifier: MIT # # This file is your local configuration file and is where all local user settings @@ -157,8 +160,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..1a88d457 100644 --- a/meta/classes/crossvars.bbclass +++ b/meta/classes/crossvars.bbclass @@ -1,7 +1,10 @@ # This software is a part of ISAR. -# Copyright (C) 2022 ilbers GmbH +# Copyright (C) 2023-2024 ilbers GmbH +# Copyright (C) 2023-2024 Siemens AG +# +# SPDX-License-Identifier: MIT -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 = ' -- 2.34.1 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/20241202153001.2212785-1-amikan%40ilbers.de.