From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a7b:c145:: with SMTP id z5mr1864671wmi.147.1584779525913; Sat, 21 Mar 2020 01:32:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f803:: with SMTP id s3ls2838152wrp.10.gmail; Sat, 21 Mar 2020 01:32:05 -0700 (PDT) X-Google-Smtp-Source: ADFU+vv14edYNQ/zYQ6sFW5uK3c5LDcNPwK9/b2EK1ziSRxU2xj1mwpdFwf5WyPfsd0C5RrJ90lL X-Received: by 2002:adf:eb48:: with SMTP id u8mr15985404wrn.283.1584779525396; Sat, 21 Mar 2020 01:32:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584779525; cv=none; d=google.com; s=arc-20160816; b=wJVEcd2coPxiI3CBplJdEgZ6i+JqJSZ/Pw+1d51Cvci5cwhIRxd24RVLMeEVd8eGOn RQvwh5GkwZlKkKnQB8V6c34Y7QUgL8BujEk98p7l1x9r3gqAjo2gdO9R92lv05OzKdQq cICeRD7ybou7X1YAVWyNt6Tvw6o54wiNKmeBuvWxkCib/0FvjSSirSvCjYoYZPDi/dvp NlyJ7yEvdNkPdSl9A2LjSZDx1jooTpgBVsyeQgdIQLofGqsgB3JEMpk5/FYgrNCTXRMU TipfhKkexSCt8rhNLcf4QWIEfuMvYh3ZhngDJxzl8YN66I4/gBqNZ4HesFU9BbrU9mxz 1Jqg== 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=lvhTpMJ/dAUpcmdrmogV8JhxesBXZfBi9uaG/Gjb0t0=; b=OAp5j1r971fJdO2XjDqj6Q6Je9dYmLVBXmQem0mcHwpgSXZMaEZnV/DChBDcMJq0PU qJGEy9xnqZDbrF3psEUFShL/V1qY9j5HOJTHs/zPapvbgszZOspEtEw9JIYx/hlJj8G1 1nzvm0W80cJlMW1ATgfp+dNzuVkst+Gh2lXF8xrH+jVkzGhS4F1HLcbPg+Sq7TRaIvMu nTPrEzLFbXv988DF+6qHw9U8WAMxBxEIS6EMFbEcqdSmJbP3f55Zdd4lwkOIuIhkvCrf ov0s5IluibVK1FUuO/o0RZ4qlz0nZMrtl16Jshq2uKEACGLG3mk0gEZ8e+QUkQr0Txwp +nwA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id q205si412523wme.4.2020.03.21.01.32.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 01:32:05 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 02L8W47G009588 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 21 Mar 2020 09:32:04 +0100 Received: from localhost.localdomain ([139.22.32.253]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02L8VuGV021533; Sat, 21 Mar 2020 09:32:04 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv7 17/29] CI: include "isar-disable-apt-cache" into all CI images Date: Sat, 21 Mar 2020 09:31:36 +0100 Message-Id: <20200321083148.26160-18-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200321083148.26160-1-henning.schild@siemens.com> References: <20200321083148.26160-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: qtHC+1Nc/3Q6 From: Henning Schild The base-apt does not rely on the rootfs-cache anymore, so we can test our cleanup package in all images. Signed-off-by: Henning Schild --- meta-isar/conf/local.conf.sample | 4 +--- scripts/ci_build.sh | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index ebc277b1..1cf9519f 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -169,9 +169,7 @@ 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" -## "cache_base_repo" relies on the cache ... -#IMAGE_INSTALL += "isar-disable-apt-cache" +IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck isar-exclude-docs samefile hello isar-disable-apt-cache" # # Enable cross-compilation support diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index f50c9e42..bfaf1f6e 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -168,8 +168,6 @@ if [ -n "$REPRO_BUILD" ]; then sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf fi -sed -i -e 's/#IMAGE_INSTALL += "isar-disable-apt-cache"/IMAGE_INSTALL += "isar-disable-apt-cache"/g' conf/local.conf - echo 'IMAGE_INSTALL += "cowsay"' >> conf/local.conf # Start cross build for the defined set of configurations -- 2.24.1