From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7197016923412889600 X-Received: by 2002:ac2:53ba:0:b0:4d5:a160:6182 with SMTP id j26-20020ac253ba000000b004d5a1606182mr2961181lfh.81.1675686087664; Mon, 06 Feb 2023 04:21:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d1f:b0:4d1:8575:2d31 with SMTP id d31-20020a0565123d1f00b004d185752d31ls336771lfv.0.-pod-prod-gmail; Mon, 06 Feb 2023 04:21:26 -0800 (PST) X-Google-Smtp-Source: AK7set8eOZlHLBbOX1bxDnrMzAapWeG1X8JtP1Ojp/QB6aqOQfYRfih+7KsZGUnzZBAALWo5M1YM X-Received: by 2002:a05:6512:141:b0:4cb:88c:c794 with SMTP id m1-20020a056512014100b004cb088cc794mr4819859lfo.35.1675686086161; Mon, 06 Feb 2023 04:21:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675686086; cv=none; d=google.com; s=arc-20160816; b=Q8LeIcFNBjH7hlPPi+bqHC3f6P1GnnExujj4XZ/NBVRtRwmBqvanyswvevKY8E0Gns EEDWtj60QvaxMk/zZUkjiF7oFhXEhH6SlgxWDzDuBsbDKNQHtvcGDmbkCA9CbxDs5lQe yHmJHU96TR8okVPZYg5vxGXTtvoKjHzOMwYy+5jUIvNsIZrO1grWQ7wyF0tHvIt7VCaE CIA5Le+fywpXeNIcZ8sqMUR0b0e2dbU++lBzTHZS5JgoOrtwHAsLPKqRN8Pqpr2qUugM ShU68seGS1qfFFl6HUa/pfW+/DggL5d6P/tDvdulsTrvGGV1VKeJ7BO87en6tE/i+jxI aMJw== 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=K0hgveGFs+R/APHXdAJz0+yF5+yVh/GpQ5g8XBpoawU=; b=PDlTSNgnTRR1WpA07JJIHK7VdygnQP+B/TePxcv+zaAeA55BCOZzzrElkQbshwzylq Ru6xm4rlLNJ4C9YO7mDevk/eQe+2FJUSoLNgp02YkZnAZC9j6hii2hwpvdf04k7n+GHC wFOAj2IUZ3in39fwU+1++ICamFHrCg0ZMUF3ju6mOHdB23XynMCpdKv/QJc9NPbwWVxm zxiT9EzilRRt83xeZF2qKrYLknBHJ1eUDWf8/B9+DxKfROWKaDfuu7AljeJ0GsuNaIH0 vwY6izPTnfBmoWQqTRQWBQgsfM/9WprW8eLpI/CMZA1rnux3chfwhmR2fLg9klllkHDf cmtg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=oyPqUYwN; spf=pass (google.com: domain of fm-526363-2023020612212502f3a8c67686280de8-rqvapf@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-2023020612212502f3a8c67686280de8-rQvApF@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 k31-20020a0565123d9f00b004cb0f0982f3si473663lfv.4.2023.02.06.04.21.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Feb 2023 04:21:26 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-2023020612212502f3a8c67686280de8-rqvapf@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=oyPqUYwN; spf=pass (google.com: domain of fm-526363-2023020612212502f3a8c67686280de8-rqvapf@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-2023020612212502f3a8c67686280de8-rQvApF@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 2023020612212502f3a8c67686280de8 for ; Mon, 06 Feb 2023 13:21:25 +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=K0hgveGFs+R/APHXdAJz0+yF5+yVh/GpQ5g8XBpoawU=; b=oyPqUYwNz2YATdUw0mzPJSeaKp6vWkSWwuOJnaUn66Drw8nLoetLc2Bi98UsGqRm7wgYcd ilxpui+0R7ffKSXjRPvpVIsIW4kQPiQ4EXQHV3tkLeNSOXusBbSwJmbNRNf+119hOfIUtLTM GGHnSQ5vRniqJt57hdACOk5h89wWI=; From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, Adriaan Schmidt Subject: [PATCH 3/3] remove obsolete compat-arch override Date: Mon, 6 Feb 2023 13:20:50 +0100 Message-Id: <20230206122050.337270-4-adriaan.schmidt@siemens.com> In-Reply-To: <20230206122050.337270-1-adriaan.schmidt@siemens.com> References: <20230206122050.337270-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: tc4+eGxIUcma 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 +-- .../recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 ++ .../sbuild-chroot/sbuild-chroot.inc | 14 ++++++++------ testsuite/cibuilder.py | 2 ++ 6 files changed, 13 insertions(+), 14 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 f38bb447..1f010f4b 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/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 99d75e21..21a2d92f 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -274,6 +274,8 @@ do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}" do_bootstrap[depends] = "base-apt:do_cache isar-apt:do_cache_config" do_bootstrap[network] = "${TASK_USE_NETWORK_AND_SUDO}" +inherit compat + do_bootstrap() { if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then if [ -z "${COMPAT_DISTRO_ARCH}" ]; then diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index fb061dac..fd8bb648 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 PV = "1.0" inherit rootfs +inherit compat python() { distro_gcc = d.getVar('DISTRO_GCC') @@ -20,18 +21,19 @@ python() { d.appendVar('SBUILD_CHROOT_PREINSTALL_COMMON', ' libstdc++-{}-dev:{}'.format(distro_gcc, distro_arch)) - if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1': - compat_arch = d.getVar('COMPAT_DISTRO_ARCH') + if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1': + compat_arch = d.getVar('COMPAT_DISTRO_ARCH') + d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL', + ' libc6-dev:{}'.format(compat_arch)) + d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL', + ' crossbuild-essential-{}'.format(compat_arch)) + if d.getVar('DISTRO_GCC'): d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL', ' libgcc-{}-dev:{}'.format(distro_gcc, compat_arch)) d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL', ' libstdc++-{}-dev:{}'.format(distro_gcc, compat_arch)) } -SBUILD_CHROOT_COMPAT_PREINSTALL:compat-arch = " \ - libc6-dev:${COMPAT_DISTRO_ARCH} \ - crossbuild-essential-${COMPAT_DISTRO_ARCH}" - SBUILD_CHROOT_PREINSTALL_COMMON = " \ ${SBUILD_CHROOT_COMPAT_PREINSTALL} \ libc6-dev:${DISTRO_ARCH} \ diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 9d1b80f7..0b68e87d 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -92,7 +92,9 @@ 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:append:amd64 = " hello-isar-compat"\n') f.write('ISAR_ENABLE_COMPAT_ARCH:arm64 = "1"\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