From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7197016923412889600 X-Received: by 2002:a5d:6410:0:b0:2c5:8377:3eaf with SMTP id z16-20020a5d6410000000b002c583773eafmr1015205wru.2.1677248676164; Fri, 24 Feb 2023 06:24:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:696:b0:2c5:557d:88a3 with SMTP id bo22-20020a056000069600b002c5557d88a3ls755326wrb.3.-pod-prod-gmail; Fri, 24 Feb 2023 06:24:34 -0800 (PST) X-Google-Smtp-Source: AK7set8/AMBpip95GeZlUVFS35vi0mF4P1QwNLTfT9JjRhY2+je5Hspzk0lieQip2G0vyCB2DUmQ X-Received: by 2002:a5d:440c:0:b0:2c7:778:5da6 with SMTP id z12-20020a5d440c000000b002c707785da6mr10194865wrq.42.1677248674731; Fri, 24 Feb 2023 06:24:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677248674; cv=none; d=google.com; s=arc-20160816; b=y2pMWJTwqbWd1htvSSixpFHcxae4TUG6oXLp1rQnpnf9/ZWYl+Rle8Casj1KPy6U4m SbhYxwE0qujt0LKd2zaTQQ3cs3+Z4CjmxAOG8yHxqBoN3eMURpYwFGNR6bxCoOPDXxjI ipmvRNPFICRQXSUa3bqbvkMrnuSYGnZwuEFMS90usd1hmDl+hwTI8b+T7MovRrJatXl7 HO0qb8XNwAdm3c1ZOjJaAcEyKc1azVYFkhL4lUJ6LCbCSnY7Xj1/992FZIfewacv99Sf sUxFHfzcp12Z1NvPHn36mrRcwurKOqlgCfd//LKneAik18K7KHpa+BzPJjcYBeoF60u8 TIxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=36Qn3lfVWtLGImPdyY9sq/eoqRcNZ/3FLq2TjYu8Y9A=; b=k8A68JGRj3t33030lKFP7qTI2wwVr1h9WmLlegDhqyEPq8f6IwrZ31+GGqUn67tIVm r++UhlKVoyEiq9THppDaZ59Bbf59yi71TeYW1Eikb2/08LDVgDYPi9x9twzp2KkVyw27 +ntHwfeqCldzWtVVUq/wzleMwNd1BzeLWQB4yvxOqjrYG9evGh6XYeVxpLHK6I/AMVuR PQtfRc4KVxVt5JcMmjmhjnXe43e7rE2p60g8F+LG85o+8ryibT5SpXHGdNZp2FpLZGco B2md971/Vq+C+jJMotMf6s5xy1Tce5YkW8htNrqHCy9pHGkoDmX2kY/o9/8gnGkhDpF2 PqQQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bxE5p6ON; spf=pass (google.com: domain of fm-526363-20230224142434bb5b3b397888bd2639-grydpz@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434bb5b3b397888bd2639-gRYDPZ@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id cc13-20020a5d5c0d000000b002c6eaaaac82si524674wrb.7.2023.02.24.06.24.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Feb 2023 06:24:34 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-20230224142434bb5b3b397888bd2639-grydpz@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bxE5p6ON; spf=pass (google.com: domain of fm-526363-20230224142434bb5b3b397888bd2639-grydpz@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434bb5b3b397888bd2639-gRYDPZ@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20230224142434bb5b3b397888bd2639 for ; Fri, 24 Feb 2023 15:24:34 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=adriaan.schmidt@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=36Qn3lfVWtLGImPdyY9sq/eoqRcNZ/3FLq2TjYu8Y9A=; b=bxE5p6ONiysRWs8sIf/0bIxG0g/ze3iKr6nu6rkKhKJQOzl2ETMx+nn/8fVZVSNbatbQXR Q4idduFZAxK0945crru4Llmw4qwXL0kbZpT0f71zNpREnnq9If/TELk5mUAzVdBynDqWAI0J I/76JV/Cr+6aHX7X/kjkX7tY6my5Y=; From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v3 3/4] remove obsolete compat-arch override Date: Fri, 24 Feb 2023 15:24:31 +0100 Message-Id: <20230224142432.3767746-4-adriaan.schmidt@siemens.com> In-Reply-To: <20230224142432.3767746-1-adriaan.schmidt@siemens.com> References: <20230224142432.3767746-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-526363:519-21489:flowmailer X-TUID: ajR9fQggBtG/ The compat-arch override is no longer needed, as PACKAGE_ARCH is controlled by DEPENDing on -compat. Also change the compat test: adding the compat package now happens via IMAGE_INSTALL in the config. Signed-off-by: Adriaan Schmidt --- meta-isar/recipes-app/hello-isar/hello-isar.bb | 3 --- meta-isar/recipes-app/libhello/libhello.bb | 3 --- meta/conf/bitbake.conf | 3 +-- testsuite/cibuilder.py | 4 ++++ 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb b/meta-isar/recipes-app/hello-isar/hello-isar.bb index 39ddecb9..7d9f8322 100644 --- a/meta-isar/recipes-app/hello-isar/hello-isar.bb +++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb @@ -20,7 +20,4 @@ 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 3770fdb4..8b10842f 100644 --- a/meta-isar/recipes-app/libhello/libhello.bb +++ b/meta-isar/recipes-app/libhello/libhello.bb @@ -13,7 +13,4 @@ PV = "0.1-98f2e41" SRC_URI = "git://github.com/ilbers/libhello.git;protocol=https;branch=master;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/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index dd21319a..0c79a5b6 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -67,9 +67,8 @@ KERNEL_FILE:mipsel ?= "vmlinux" KERNEL_FILE:riscv64 ?= "vmlinux" KERNEL_FILE:arm64 ?= "vmlinux" -OVERRIDES = "${PACKAGE_ARCH}:${COMPAT_OVERRIDE}:${MACHINE}:${DISTRO}:${BASE_DISTRO_CODENAME}:forcevariable" +OVERRIDES = "${PACKAGE_ARCH}:${MACHINE}:${DISTRO}:${BASE_DISTRO_CODENAME}:forcevariable" FILESOVERRIDES = "${PACKAGE_ARCH}:${MACHINE}" -COMPAT_OVERRIDE = "${@'compat-arch' if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1' else ''}" # Setting default QEMU_ARCH variables for different DISTRO_ARCH: QEMU_ARCH:amd64 = "x86_64" diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 72522f4d..89d01531 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -96,7 +96,11 @@ class CIBuilder(Test): with open(self.build_dir + '/conf/ci_build.conf', 'w') as f: if compat_arch: f.write('ISAR_ENABLE_COMPAT_ARCH:amd64 = "1"\n') + f.write('IMAGE_INSTALL:remove:amd64 = "hello-isar"\n') + f.write('IMAGE_INSTALL:append:amd64 = " hello-isar-compat"\n') 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') f.write('IMAGE_INSTALL += "kselftest"\n') if cross: f.write('ISAR_CROSS_COMPILE = "1"\n') -- 2.30.2