From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6868613252732944384 X-Received: by 2002:a2e:9a4a:: with SMTP id k10mr684771ljj.355.1599826392794; Fri, 11 Sep 2020 05:13:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:93c7:: with SMTP id p7ls409516ljh.11.gmail; Fri, 11 Sep 2020 05:13:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBkNUXMk513tLVBxtS4crxuxL/gfCpEhRCQhRKf+6yb7MWB8EbjReuI9UvBDDvGXnFTGUZ X-Received: by 2002:a2e:5c09:: with SMTP id q9mr725698ljb.423.1599826391521; Fri, 11 Sep 2020 05:13:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599826391; cv=none; d=google.com; s=arc-20160816; b=hMTkwxe4ls4wCcHa3MsMSkoPOnmH5YZWj5U5Ikb8E6cUgl8fIxukjogw8+VIhAVLAp MCD/mOHMSs0Hkf8HvxhtT2JYU8BUq9A/gw687QOqpVA9vXQvuFFTlACsZw92/phkcObz 09p6PHbvDWa97mgvBH//yFB67aMIc/KgHLHBUUwvuz7L9s33k0UYkkT6oLYAVAMl6xUF FlTCf92vgtBlCIToDVrnJP9KGuVNj8x+6AoUC9ptk7YGop8+2rJGIVxKlSgZ/LkgvTKa MhVphYwKi0dASpJ6J92wlC2ys2h1n3SwAma87CJZQYygQCG0ZJnm55SubHW4T3B55qkb kjuw== 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=AD0tq9vKiFvR/vYUTFnvWwAzLFrN/kE1ldlWfqBQXzw=; b=Thd0H8X2kVem484yrcZFoVM2OqM1qgP1b1mn2/AD+s+B1F6mTcE7jkc5uECvA3jehQ yj0VsLd1VSRfIClk8Z8I0SriJptF9p03DHzYOzqanaWa5oVSLIFdtPbi2XIR3/2snmGA mXCyjgXCh1z8h7R2MqE8AAvRgqU6bBwXGhWBh8XA00ovL1GSkjRBOYVaIv8XnL+PeCgF NXtnVZwvTIfePGZ5fiWgAf7qnbrIkdA/cUVDr7xMmyXwVX+/izQCeaQgb4/nNdsejqgo ljIVTlQHg7qDqCzVjLmpEIUTeOjDmdVM+LvEG/TztH4YznLpPxmKwG0PGEKjjxHZJ6gj LFPw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id z6si77135ljz.8.2020.09.11.05.13.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Sep 2020 05:13:11 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 08BCDAgN015132 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 11 Sep 2020 14:13:10 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.49.221]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08BCD975012908 for ; Fri, 11 Sep 2020 14:13:10 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v2 2/4] ci: Add compat arch support Date: Fri, 11 Sep 2020 14:13:07 +0200 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: ZJvpKDmY61V0 From: Jan Kiszka Build samefile for the compat arch if that is enabled. Set ISAR_ENABLE_COMPAT_ARCH for all supported combinations in CI. As deploy this 32-bit package from the 64-bit image build would conflict with the same package generated by the 32-bit image build, rename the compat package in that case. Signed-off-by: Jan Kiszka --- meta-isar/conf/local.conf.sample | 5 +++++ meta-isar/recipes-app/samefile/samefile_2.14.bb | 6 ++++++ scripts/ci_build.sh | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 2f82020d..cefdbae9 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -180,6 +180,11 @@ ISAR_CROSS_COMPILE ?= "0" # NOTE: this works for amd64 and arm64 targets so far #ISAR_ENABLE_COMPAT_ARCH ?= "1" +# +# NOTE: This is just to test 32-bit building on 64-bit archs. +IMAGE_INSTALL_remove_compat-arch = " samefile" +IMAGE_INSTALL_append_compat-arch = " samefile-compat" + # # Uncomment this to enable use of cached base repository #ISAR_USE_CACHED_BASE_REPO ?= "1" diff --git a/meta-isar/recipes-app/samefile/samefile_2.14.bb b/meta-isar/recipes-app/samefile/samefile_2.14.bb index 5e36a2ac..50f9ced0 100644 --- a/meta-isar/recipes-app/samefile/samefile_2.14.bb +++ b/meta-isar/recipes-app/samefile/samefile_2.14.bb @@ -15,6 +15,12 @@ DESCRIPTION = "utility that finds files with identical contents" SRC_URI = "http://www.schweikhardt.net/samefile-2.14.tar.gz" SRC_URI[md5sum] = "0b438249f3549f18b49cbb49b0473f70" +# NOTE: This is just to test 32-bit building on 64-bit archs. +# We need to rename the package to avoid the conflict with parallel armhf +# image builds. +PACKAGE_ARCH_compat-arch = "${COMPAT_DISTRO_ARCH}" +PN_compat-arch = "samefile-compat" + do_prepare_build[cleandirs] += "${S}/debian" do_prepare_build() { # You could also create parts of your debianization before calling diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index d2c707b8..461fd5cc 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -139,6 +139,12 @@ if [ ! -d "$BUILD_DIR" ]; then fi source isar-init-build-env "$BUILD_DIR" +cat >>conf/local.conf <