From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7350330382288420864 X-Received: by 2002:a05:600c:4594:b0:413:f033:e1ee with SMTP id r20-20020a05600c459400b00413f033e1eemr7206524wmo.9.1711382167489; Mon, 25 Mar 2024 08:56:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4f91:b0:414:76d4:1ab9 with SMTP id n17-20020a05600c4f9100b0041476d41ab9ls2574496wmq.1.-pod-prod-05-eu; Mon, 25 Mar 2024 08:56:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEScBAtwu1nVqaAh/lCE9sPRpDyweE2C48v0tgaPxbh3OyvQsxkPmeKtjf+7ok8mWKWEW9e X-Received: by 2002:a05:600c:4792:b0:413:e8db:2c9b with SMTP id k18-20020a05600c479200b00413e8db2c9bmr5799678wmo.40.1711382165625; Mon, 25 Mar 2024 08:56:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711382165; cv=none; d=google.com; s=arc-20160816; b=qNx6HxWhxmBldfcvtDRSspmq2KV9UI4VSQdnXjsH6SyvVtHje0+HWCd3ucXeBHd2Q4 5MjryhIToNgDSV4J1P6v/zdS/V8rqOLrSnrTiMR+qVur1j0NjOWdjW0B7KvHPshX+tgv /VJqD+dC/6v3pQt83t0WLEXhyY24QIocUXHzDiA2ffHVRC9s+1aNkVM1JOvcge9tA9iZ SULpVnmHrlsh5m4ZWXqeP7FU81oL9bUVYtce90WvV1kNCD4LpkQqBtkoCWBZxNXGqyQE QryMkIEVopO6tYSpf/IOwa90pI8ed7B7slN92OB92e5NbSI2AUCaeWnQW3tADuzYqAtW +ing== 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:cc:to:from; bh=ad8XvzhOUhUIgbbSkC2GRSRjk0b9wd6OlpSX6v7+Nps=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=jpedOy/6UW+MRHOdvxO+CpbiJuNVEED2Y3bjstzd/T+xz19QtaIqFjPahntmJk3Xh3 v5YYESbpyDQlk9fFnmrdho15AzdvnB9uTJy62b2auRjGE/NQM0FPciWTly9Tjhjsx1Iy 1LtmiOsl3Zezc2wgJgpug/UHdq6IiSVtPXUIaup1uYA4wIsJY+tat9zp3UpG/W3PmFuG mdg+ostpbftisiBDfx5uCIlgKd7sCb++9BE7jY9r8NRlvjpyDkYBadvFBShG/cIxO+eh 2aSbUpVwuLk0MG6eq1BxEi6L2n+VKaaOdKD66wBUdIQMR6KN3ZmivjQCzYOFzT2Lur+u +xCw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 18-20020a05600c26d200b00414003a3b96si189788wmv.1.2024.03.25.08.56.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2024 08:56:05 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 42PFtnLM011703 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Mar 2024 16:56:04 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 13/23] CI: Remove container package list hack from testsuite Date: Mon, 25 Mar 2024 17:55:30 +0200 Message-Id: <20240325155540.4162990-14-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240325155540.4162990-1-amikan@ilbers.de> References: <20240325155540.4162990-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: iZnhKhJRzv+S As IMAGE_INSTALL list is set in local.conf removing items should be also done in local.conf. Signed-off-by: Anton Mikanovich --- meta-isar/conf/local.conf.sample | 4 ++++ meta-test/conf/local.conf.sample | 3 +++ testsuite/cibuilder.py | 1 - 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 17455015..5baefa73 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -156,6 +156,10 @@ IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsc IMAGE_INSTALL:remove:qemuamd64-sb = "example-module-${KERNEL_NAME}" IMAGE_INSTALL:append:qemuamd64-sb = " example-module-signed-${KERNEL_NAME}" +# +# Remove not-needed packages for containerized images. +IMAGE_INSTALL:remove:container-amd64 = "example-module-${KERNEL_NAME} enable-fsck" + # # Enable cross-compilation support ISAR_CROSS_COMPILE ?= "0" diff --git a/meta-test/conf/local.conf.sample b/meta-test/conf/local.conf.sample index f692f533..029e0767 100644 --- a/meta-test/conf/local.conf.sample +++ b/meta-test/conf/local.conf.sample @@ -34,6 +34,9 @@ IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsc IMAGE_INSTALL:remove:qemuamd64-sb = "example-module-${KERNEL_NAME}" IMAGE_INSTALL:append:qemuamd64-sb = " example-module-signed-${KERNEL_NAME}" +# Remove not-needed packages for containerized images. +IMAGE_INSTALL:remove:container-amd64 = "example-module-${KERNEL_NAME} enable-fsck" + # Users and groups USERS += "root" USER_root[password] ??= "$6$rounds=10000$RXeWrnFmkY$DtuS/OmsAS2cCEDo0BF5qQsizIrq6jPgXnwv3PHqREJeKd1sXdHX/ayQtuQWVDHe0KIO0/sVH8dvQm1KthF0d/" diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index a4658ea7..0f26c906 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -134,7 +134,6 @@ class CIBuilder(Test): f.write('BB_NO_NETWORK = "1"\n') if container: f.write('SDK_FORMATS = "docker-archive"\n') - f.write('IMAGE_INSTALL:remove = "example-module-${KERNEL_NAME} enable-fsck"\n') if gpg_pub_key: f.write('BASE_REPO_KEY="file://' + gpg_pub_key + '"\n') if wic_deploy_parts: -- 2.34.1