From patchwork Mon May 12 08:32:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4205 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 12 May 2025 10:32:57 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f61.google.com (mail-ed1-f61.google.com [209.85.208.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 54C8WurV018183 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 12 May 2025 10:32:56 +0200 Received: by mail-ed1-f61.google.com with SMTP id 4fb4d7f45d1cf-5fbc2b3180asf3799218a12.3 for ; Mon, 12 May 2025 01:32:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1747038770; cv=pass; d=google.com; s=arc-20240605; b=ZocKi9MhT2jTDAUHUr+Y1QrLZmSaUKuhUx4sEH9P10R7Wxvt08T9z3qIMC+kBNT5j1 tGOe2A9f3j9wm3j3bAWSN5IwWgVhEdRbF7Nh0EfAaBSkMNqF4X7Cqv/ivTFpfxpsMmQN jmfvQCAFYNobgzX9eACiqbSwconp/dqkDTQMDr682S+9EtaylPyLEkIXVWzgT0tni//P 17RioChDjS1Uc4s8GdBOww94s8wTfwfFatxSvHm66T62f8z/N9aX9buEm4SQemIfwX1O o349wHCxYQGhU7879L2UpCbP7t8V9JPA6T4VpFcjCV/tr8uyfe49FBlqw7dENCLsZvcn 9RcA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=KPFImk5yiU4s8gtSw5HuWF5h44n1jjVW0j6fq7ijvlE=; fh=K7E57cFdAxcPliEsWzEcn67e3yLUB+l6IwdT8YbRpwI=; b=HWasSiHye06Zc+o9rLHcNR8zo5et6SRSwIzlVHWxjj81BL77ScUIrWite0dVnIhT9B W9wnFKTjkLnE0QSIttFtXMdJ+JGZh3HxmdyN30FByavFFPK1CXs5eOkhs/azi9XW5ehX QN/Zb0A5zwA7MOpFNs1ARXLx9cXPz2ZcXlErvMr/TygwKWfTlLHWGw+WDVAMzMnICq71 FmwZrjTADlTELniq135VHzW3naXEBRfMlZa3LnBLR08ArkXVn4PLLiyqH0jE3ZxpSrSh izmbF/You8gOHa2TllLr79T9+WIwjbJGbgp7mxH/MLt8MnPOkPb5uo+/8jXpSdVrNwv3 ixhg==; 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=1747038770; x=1747643570; 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=KPFImk5yiU4s8gtSw5HuWF5h44n1jjVW0j6fq7ijvlE=; b=BG+lbn39nbJOxw3M/xR0qKi+7c5GSZx2DZXnFBQ3ovV69zyrrB7dXxlKAZ03IhA/Kd n70QtsYGqI+7wccwp7hWKZmdbqCGFDlIMRHUUnqwOno76bNuQnhY8amN3D7JfPFustxl 7Ap6JDRWufSPSKPNPFGqoX10qf2h1gK8+EVicXEb7e9wyNsSEbOkLJSuNvk/xiqj0Yyi PgCY/UsaMvEFX9P7eWYEk2vK6iIns6Tp8jwkLmFgY+BS4Nki0Q0F3zDr0CPKP5qlA4Q5 4OLlRpba1S0r8+C98q/lnC+GTlw2dJ8awJwc98qM9QWmUHuEAFxLeLZyYst5aaT8KiSn pVBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747038770; x=1747643570; 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=KPFImk5yiU4s8gtSw5HuWF5h44n1jjVW0j6fq7ijvlE=; b=eYbS7EY7EiVYrLZoqMtAG0aEbTDwxhe+up4hdF6Ll0uIkoJAoBlUZ2E+rCsI1D0se4 UI1RMP6Q980nDu6leCs3HBaDeaM+0QvLVnGRG9hYSb+EkhGguK50fQ2Zi2Jt4n5X+0YN dH6HwdruCetGtZ/YosaBq8/wwtqokHLspDruPmf/hqc2bulJ/5Dj+vH7knN+BC+ByIb3 iNPbLdfRwfwAsv9AiqbqRUhbZu3ZMVYbo24H6Y8F6G/paWTiCj/pVhJTs/9WXP/g21xM 8Cz/ZEeCEPaRfPX22NOJGb/lAwgtSm0ujpzmGqYB3QIUO1fCWHjoN7PEYNpKCqgmCecD d9oQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUUsAgfxF1oO2m5MOD2BSeW/BjG+hSSl/rVEgCGgqnFkBNNMKC9jEgxBZxZQJKvjsxCkK54SQg=@isar-build.org X-Gm-Message-State: AOJu0YwjfpXqAuz3q8TJIuLpfza45RywkRw5YLUytdqu1yEgsKe36A2e 5C2BP+5aoOL+212tOyEnXLwD7orajNjcT3kzE07baMouJ64uiGBH X-Google-Smtp-Source: AGHT+IGmt9xKTs3l7J35rIREUOs662Q/EsNeEJszDUJ9fB3jtvOKGqd4t/rXFUcZyyqj9b4OCLVQGA== X-Received: by 2002:a05:6402:520b:b0:5fa:b131:f009 with SMTP id 4fb4d7f45d1cf-5fca035eb58mr9631486a12.0.1747038769975; Mon, 12 May 2025 01:32:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AVT/gBEWFiWPxsv8WKIiDMFLkeoUoW7O+vPduH95DEdozQ0ndg== Received: by 2002:a50:cd42:0:b0:5fc:ae51:bac with SMTP id 4fb4d7f45d1cf-5fcae510cc0ls436976a12.1.-pod-prod-01-eu; Mon, 12 May 2025 01:32:47 -0700 (PDT) X-Received: by 2002:a17:907:d91:b0:ad2:40e0:3e56 with SMTP id a640c23a62f3a-ad240e03f9cmr661876466b.57.1747038767459; Mon, 12 May 2025 01:32:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747038767; cv=none; d=google.com; s=arc-20240605; b=ePpfRG4hMPNDAkyRRDHYGIrztDlTVMo/UUhnQpXYAvLHRNa3gyqlmyntd0cQQlpeV4 GNG36p1dyCelattB3X5BXp0t+OysuSCgCEbkKuDdsQsd5RpqlliUTu46cZf2Cez3JkSV 1GEyr6O/DCXPiRyXzb432GWL/RO8ieo8axar/XWwwrdTX39H6AKL21FDOkud0ZxmZW39 TH4DHzs1PATMEufwEW99SMVg1g1CaeScPlIQ99Df3uE7fz0m5amo78ZywzfyRYIEjvrr /RCvBspSKJyRkY0XZmfKcs7DtNivUVz3uOTftqecowcI+VBeElgXGnHeBUheSMV2UTQR vsLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=MUwzPnnQh3N+Az1MBDvJlqyeHjYF070m+QVirc4Lf+8=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=cf7/u6Zhm4NPGS3N8U8D015zADaK/3uRmeVtCKty6MZyAsy7j/z8iVBMIS+pZHS4TB p8HD/0LsqCRMx2LaAp2Ip/fPIXTEcyitoMG9JaRfc5+Ic1OyRLPMbkKJJThjjqWQjAZV XtMXqSsbJVSaiuVcE0NpEjJXSPOkUztW8R8Oul+XVlOtOht8Hk8+0VqhU64gN2Asr74d TXru0A11vMagppq9LtdRGVU/Xs0NYpI+wEh9puD5RH7vZo8t5xGH33Voz7SVwiNRPzzu WtaCgGhjkCxVUJ+HXYQXZwmMJorMjAdAp/i1QOptOpUaRU0Io0EkPvQBnWkvNzfKg10S q+7w==; 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 4fb4d7f45d1cf-5fc9d70e2b9si215152a12.5.2025.05.12.01.32.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:32:47 -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 54C8Wjvp018145 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 May 2025 10:32:46 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 1/3] CI: Remove container package list hack from testsuite Date: Mon, 12 May 2025 11:32:36 +0300 Message-Id: <20250512083238.2089774-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250512083238.2089774-1-amikan@ilbers.de> References: <20250512083238.2089774-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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. This will allow to build container targets just like any other. Signed-off-by: Anton Mikanovich --- meta-isar/conf/local.conf.sample | 4 ++++ meta-test/conf/local.conf.sample | 3 +++ testsuite/cibuilder.py | 4 ---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 52ea2fb5..9bc95dfd 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -154,6 +154,10 @@ CONF_VERSION = "1" # The default list of extra packages to be installed. IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck isar-exclude-docs samefile hello isar-disable-apt-cache cowsay example-prebuilt" +# +# Container machines don't need example module and enable-fsck. +IMAGE_INSTALL:remove:container-amd64 = "example-module-${KERNEL_NAME} enable-fsck" + # # Machines with secure boot should use signed modules. IMAGE_INSTALL:remove:qemuamd64-sb = "example-module-${KERNEL_NAME}" diff --git a/meta-test/conf/local.conf.sample b/meta-test/conf/local.conf.sample index f692f533..092d6ba6 100644 --- a/meta-test/conf/local.conf.sample +++ b/meta-test/conf/local.conf.sample @@ -30,6 +30,9 @@ MIRRORS += "https?://cdn\.kernel\.org/.* https://mirrors.edge.kernel.org/PATH" # The default list of extra packages IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck isar-exclude-docs samefile hello isar-disable-apt-cache cowsay example-prebuilt" +# Container machines don't need example module and enable-fsck. +IMAGE_INSTALL:remove:container-amd64 = "example-module-${KERNEL_NAME} enable-fsck" + # Machines with secure boot should use signed modules IMAGE_INSTALL:remove:qemuamd64-sb = "example-module-${KERNEL_NAME}" IMAGE_INSTALL:append:qemuamd64-sb = " example-module-signed-${KERNEL_NAME}" diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index c2520f7b..7d702b35 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -199,10 +199,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: