From patchwork Mon Mar 25 15:55:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3442 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 25 Mar 2024 16:56:13 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 42PFuDFi012382 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 25 Mar 2024 16:56:13 +0100 Received: by mail-wm1-f63.google.com with SMTP id 5b1f17b1804b1-41485831b2dsf11745805e9.3 for ; Mon, 25 Mar 2024 08:56:13 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711382168; cv=pass; d=google.com; s=arc-20160816; b=WMSf/2uvqTKOHp1zB38D7zLKkGxKDo/33gLiRJh7qlZtOwsS3QYeQr2XfnXPbxB2Am 2leevkzUAbwCM5o/oMzRIFwcM5EAWQ9kPkEZzCycI3Oks26mZUwqpLgnCktfMw6j9/n7 KADitU0MtSQb3WM7fNlHolzvFYfm6KVIgpq1/0MArDtLAlBjpQPImQzaTMqq60+682AW G5AI792t/w8O6RMZ8w/blHs6iaw58cVeKgrIT63ZcOu8uXPAJKEkHjbpyIbaaF9WAMML SPjBEmkntw+y2a9WliyDAkmfvbuKeqOaJOdVstH/b1FYrsmHLb++JuWuyi7hYtBxhBhh 2kjA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=tMxNBTlsvjWFEm4FgWz523NzLB5UMFNiRgofxk2CrUs=; fh=NSUGujcmNzsDfEK8h8VHPb0DuwGlpVn6tBF316VYLzc=; b=0EpO0bWZb0RpIsKdHbemMdNNT+s6pvALDALzVspG5YH1STE6RxT/j1OQx1Pm9RUvpS gb4wAcEXCl9a/SeSSh+es2Gf2gCBAJSbGwL/B8aPkTs37WH3RRSOugfwUf6VPfyBokWF RMFYmhnSW+iZJdxNMea7C+BMvDS5tNiSbvvJJ4G4iG+WQ4/pOjUR0dLjH/xprOvujfG8 H720xG1bYa6vzU4lUPQUhj0pOgykEclnQHUgSRBEo0Dd+rLN8xW+31xIsM7dN+XKDj2n Mz53nJBKnqLVxGR3jMVtbuQ7qH0KpPDuW+o+J+jatZwPjgThp4AAShQ/1bzy6ctLPYdp HmDQ==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1711382168; x=1711986968; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=tMxNBTlsvjWFEm4FgWz523NzLB5UMFNiRgofxk2CrUs=; b=LscetXTKTTmd3nZVpQfXj+omNWcc/t0C1w+bqOP8uvVGRtDk5o4xfunk0SmW+zxfZJ nmjHNFZ641h9DeoQrI/8eAyRmdTC3o8+ck0HPCvMBJgEqEH5ubTjmQOtkkqyMlsqmXJc VJNOkgfzj/ca8OGy/5VzaQ1ih2xOaxwSkEfXbtPL1tQeEmWvUOPRdnQha4COWgfgHLhy REREjuY/B8wQKzD/nX1Wrk7X3dvycd9l+XW9eTByDf0kY78lyYCyVRll4m1ogoUa6XH3 clL5l/4XzuVj44WXcKK9BvLEtEds73Jotxd1U9QDRL6BfOQfG6vKyWmlRMZ/78wHPR3a ft5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711382168; x=1711986968; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=tMxNBTlsvjWFEm4FgWz523NzLB5UMFNiRgofxk2CrUs=; b=MXUmKt/tp40S181zQo9NjzOE3oPNJuVwxzh1A5Tt1XykXt3uU/Lu2uokH0//TsEvCg oQz0t4os4SnzF9iyt4suznzzDfOwx6B0A2F3EntmB+SIlLJIAE/N4J3wSBacbsLNJHe5 IwxLJWwCn4WiHtTwdNmZeFxwT2xBgy2QvnWjiaNOaFtYZJGkIoLGUYUdQa9kuZecqjuy jVuLlS32dOCjq38PGpdtguFmMieqN0RfqOqh0lxSYgM7oZ43uPF9f0297Tg6OsJhNe4V l6Uy//aG3eBLjhIgahdY8VN1MenZMQyhL6zHv5YrZvEEYdJxlqXNPQJamWUo3z9y+7dL j9gA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVezK3TV0OUDBwEeCmfWVIFFbkjnSCWrBo6oCQvww++sWXYzWvUmb83pgYbBk9e7sLqugxW/oasxcb9ftIiLpiNaEXZPgQ= X-Gm-Message-State: AOJu0YzVoqs/85K+VW/Yw1dC5297+PmxAbAU1yn/oXepNXBn8jBKVd2e CUZUoAudXwfhnUBs0+V1/ymBrwpS+TxV7+TtyPdZjvxnuLyum9vA X-Google-Smtp-Source: AGHT+IFGXPRom3CkC6oT4Zwxi0AghV7rZIWZ1sTgXflr+fVEKTBTMu4u5gwmen5ral/Kq1B6vd+CXA== X-Received: by 2002:a05:600c:4792:b0:413:e8db:2c9b with SMTP id k18-20020a05600c479200b00413e8db2c9bmr5799741wmo.40.1711382167422; 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-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 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; 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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS 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-Original-Sender: amikan@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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: