From patchwork Fri Sep 11 04:13:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 48 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp119712ooj; Fri, 11 Sep 2020 05:13:13 -0700 (PDT) X-Received: by 2002:a19:7015:: with SMTP id h21mr232687lfc.473.1599826393127; Fri, 11 Sep 2020 05:13:13 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1599826393; cv=pass; d=google.com; s=arc-20160816; b=0LRXa3Nda0H/wQ31MiS8l+I6F3JrFP6T0zT3UsqiQGF4KTrf9MSJEJ1Z32Iu/ii1fQ L/JqEfHwYJLWwbzFz9LAQ4pEb62PEpaOmtwl2AJvnMk9hheE8kq2RmyzPsdRMT0P8HQ6 I1huGpAVwK+/ul1SDMBI7t0E3tcgSsqauZ/C+v+FA9NILTiNyJyBMSi6LeFuBgG5ecmq WDECSIkDKsYBdx+jVSmtLItu858YBW9pZSjywUV+ftGT97JvtQBzeO0SVckmFIbVqvhe kt9ctSIMIatAL2TqlliQfr3BeGzwJXQYJ7G4Fyet0c3q16XNp787MX1flurBlqk8Aa8n TLIQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=93eNy8CuyUg8/R530zDtFLYCyYT+Nfca6CjbrfXZDQY=; b=u2nWruo729DCEP3PfCw8i54UVKBZZhfb2Ir9w1FAHKFSYfs5keJ9cfORfhpphKATHE U9eh3DT2GT0I0mwXVdcdhxArdwAX3YFc/J0r9roHH+52TIW7xqndKop/qE2WCZy+J08o 4doHBISkg6SuFZNesM2YqWpsxWkQhz8nzVS/ahjCsf6ixMzHlUJKwsH+rpVDP5OQTaXf OVuwpnvZAm8DfdJhAgOXy9jQLY8oAup1T0XYNZdScWbVsyXfJ3o/JAMGF3sd7UrzPUyj m46/NITiIDI2Q00ZSJxmrzYwoAsGdPM3i7lKaSYHU4ehr53MwHsUgUEDuA+H0c9EYh5K aGmw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=C1TfzONK; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbwgt5x5akgqe3tcd3kq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBWGT5X5AKGQE3TCD3KQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id w14sor931455ljm.66.2020.09.11.05.13.12 (Google Transport Security); Fri, 11 Sep 2020 05:13:13 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbwgt5x5akgqe3tcd3kq@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=C1TfzONK; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbwgt5x5akgqe3tcd3kq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBWGT5X5AKGQE3TCD3KQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1599826392; cv=pass; d=google.com; s=arc-20160816; b=up0rbt4TtLTUO+2FITNiy73V8YURznnpNLKlGJIUHEAxMH6RYzzUSNExV47nmLTL0S 2hCesOUoTVpiLbNkPRMoWdKC9W4SF+j88w0xNVJxXgE4mUnkDux2fgkdXMdvi2QVrNa+ V1p8ieDMuKraF2ppMwGypP+d6QfG9Tw+LKgE6Rt3AaQQdAQbmjfjvf+tzSrOzrCFqg13 bDnuCdKFglXiznclxvYOWq1Uht4TOHpZG4zx6NFPOB1FR/9G3FoWlvTG8I1daxyrfjYi 4YsNuYFIW9FrjNKispoM+xOElhEM+dBYiOd8F25/OJPJSNebcbkd+89+lVVsyqIxymoT /nCA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=93eNy8CuyUg8/R530zDtFLYCyYT+Nfca6CjbrfXZDQY=; b=Z4odT/y6D87md2MQE9YQMbKE66I6KEFJIy6/I+/5eHbAhHz6NDy5JPTflz9nfFa+l3 iBAl81fScZT7kIN50H0xyUuUCoT2XIxX7DzXCOA9GewcPNcasPL1iuOwzfp7hdXdDirJ e6LlVnva4mRamaStIzpzbKClHlDYo1AN60VQ0CKKrewyuyy1RQeO7HhrWiC9Iz+xMWpk 0R2AmlXUUqC6kAtaKVCipduve1evSM4MicmDRDokN2owTEFivXFeaoeu2ol+S6XoRnqJ 5G/COthdRIhxFfYXpUOO7f69xdU+xdS6RfBAy8lFhwMJ+B6GDYI7YK+UB/rQOc6/kBBW VIbw== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=93eNy8CuyUg8/R530zDtFLYCyYT+Nfca6CjbrfXZDQY=; b=C1TfzONKhf6ETQokDz+Dgr7bF3oWlQKQEpkYBKhy81CvUTSp3fc0MRsLtaWWlUH2o7 uymNmJxntK460yW0ryS7NF6lne9zx+YGYNfJHcQSdO41AT2wzEOjFVle6Cik8h++c3KI PWo0LZYE7BqszXiNEmya0ipvAdhQF9pET9ntgUx4AMt5xwx8ljJ6jfTUtF5upvQA3OWC sPWfEPs5O2qlODfEdMyXpeniJ43jfNWnJb9yS5nypWsAM0fIfJOuIxhBmT98zTLwFmBm k2iI3Q3/NnL4RkBA8MvaGttSU6jIj2a1G9y766bbEKI3o9+DFuYlR8wpGyVrkZ1ZLquj YMzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=93eNy8CuyUg8/R530zDtFLYCyYT+Nfca6CjbrfXZDQY=; b=WCUN9hVLW4c8qET1u++LczNPAY11hpRdKNwRMaG8CQ2YxQPX/PXtWEvZK1+o0kQ/u1 ttmsrOwm+VKR8u7CeT7hWDnyQj1wJY6M+ounhOR7ErRw84lhw8H52Nj6HcQtbx1u+PoS X/Za2HHvNwvdQa3PY9n2fVuVwi9ZVd+uDddSXLx0z7dIZ8ck+KWAUnUOdkXgf58x5ktO H15UgjOir6HrS46ik8yDVjzzspdV/jD9uWb32lOCUyGn32+Dr2eIIFpK4ppkYn8puM2M 3m+HJ9xJteMIqedTbmH9yAILSI0+9wJWseG9MQabyxEnNZBEMD8guTF/E5VjHAin+RxK 9jEQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5331u526lRu6653AOcx4By3+L0oGNOZud+1VvdzFlz6gSk7sD9nl us09U2hXw1veHEnPlv1Mtm0= X-Google-Smtp-Source: ABdhPJwTQYRsir8IPU5gHOYf5eGNZ72H254CTwxG8DXTTHand7nbDPDM2dVfng4slt1J7uvKmw+I6A== X-Received: by 2002:a2e:7213:: with SMTP id n19mr728519ljc.326.1599826392725; 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-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 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; 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 X-Original-Sender: jan.kiszka@siemens.com X-Original-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 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: INBOX X-GMAIL-THRID: =?utf-8?q?1677539560413277770?= X-GMAIL-MSGID: =?utf-8?q?1677539560413277770?= 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 <