From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7197016923412889600 X-Received: by 2002:a05:600c:1e20:b0:3df:97a1:75e8 with SMTP id ay32-20020a05600c1e2000b003df97a175e8mr1983833wmb.0.1677838849667; Fri, 03 Mar 2023 02:20:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:64ca:0:b0:2c5:557d:88a3 with SMTP id f10-20020a5d64ca000000b002c5557d88a3ls3574233wri.3.-pod-prod-gmail; Fri, 03 Mar 2023 02:20:48 -0800 (PST) X-Google-Smtp-Source: AK7set+mIobO+29+7zBAfKzuzErW5oVRJF8AjfJQYzi02eD1dCMIKFhPKddahxrw5DDgpYyIknoc X-Received: by 2002:a5d:46c8:0:b0:2c7:df1:a09d with SMTP id g8-20020a5d46c8000000b002c70df1a09dmr877303wrs.4.1677838848268; Fri, 03 Mar 2023 02:20:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677838848; cv=none; d=google.com; s=arc-20160816; b=xezebJJ7trPeDXJQ6XfC+W47UEwuVCPFormIfbKrVXS2Mc6yvLWqbuP2wQCY7Ec4wq YZ6wPjJdoOMdEitbEUyjj7xTGg3mco45Kv2H+zOZetS4gzCiQgQoMdK7/eJif2Y4pv+o tmseF7iFRUx5LRuTOXLk/o1Zhk55N3UTYCAJUqWATHFMfA5j1nsjMGgGt+5gz4Bgcgv9 aUG4Ik58Y/Ekvy9m7G5r4o1DClJDn96abwwopNoFN/Vn0ZULw04T1C8i121bnzCB+bPM HTfrGvi5f7QuU8YPx0r4c43ytdign9xf4Vx7KM05IEnwSj+ymEZgkh7hiBZkbR3t7PX3 Z1eQ== 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=vKkoPpa+B2w0W2ZW56K4PkShC1/AQscOxWjigjSSCMk=; b=AOWT+djEpYFCcKUDbbOPs50gtzxAPgIyvUGv4lb1Fn6K/nD+xxnOCUHNjgRD9cPWUY SvjsqlU0+Xa3lgCMaFOgs46GgLGKtxVQSrC84CTmX7IRyYCLLd09pEyO3OVGjYO2EmWV vnvQ51FLeFQQa5L/SqD85l7+uOtSetsbztqoVhcpMQfhc2AnF99n0xOw0Kc78Vm4z+ug H6vjt6/tND5ODL9CX6Vkj+2OTWaEWIhbKhYxlgpRBc/wlq+X47flPLfXGX7T+KW1ISGk 71ad0aRIQom4IHZtGdvzyD9na1TTRDkHTcwxcNWo42SePRqW1duJsrkX9/RzS/iwg4g/ +hsQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=PowWZv8U; spf=pass (google.com: domain of fm-526363-202303031020482f4e88450e27f58469-jus69_@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-202303031020482f4e88450e27f58469-juS69_@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 bn3-20020a056000060300b002c59bef13d2si71560wrb.8.2023.03.03.02.20.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2023 02:20:48 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-202303031020482f4e88450e27f58469-jus69_@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=PowWZv8U; spf=pass (google.com: domain of fm-526363-202303031020482f4e88450e27f58469-jus69_@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-202303031020482f4e88450e27f58469-juS69_@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 202303031020482f4e88450e27f58469 for ; Fri, 03 Mar 2023 11:20:48 +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=vKkoPpa+B2w0W2ZW56K4PkShC1/AQscOxWjigjSSCMk=; b=PowWZv8UUgU0T7qxkpakaz+c7QdZVdzh7hwXIbXLHy7M1hFAYLVwcZtQqwS0rgjh2FnhgX mTxprlICQdABW8FxLdLBfug2E1iyPLT9EQT7Zi1SRRibSy52As82r5CsMrBwCZ+Ocj0vTNR/ wqZ7ZQ/pYiUWX1usYkgVbTE3LHEac=; From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v4 3/4] remove obsolete compat-arch override Date: Fri, 3 Mar 2023 11:20:44 +0100 Message-Id: <20230303102045.4140027-4-adriaan.schmidt@siemens.com> In-Reply-To: <20230303102045.4140027-1-adriaan.schmidt@siemens.com> References: <20230303102045.4140027-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: OJFwkxbWW6g6 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 5eebd5aa..34438f7f 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -97,7 +97,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