From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6868613252732944384 X-Received: by 2002:a19:d2:: with SMTP id 201mr3732301lfa.53.1599223645202; Fri, 04 Sep 2020 05:47:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b0e9:: with SMTP id h9ls1889227ljl.5.gmail; Fri, 04 Sep 2020 05:47:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwA474iBWV1JkVhgi+3F11XF6a6KCmrqoTGuVZ/49UCP4sND0lZEbHCyr/eg5P05OUQsbqG X-Received: by 2002:a2e:b174:: with SMTP id a20mr3617563ljm.407.1599223644437; Fri, 04 Sep 2020 05:47:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599223644; cv=none; d=google.com; s=arc-20160816; b=h3imy6asemqYIrRhC0WG9h0g3uBHc2d1RKgZfhAjWoBZ/ExujZslUs9P6vid09CGq2 SYWK7PD58/ASfveKHpIySMF97x0dMSA8qZPpYKe64+ewbk7H45wwiLkMFGiMja4lkBky Z4A8gpkU/RyMVu/BZMCq3z0tn5OHIETjcJiQaEuZzeXH/HKNs/GsAp/IUHBVG89XZM0+ QLRRMXnTYUVRmpmy9o0Fc5qVPUxBXMMVtpBo7pbGZ/jD8kpwdqkx79uS82fj3+08GOoj 2IBTqiThcqtc3RYj7WfaI/7JogNt4j0Y4TrHRafIhUibX4TTOFgRHi6c+hrx2FCzPhko vDYA== 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=zW3mYheMcuXTgGjdzRVHtnMe60u2EiSx2wyjtO4CFCY=; b=zAJfErYQYh7NkxyLhpFgoKR8Kmz8cgh197EOz3V0eYmrbaEf2s8ZxIsLK58CYxY2fX EqdAwkxqD3LIVGfoWe+titNwgeAQ3i/RecLCyoqXoNK4NE0RXL2SbcL3IgadFRHW2JMV Gy9Q045GI4C/ylEFJmnJCRxo/FXo/kH5wnf6NzX2HZfD0w+pynLdLt0Og/qPzLvz0gMf 1nOtkOoIdCU/qAMlzPKYZd4Eiv2k18pgWPdsV8uZ/erRiEjZzxRhe/CVUlmQ1XJAUYju XsHYx9oolOLWvrk9gaH8+tDE8s1lwvaX1ShR6TTXCeHNZK2zxUdv9WrJSyKOV/oNm/hA l+0A== 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 z6si218814ljz.8.2020.09.04.05.47.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Sep 2020 05:47:24 -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 084ClN5Y012328 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 4 Sep 2020 14:47:23 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.249.163]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 084ClL1H005130 for ; Fri, 4 Sep 2020 14:47:23 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 2/2] ci: Add compat arch support Date: Fri, 4 Sep 2020 14:47:21 +0200 Message-Id: <64fa79e829f2b29553b2baedabc766f7ec3ef230.1599223641.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: M3ueszz5gs7e From: Jan Kiszka Build hello-isar and libisar for the compat arch if that is enabled. Set ISAR_ENABLE_COMPAT_ARCH for all supported combinations in CI. Signed-off-by: Jan Kiszka --- meta-isar/recipes-app/hello-isar/hello-isar.bb | 3 +++ meta-isar/recipes-app/libhello/libhello.bb | 3 +++ scripts/ci_build.sh | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb b/meta-isar/recipes-app/hello-isar/hello-isar.bb index 144a433e..8c3ba8b2 100644 --- a/meta-isar/recipes-app/hello-isar/hello-isar.bb +++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb @@ -20,4 +20,7 @@ SRC_URI = " \ file://yet-another-change.txt;apply=yes;striplevel=0" SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d" +# NOTE: This is just to test 32-bit building on 64-bit archs. +PACKAGE_ARCH_compat-arch = "${COMPAT_DISTRO_ARCH}" + inherit dpkg diff --git a/meta-isar/recipes-app/libhello/libhello.bb b/meta-isar/recipes-app/libhello/libhello.bb index ab271b58..5c44de50 100644 --- a/meta-isar/recipes-app/libhello/libhello.bb +++ b/meta-isar/recipes-app/libhello/libhello.bb @@ -13,4 +13,7 @@ PV = "0.1-98f2e41" SRC_URI = "git://github.com/ilbers/libhello.git;protocol=https;destsuffix=${P}" SRCREV = "98f2e41e7d05ab8d19b0c5d160b104b725c8fd93" +# NOTE: This is just to test 32-bit building on 64-bit archs. +PACKAGE_ARCH_compat-arch = "${COMPAT_DISTRO_ARCH}" + inherit dpkg 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 <